Skip to content
Snippets Groups Projects
Commit 82518f17 authored by Ned Coltman's avatar Ned Coltman
Browse files

[parameterlist] cleanup parameterlist.txt for release 3.2

parent cc4dc2b4
No related branches found
No related tags found
2 merge requests!2152WIP add default fluxcache properties,!2022Cleanup/parametercompare
...@@ -114,7 +114,7 @@ sort -u old_parameters.csv -o old_parameters.csv ...@@ -114,7 +114,7 @@ sort -u old_parameters.csv -o old_parameters.csv
# 3. compare lists of old and new parameters # 3. compare lists of old and new parameters
# treat additions # treat additions
diff -u old_parameters.csv new_parameters.csv | grep -E "^\+" | grep -v "\++" >added.csv diff -u old_parameters.csv new_parameters.csv | grep -E "^\+" | grep -v "\++" >added.csv
if [[ -s added.csv ]]; then if [ -s "added.csv" ]; then
echo "" echo ""
echo "Compared to parameterlist.txt, the following parameters have been _added_:" echo "Compared to parameterlist.txt, the following parameters have been _added_:"
echo "" echo ""
...@@ -131,7 +131,7 @@ if [[ -s added.csv ]]; then ...@@ -131,7 +131,7 @@ if [[ -s added.csv ]]; then
fi fi
# treat deletions # treat deletions
diff -u old_parameters.csv new_parameters.csv | grep -E "^\-" | grep -v "\--" >deleted.csv diff -u old_parameters.csv new_parameters.csv | grep -E "^\-" | grep -v "\--" >deleted.csv
if [[ -s deleted.csv ]]; then if [ -s "deleted.csv" ]; then
echo "" echo ""
echo "Compared to parameterlist.txt, the following parameters have been _deleted_:" echo "Compared to parameterlist.txt, the following parameters have been _deleted_:"
echo "" echo ""
...@@ -146,7 +146,7 @@ if [[ -s deleted.csv ]]; then ...@@ -146,7 +146,7 @@ if [[ -s deleted.csv ]]; then
echo "their name. If so, delete the corresponding rows in doc/doxygen/extradoc/parameterlist.txt." echo "their name. If so, delete the corresponding rows in doc/doxygen/extradoc/parameterlist.txt."
fi fi
# final remark # final remark
if [[ ! -s added.csv && ! -s deleted.csv ]]; then if [ ! -s "added.csv" && ! -s "deleted.csv" ]; then
echo "" echo ""
echo "Compared to parameterlist.txt, no parameters have been added or deleted." echo "Compared to parameterlist.txt, no parameters have been added or deleted."
echo "" echo ""
......
...@@ -12,10 +12,9 @@ ...@@ -12,10 +12,9 @@
* | :- | :- | :- | :- | :- | * | :- | :- | :- | :- | :- |
* | - | ParameterFile | std::string| executable.input | name of the parameter file | * | - | ParameterFile | std::string| executable.input | name of the parameter file |
* | \b Adaptive | BCRefinementThreshold | Scalar | 1e-10 | | * | \b Adaptive | BCRefinementThreshold | Scalar | 1e-10 | |
Adaptive | MaxLevel | std::size_t | 0 | | * | | MaxLevel | std::size_t | 0 | |
* | \b Assembly | NumericDifference.BaseEpsilon | Scalar | 1e-10 | | * | \b Assembly | NumericDifference.BaseEpsilon | Scalar | 1e-10 | |
* | | NumericDifferenceMethod | int | | | * | | NumericDifferenceMethod | int | | |
* | | NumericDifferenceMethod | int | | |
* | | NumericDifference.PriVarMagnitude | NumEqVector(-1) | | | * | | NumericDifference.PriVarMagnitude | NumEqVector(-1) | | |
* | \b BinaryCoefficients | GasDiffCoeff | Scalar | | | * | \b BinaryCoefficients | GasDiffCoeff | Scalar | | |
* | | LiquidDiffCoeff | Scalar | | | * | | LiquidDiffCoeff | Scalar | | |
...@@ -47,9 +46,14 @@ Adaptive | MaxLevel | std::size_t | 0 | | ...@@ -47,9 +46,14 @@ Adaptive | MaxLevel | std::size_t | 0 | |
* | | ThermoneutralVoltage | Scalar | | | * | | ThermoneutralVoltage | Scalar | | |
* | | TransferCoefficient | Scalar | | | * | | TransferCoefficient | Scalar | | |
* | | TransportNumberH20 | Scalar | | | * | | TransportNumberH20 | Scalar | | |
* | \b FacetCoupling | Xi | Scalar | 1.0 | |
* | \b Flux | DifferencingScheme | std::string | Minmod | | * | \b Flux | DifferencingScheme | std::string | Minmod | |
* | | TvdApproach | std::string | Uniform | | * | | TvdApproach | std::string | Uniform | |
* | | UpwindWeight | Scalar | | | * | | UpwindWeight | Scalar | | |
* | \b FluxLimiterLET | LowerWaterDepth | Scalar | 1e-5 | |
* | | UpperWaterDepth | Scalar | 1e-3 | |
* | | UpwindFluxLimiting | bool | false | |
* | \b FluxOverSurface | Verbose | bool | false | |
* | \b Forchheimer | MaxIterations | std::size_t | 30 | | * | \b Forchheimer | MaxIterations | std::size_t | 30 | |
* | | NewtonTolerance | Scalar | 1e-12 | | * | | NewtonTolerance | Scalar | 1e-12 | |
* | \b FreeFlow | EnableUnsymmetrizedVelocityGradient | bool | false | | * | \b FreeFlow | EnableUnsymmetrizedVelocityGradient | bool | false | |
...@@ -101,8 +105,6 @@ Adaptive | MaxLevel | std::size_t | 0 | | ...@@ -101,8 +105,6 @@ Adaptive | MaxLevel | std::size_t | 0 | |
* | | UpperRight | GlobalPosition | | | * | | UpperRight | GlobalPosition | | |
* | | Verbosity | bool | false | | * | | Verbosity | bool | false | |
* | | WellRadius | Scalar | | | * | | WellRadius | Scalar | | |
* | | WriteSubGridToDGF | bool | false) | |
* | | WriteSubGridToVtk | bool | false) | |
* | \b Impet | CFLFactor | Scalar | | | * | \b Impet | CFLFactor | Scalar | | |
* | | DtVariationRestrictionFactorstd::numeric_limits<Scalar | | | | * | | DtVariationRestrictionFactorstd::numeric_limits<Scalar | | | |
* | | EnableVolumeIntegral | bool | | | * | | EnableVolumeIntegral | bool | | |
...@@ -120,20 +122,25 @@ Adaptive | MaxLevel | std::size_t | 0 | | ...@@ -120,20 +122,25 @@ Adaptive | MaxLevel | std::size_t | 0 | |
* | | SwitchNormals | bool | | | * | | SwitchNormals | bool | | |
* | \b KEpsilon | EnableKinematicViscosity | bool | true | | * | \b KEpsilon | EnableKinematicViscosity | bool | true | |
* | | EnableZeroEqScaling | bool | true | | * | | EnableZeroEqScaling | bool | true | |
* | |YPlusThreshold | Scalar | 30 | | * | | YPlusThreshold | Scalar | 30 | |
* | \b KOmega | EnableDissipationLimiter | bool | true | | * | \b KOmega | EnableDissipationLimiter | bool | true | |
* | | EnableProductionLimiter | bool | false | | * | | EnableProductionLimiter | bool | false | |
* | \b LinearSolver | GMResRestart | double | | | * | \b LinearSolver | GMResRestart | double | | |
* | | GMResRestart | int | | | * | | GMResRestart | int | 10 | |
* | | MaxIterations | int | | | * | | MaxIterations | int | 250 | |
* | | PreconditionerIterations | int | | | * | | PreconditionerIterations | int | 1 | |
* | | PreconditionerRelaxation | double | | | * | | PreconditionerRelaxation | double | | |
* | | ResidualReduction | double | | | * | | PreconditionerVerbosity | int | | |
* | | ResidualReduction | Scalar | 1e-6) | | * | | Preconditioner.DetermineRelaxationFactor | bool | true | |
* | | Verbosity | int | | | * | | Preconditioner.PowerLawIterations | std::size_t | 5 | |
* | | Preconditioner.Relaxation | double | 1 | |
* | | ResidualReduction | double | 1e-13| |
* | | ResidualReduction | Scalar | 1e-6 | |
* | | Verbosity | int | 0 | |
* | \b LoadSolution | CellCenterPriVarNames | std::vector<std::string> | | | * | \b LoadSolution | CellCenterPriVarNames | std::vector<std::string> | | |
* | | FacePriVarNames | std::vector<std::string> | | | * | | FacePriVarNames | std::vector<std::string> | | |
* | | PriVarNames | std::vector<std::string> | | | * | | PriVarNames | std::vector<std::string> | | |
* | \b MatrixConverter | DeletePatternEntriesBelowAbsThreshold | Scalar | -1.0 | |
* | \b MixedDimension | IntegrationOrder | int | 1 | | * | \b MixedDimension | IntegrationOrder | int | 1 | |
* | | KernelWidth | Scalar | | | * | | KernelWidth | Scalar | | |
* | | NumCircleSegments | int | | | * | | NumCircleSegments | int | | |
...@@ -165,11 +172,10 @@ Adaptive | MaxLevel | std::size_t | 0 | | ...@@ -165,11 +172,10 @@ Adaptive | MaxLevel | std::size_t | 0 | |
* | | TargetSteps | int | | | * | | TargetSteps | int | | |
* | | UseLineSearch | bool | | | * | | UseLineSearch | bool | | |
* | | Verbosity | int | 2 | | * | | Verbosity | int | 2 | |
* | \b PrimaryVariableSwitch | Verbosity | int | 1 | |
* | \b Problem | EnableGravity | bool | | | * | \b Problem | EnableGravity | bool | | |
* | | EnableGravity | bool | | |
* | | EnableInertiaTerms | bool | | | * | | EnableInertiaTerms | bool | | |
* | | Name | std::string | | | * | | Name | std::string | | |
* | | Name | std::string | | |
* | | UsePrimaryVariableSwitch | bool | | | * | | UsePrimaryVariableSwitch | bool | | |
* | \b RANS | EddyViscosityModel | std::string | vanDriest | | * | \b RANS | EddyViscosityModel | std::string | vanDriest | |
* | | FlowNormalAxis | int | -1 | | * | | FlowNormalAxis | int | -1 | |
...@@ -190,8 +196,6 @@ Adaptive | MaxLevel | std::size_t | 0 | | ...@@ -190,8 +196,6 @@ Adaptive | MaxLevel | std::size_t | 0 | |
* | | SubTimestepVerbosity | int | | | * | | SubTimestepVerbosity | int | | |
* | | TEnd | Scalar | | | * | | TEnd | Scalar | | |
* | \b Vtk | AddProcessRank | bool | | | * | \b Vtk | AddProcessRank | bool | | |
* | | AddProcessRank | bool | | |
* | | AddVelocity | bool | | |
* | | AddVelocity | bool | true | | * | | AddVelocity | bool | true | |
* | | OutputLevel | int | | | * | | OutputLevel | int | | |
* | | WriteFaceData | bool | false | | * | | WriteFaceData | bool | false | |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment