diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion index 853ba8fe85..8e1c802f0d 100644 --- a/etc/config.sh/bash_completion +++ b/etc/config.sh/bash_completion @@ -56,7 +56,7 @@ _adjointShapeOptimizationFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -239,7 +239,7 @@ _boundaryFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -srcDoc" + opts="-case -doc -fileHandler -help -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -289,7 +289,7 @@ _buoyantPimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -314,7 +314,7 @@ _buoyantReactingParticleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -339,7 +339,7 @@ _buoyantSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -364,7 +364,7 @@ _cavitatingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -476,7 +476,7 @@ _chemFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -postProcess -srcDoc" + opts="-case -doc -fileHandler -help -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -postProcess -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -521,7 +521,7 @@ _chtMultiRegionFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -546,7 +546,7 @@ _coldEngineFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -625,7 +625,7 @@ _compressibleInterFilmFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -650,7 +650,7 @@ _compressibleInterFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -675,7 +675,7 @@ _compressibleMultiphaseInterFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -862,7 +862,7 @@ _denseParticleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -887,7 +887,7 @@ _dnsFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -912,7 +912,7 @@ _driftFluxFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -937,7 +937,7 @@ _dsmcFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -987,7 +987,7 @@ _electrostaticFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1037,7 +1037,7 @@ _engineFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1235,7 +1235,7 @@ _financialFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1260,7 +1260,7 @@ _fireFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1829,7 +1829,7 @@ _icoFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1916,7 +1916,7 @@ _interFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1941,7 +1941,7 @@ _interMixingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1966,7 +1966,7 @@ _interPhaseChangeFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2016,7 +2016,7 @@ _laplacianFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2041,7 +2041,7 @@ _magneticFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -HdotGradH -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noB -noFunctionObjects -noH -parallel -roots -srcDoc" + opts="-case -doc -fileHandler -HdotGradH -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noB -noFunctionObjects -noH -parallel -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2128,7 +2128,7 @@ _mdEquilibrationFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2153,7 +2153,7 @@ _mdFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2254,7 +2254,7 @@ _mhdFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2456,7 +2456,7 @@ _multiphaseEulerFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2481,7 +2481,7 @@ _multiphaseInterFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2564,7 +2564,7 @@ _nonNewtonianIcoFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2636,7 +2636,7 @@ _particleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2740,7 +2740,7 @@ _PDRFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2790,7 +2790,7 @@ _pimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2815,7 +2815,7 @@ _pisoFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2896,7 +2896,7 @@ _porousSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2977,7 +2977,7 @@ _potentialFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -initialiseUBCs -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -pName -roots -srcDoc -withFunctionObjects -writep -writePhi" + opts="-case -doc -fileHandler -help -hostRoots -initialiseUBCs -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -pName -roots -srcDoc -withFunctionObjects -writep -writePhi" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3002,7 +3002,7 @@ _potentialFreeSurfaceFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3027,7 +3027,7 @@ _reactingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3052,7 +3052,7 @@ _reactingParticleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3312,7 +3312,7 @@ _rhoCentralFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3337,7 +3337,7 @@ _rhoParticleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3362,7 +3362,7 @@ _rhoPimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3387,7 +3387,7 @@ _rhoPorousSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3412,7 +3412,7 @@ _rhoReactingBuoyantFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3437,7 +3437,7 @@ _rhoReactingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3462,7 +3462,7 @@ _rhoSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3539,7 +3539,7 @@ _scalarTransportFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3699,7 +3699,7 @@ _shallowWaterFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3724,7 +3724,7 @@ _simpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3749,7 +3749,7 @@ _simpleReactingParticleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3859,7 +3859,7 @@ _solidDisplacementFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3884,7 +3884,7 @@ _solidEquilibriumDisplacementFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3986,7 +3986,7 @@ _SRFPimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -4011,7 +4011,7 @@ _SRFSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -4967,7 +4967,7 @@ _thermoFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5046,7 +5046,7 @@ _twoLiquidMixingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5179,7 +5179,7 @@ _XiEngineFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5204,7 +5204,7 @@ _XiFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvOptions -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" diff --git a/etc/controlDict b/etc/controlDict index 138c6be2f0..7981d1d0db 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -87,827 +87,13 @@ OptimisationSwitches DebugSwitches { - Analytical 0; - APIdiffCoefFunc 0; - Ar 0; - BirdCarreau 0; - C10H22 0; - C12H26 0; - C13H28 0; - C14H30 0; - C16H34 0; - C2H5OH 0; - C2H6 0; - C2H6O 0; - C3H6O 0; - C3H8 0; - C4H10O 0; - C6H14 0; - C6H6 0; - C7H16 0; - C7H8 0; - C8H10 0; - C8H18 0; - C9H20 0; - CH3OH 0; - CH4N2O 0; - CarnahanStarling 0; - CallbackRegistry 0; - CentredFitData 0; - CentredFitData 0; - CentredFitData 0; - CentredFitData 0; - ChomiakInjector 0; - Cloud 0; - Cloud 0; - Cloud 0; - Cloud 0; - Cloud 0; - Cloud 0; - Cloud 0; - CoEuler 0; - CompositionModel 0; - ConeInjection 0; - Constant 0; - ConstantRateDevolatilisation 0; - CrankNicolson 0; - CrossPowerLaw 0; - Cs 0; - DIC 0; - DICGaussSeidel 0; - DILU 0; - DILUGaussSeidel 0; - Function1 0; - DeardorffDiffStress 0; - DispersionModel 0; - DispersionRASModel 0; - DragModel 0; - ETAB 0; - Ergun 0; - Euler 0; - EulerImplicit 0; - EulerRotation 0; - extendedCellToFaceStencil 0; - FDIC 0; - FaceCellWave 0; - GAMG 0; - GAMGAgglomeration 1; - GAMGInterface 0; - GAMGInterfaceField 0; - Gamma 0; - Gamma01 0; - GammaV 0; - Gauss 0; - GaussSeidel 0; - Gibilaro 0; - Gidaspow 0; - GidaspowErgunWenYu 0; - GidaspowSchillerNaumann 0; - GradientDispersionRAS 0; - Gulders 0; - GuldersEGR 0; - H2O 0; - HashTable 0; - HeatTransferModel 0; - HerschelBulkley 0; - HrenyaSinclair 0; - IC8H18 0; - IDDESDelta 0; - IDEA 0; - IFstream 0; - IOMap 0; - IOPtrList 0; - IOPtrList 0; - IOPtrList 0; - IOPtrList 0; - IOobject 0; - InjectionModel 0; - IntegrationScheme 0; - JohnsonJackson 0; - KRR4 0; - KinematicCloud 0; - KinematicCloud 0; - KinematicCloud 0; - KinematicParcel 0; - KinematicParcel 0; - LESModel 0; - LESdelta 0; - LESfilter 0; - LISA 0; - LRR 0; - LRRDiffStress 0; - LamBremhorstKE 0; - LaunderGibsonRSTM 0; - LaunderSharmaKE 0; - LienCubicKE 0; - LienCubicKELowRe 0; - LienLeschzinerLowRe 0; - MB 0; - MC 0; - MCV 0; - MUSCL 0; - MUSCL01 0; - MUSCLV 0; - ManualInjection 0; - MarshakRadiation 0; - MarshakRadiationFixedT 0; - MassTransferModel 0; - MeshWave 0; - Minmod 0; - MinmodV 0; - N2 0; - NSRDSfunc0 0; - NSRDSfunc1 0; - NSRDSfunc14 0; - NSRDSfunc2 0; - NSRDSfunc3 0; - NSRDSfunc4 0; - NSRDSfunc5 0; - NSRDSfunc6 0; - NSRDSfunc7 0; - Newtonian 0; - NoDispersion 0; - NoDrag 0; - NoHeatTransfer 0; - NoInjection 0; - NoMassTransfer 0; - NoSurfaceReaction 0; - NonlinearKEShih 0; - ODE 0; - ODESolver 0; - OFstream 0; - ORourke 0; - OSPRE 0; - OSPREV 0; - P1 0; - PBiCG 0; - PCG 0; - PackedList 0; - ParSortableList 0; - PatchToPatchInterpolation 0; - Phi 0; - PointEdgeWave 0; - POSIX 0; - Prandtl 0; - PrimitivePatch 0; - Pstream 0; - QUICK 0; - QUICKV 0; - QZeta 0; - RASModel 0; - RK 0; - RNGkEpsilon 0; - RanzMarshall 0; - ReactingCloud 0; - ReactingParcel 0; - Rebound 0; - ReitzDiwakar 0; - ReitzKHRT 0; - RosinRammler 0; - RutlandFlashBoil 0; - SDA 0; - SFCD 0; - SFCDV 0; - SHF 0; - SIBS 0; - SKA 0; - SLTS 0; - SRFModel 0; - SRFVelocity 0; - STARCDRotation 0; - Schaeffer 0; - SchillerNaumann 0; - SinclairJackson 0; - SingleKineticRateDevolatilisation 0; - SingleMixtureFraction 0; - Smagorinsky 0; - SolverPerformance 1; - SpalartAllmaras 0; - SpalartAllmarasDDES 0; - SpalartAllmarasIDDES 0; - SphereDrag 0; - StandardWallInteraction 0; - StochasticDispersionRAS 0; - SuperBee 0; - SuperBeeV 0; - SurfaceReactionModel 0; - Syamlal 0; - SyamlalOBrien 0; - SyamlalRogersOBrien 0; - TAB 0; - Table 0; - ThermoCloud 0; - ThermoCloud 0; - ThermoParcel 0; - ThermoParcel 0; - UMIST 0; - UMISTV 0; - UPstream 0; - UpwindFitData 0; - UpwindFitData 0; - UpwindFitData 0; - WallInteractionModel 0; - WenYu 0; - aC11H10 0; - absorptionEmissionModel 0; - addCell 0; - addFace 0; - addPatchCellLayer 0; - addPoint 0; - advective 0; - algebraicPair 0; - alphaContactAngle 0; - alphaFixedPressure 0; - alphatWallFunction 0; - angularOscillatingDisplacement 0; - angularOscillatingVelocity 0; - anisotropic 0; - ash 0; - atomizationModel 0; - attachDetach 0; - autoDensity 0; - snappyHexMeshDriver 0; - snappyLayerDriver 0; - snappyRefineDriver 0; - snappySnapDriver 0; - bC11H10 0; - backgroundMeshDecomposition 0; - backward 0; - basePatch 0; - basicKinematicCloud 0; - basicKinematicParcel 0; - basicMixture 0; - basicReactingCloud 0; - basicReactingParcel 0; - fluidThermo 0; - fluidThermoCloud 0; - fluidThermoParcel 0; - biLinearFit 0; - binaryAbsorptionEmission 0; - blended 0; - blobsSheetAtomization 0; - blobsSwirlInjector 0; - blockMesh 0; - booleanSurface 0; - boundaryCutter 0; - boundaryMesh 0; - boundaryToFace 0; - boundedBackward 0; - boxToCell 0; - boxToFace 0; - boxToPoint 0; - breakupModel 0; - calculated 0; - cell 0; - cellClassification 0; - cellCuts 0; - cellDistFuncs 0; - cellLimited 0; - cellList 0; - cellLooper 0; - cellMDLimited 0; - cellMotion 0; - cellPoint 0; - cellPointFace 0; - cellPointWeight 0; - cellSet 0; - cellSizeControlSurfaces 0; - cellToCell 0; - cellToFace 0; - cellToPoint 0; - cellZone 0; - centredCECStencil 0; - centredCFCStencil 0; - chemistryReader 0; - chemistrySolver 0; - chemkinReader 0; - clippedLinear 0; - cloud 0; - cloudAbsorptionEmission 0; - cloudScatter 0; - collisionModel 0; - combineFaces 0; - commSchedule 0; - commonRailInjector 0; - compound 0; - constInjector 0; - constant 0; - constantAbsorptionEmission 0; - constantAlphaContactAngle 0; - constantScatter 0; - coordinateRotation 0; - coordinateSystem 0; - coordinateSystems 0; - corrected 0; - coupled 0; - cubeRootVol 0; - cubic 0; - cubicUpwindFit 0; - curve 0; - cyclic 0; - cyclicLduInterface 0; - cyclicLduInterfaceField 0; - cylinderToCell 0; - cylindrical 0; - decompositionMethod 0; - definedHollowConeInjector 0; - definedInjector 0; - definedPressureSwirlInjector 0; - diagTensorField 0; - diagonal 0; - dictionary 0; dimensionSet 1; - mappedBase 0; - mappedPatch 0; - mappedVelocityFlux 0; - directionMixed 0; - directional 0; - disallowGenericFvPatchField 0; - disallowGenericPointPatchField 0; - disallowGenericPolyPatch 0; - dispersionLESModel 0; - dispersionModel 0; - dispersionRASModel 0; - displacementComponentLaplacian 0; - displacementInterpolation 0; - displacementLaplacian 0; - displacementSBRStress 0; - distanceSurface 0; - Distribution 0; - downwind 0; - dragModel 0; - duplicatePoints 0; - dx 0; - dynMixedSmagorinsky 0; - dynOneEqEddy 0; - dynSmagorinsky 0; - dynamicAlphaContactAngle 0; - dynamicFvMesh 0; - dynamicInkJetFvMesh 0; - dynamicMotionSolverFvMesh 0; - dynamicRefineFvMesh 0; - edgeIntersections 0; - edgeList 0; - edgeSurface 0; - empty 0; - engineMesh 0; - enrichedPatch 0; - epsilonWallFunction 0; - errorDrivenRefinement 0; - evaporationModel 0; - exponential 0; - extendedLeastSquares 0; - extendedLeastSquaresVectors 0; - face 0; - faceAreaPair 0; - faceCoupleInfo 0; - faceLimited 0; - faceList 0; - faceMDLimited 0; - faceSet 0; - faceToCell 0; - faceToFace 0; - faceToPoint 0; - faceZone 0; - fan 0; - featureEdgeMesh 0; - fieldToCell 0; - file 0; fileName 2; - filteredLinear 0; - filteredLinear2 0; - filteredLinear2V 0; - filteredLinear3 0; - filteredLinear3V 0; - fixedEnthalpy 0; - buoyantPressure 0; - fixedFluxBoussinesqBuoyantPressure 0; - fixedFluxPressure 0; - fixedGradient 0; - fixedInternalEnergy 0; - fixedInternalValue 0; - fixedNormalSlip 0; - fixedPressureCompressibleDensity 0; - fixedUnburntEnthalpy 0; - fixedValue 0; - flowRateInletVelocity 0; - fluxCorrectedVelocity 0; - foamChemistryReader 0; - foamFile 0; - forceCoeffs 0; - forces 0; - fourth 0; - freestream 0; - freestreamPressure 0; - frictionalStressModel 0; - functionObject 0; - fv 0; - fvMesh 0; - fvMeshDistribute 0; - fvMotionSolver 0; - fvPatchField 0; - fvScalarMatrix 0; - fvSchemes 0; - fvSphericalTensorMatrix 0; - fvSymmTensorMatrix 0; - fvTensorMatrix 0; - fvVectorMatrix 0; - fvsPatchField 0; - general 0; - generic 0; - genericPatch 0; - geomCellLooper 0; - geometricSurfacePatch 0; - global 0; - globalIndexAndTransform 0; - globalMeshData 0; - globalPoints 0; - gnuplot 0; - gradientDispersionRAS 0; - gradientEnthalpy 0; - gradientInternalEnergy 0; - gradientUnburntEnthalpy 0; - granularPressureModel 0; - hCombustionThermo 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hThermo>>>> 0; - hThermo>>>> 0; - hThermo>>>> 0; - harmonic 0; - heatTransferModel 0; - hexCellLooper 0; - hexRef8 0; - hhuCombustionThermo 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hierarchical 0; - hollowConeInjector 0; - iC3H8O 0; - indexedOctree 0; - indexedParticle 0; - injectorModel 0; - injectorType 0; - inletOutlet 0; - inletOutletTotalTemperature 0; - interfaceCompression 0; - intersectedSurface 0; - inverseDistance 0; - inverseFaceDistance 0; - inversePointDistance 0; - inverseVolume 0; - isoSurface 0; - jplot 0; - jumpCyclic 0; - kEpsilon 0; - kOmega 0; - kOmegaSST 0; - kOmegaSSTSAS 0; - kqRWallFunction 0; - kinematicCloud 0; - labelField 0; - labelList 0; - labelListList 0; - labelToCell 0; - labelToFace 0; - labelToPoint 0; - laminar 0; - laminarFlameSpeed 0; - laplace 0; - layerAdditionRemoval 0; - layered 0; - lduInterface 0; - lduInterfaceField 0; - lduMatrix 1; - lduMesh 0; - leastSquares 0; - leastSquaresVectors 0; + GAMGAgglomeration 1; level 2; - limitWith 0; - limited 0; - limitedCubic 0; - limitedCubic01 0; - limitedCubicV 0; - limitedGamma 0; - limitedLimitedCubic 0; - limitedLimitedLinear 0; - limitedLinear 0; - limitedLinear01 0; - limitedLinearV 0; - limitedMUSCL 0; - limitedSurfaceInterpolationScheme 0; - limitedVanLeer 0; - linear 0; - linearFit 0; - linearUpwind 0; - linearUpwindV 0; - liquid 0; - locDynOneEqEddy 0; - localBlended 0; - localMax 0; - localMin 0; - localPointRegion 0; - lowReOneEqEddy 0; - manual 0; - meshCutAndRemove 0; - meshCutter 0; - meshModifier 0; - meshObject 0; - meshRefinement 0; - meshSearch 0; - meshToMesh 0; - metis 0; - midPoint 0; - midPointAndFace 0; - mixed 0; - mixedEnthalpy 0; - mixedInternalEnergy 0; - mixedSmagorinsky 0; - mixedUnburntEnthalpy 0; - mixerFvMesh 0; - modifyCell 0; - modifyFace 0; - modifyPoint 0; - motionDiffusivity 0; - motionDirectional 0; - motionSmoother 0; - motionSolver 0; - movingConeTopoFvMesh 0; - movingWallVelocity 0; - muSgsSpalartAllmarasWallFunction 0; - multiDirRefinement 0; - multiHoleInjector 0; - multiLevel 0; - multivariateSelection 0; - mutRoughWallFunction 0; - mutSpalartAllmarasStandardRoughWallFunction 0; - mutSpalartAllmarasStandardWallFunction 0; - mutSpalartAllmarasWallFunction 0; - mutWallFunction 0; - nC3H8O 0; - nbrToCell 0; - nearestToCell 0; - nearestToPoint 0; - noAbsorptionEmission 0; - noDragModel 0; - noRadiation 0; - none 0; - normal 0; - normalToFace 0; - nuSgsSpalartAllmarasWallFunction 0; - nutRoughWallFunction 0; - nutSpalartAllmarasStandardRoughWallFunction 0; - nutSpalartAllmarasStandardWallFunction 0; - nutSpalartAllmarasWallFunction 0; - nutWallFunction 0; - obj 0; - objectRegistry 0; - off 0; - omegaWallFunction 0; - oneEqEddy 0; - orientedSurface 0; - oscillatingDisplacement 0; - oscillatingFixedValue 0; - oscillatingVelocity 0; - outletInlet 0; - outletStabilised 0; - pair 0; - parabolicCylindrical 0; - parcel 0; - partialSlip 0; - passiveParticle 0; - patch 0; - patchToFace 0; - patchZones 0; - pdf 0; - perfectInterface 0; - pointIndexHitList 0; - pointPatchField 0; - pointScalarField 0; - pointScalarField::Internal 0; - pointSet 0; - pointSphericalTensorField 0; - pointSphericalTensorField::Internal 0; - pointSymmTensorField 0; - pointSymmTensorField::Internal 0; - pointTensorField 0; - pointTensorField::Internal 0; - pointToCell 0; - pointToFace 0; - pointToPoint 0; - pointVectorField 0; - pointVectorField::Internal 0; - pointZone 0; - polyBoundaryMesh 0; - polyMesh 0; - polyMeshInfo 0; - polyTopoChange 0; - polyTopoChanger 0; - powerLaw 0; - pressureDirectedInletOutletVelocity 0; - pressureDirectedInletVelocity 0; - pressureInletOutletVelocity 0; - pressureInletUniformVelocity 0; - pressureInletVelocity 0; - pressureNormalInletOutletVelocity 0; - pressureSwirlInjector 0; - primitiveMesh 0; - probes 0; - processor 0; - processorLduInterface 0; - processorLduInterfaceField 0; - pureMixture>>> 0; - pureMixture>>> 0; - pureMixture>>> 0; - quadratic 0; - quadraticFit 0; - quadraticLinearFit 0; - quadraticLinearUpwindFit 0; - quadraticUpwindFit 0; - radiationModel 0; - raw 0; - reactingCloud 0; - reaction 0; - realizableKE 0; - refinementHistory 0; - refinementIterator 0; - reflect 0; - regIOobject 0; - regionSplit 0; - regionToCell 0; - remove 0; - removeCell 0; - removeCells 0; - removeFace 0; - removeFaces 0; - removePoint 0; - removePoints 0; - reverseLinear 0; - rotatedBoxToCell 0; - rotatingPressureInletOutletVelocity 0; - rotatingTotalPressure 0; - sampledPatch 0; - sampledPlane 0; - sampledSet 0; - sampledSurface 0; - saturateEvaporationModel 0; - scalarAverageField 0; - scalarField 0; - scalarRange 0; - scaleSimilarity 0; - scatterModel 0; - searchableBox 0; - searchableSurface 0; - sequential 0; - setUpdater 0; - sets 0; - shapeList 0; - shapeToCell 0; - simple 0; - sixDoFRigidBodyMotionConstraint 0; - skewCorrected 0; - skewCorrectionVectors 0; - sliced 0; - slidingInterface 0; - slip 0; - smooth 0; - smoothSolver 0; - solid 0; - solidBodyMotionFunction 0; - solidBodyMotionFvMesh 0; - solution 0; - specie 0; - spectEddyVisc 0; - sphereToCell 0; - spherical 0; - sphericalTensorAverageField 0; - sphericalTensorField 0; - standardDragModel 0; - standardEvaporationModel 0; - staticFvMesh 0; - steadyState 0; - stl 0; - string 0; - stochasticDispersionRAS 0; - supersonicFreestream 0; - surfaceFeatures 0; - surfaceInterpolation 0; - surfaceInterpolationScheme 0; - surfaceIntersection 0; - surfaceNormalFixedValue 0; - surfacePatch 0; - surfacePatchIOList 0; - surfaceScalarField 0; - surfaceScalarField::Internal 0; - surfaceSlipDisplacement 0; - surfaceSphericalTensorField 0; - surfaceSphericalTensorField::Internal 0; - surfaceSymmTensorField 0; - surfaceSymmTensorField::Internal 0; - surfaceTensorField 0; - surfaceTensorField::Internal 0; - surfaceToCell 0; - surfaceToPoint 0; - surfaceVectorField 0; - surfaceVectorField::Internal 0; - surfaceWriter 0; - surfaces 0; - swirlInjector 0; - symmTensorAverageField 0; - symmTensorField 0; - symmetryPlane 0; - symmetry 0; - syringePressure 0; - tensorAverageField 0; - tensorField 0; - tetDecomposedPolyMesh 0; - thermoCloud 0; - thermophysicalFunction 0; - time 0; - timeVaryingAlphaContactAngle 0; - timeVaryingMappedFixedValue 0; - timer 0; - topoAction 0; - topoCellLooper 0; - topoChangerFvMesh 0; - topoSet 0; - topoSetSource 0; - toroidal 0; - totalPressure 0; - totalTemperature 0; - trackedParticle 0; - trajectory 0; - transform 0; - treeDataCell 0; - treeDataFace 0; - treeDataTriSurface 0; - treeLeaf 0; - treeNode 0; - triSurface 0; - triSurfaceMesh 0; - momentumTransportModel 0; - turbulentInlet 0; - turbulentIntensityKineticEnergyInlet 0; - turbulentMixingLengthDissipationRateInlet 0; - turbulentMixingLengthFrequencyInlet 0; - uncorrected 0; - undoableMeshCutter 0; - uniform 0; - uniformFixedValue 0; - unitInjector 0; - upwind 0; - upwindCFCStencil 0; - value 0; - vanAlbada 0; - vanAlbadaV 0; - vanDriest 0; - vanLeer 0; - vanLeer01 0; - vanLeerV 0; - vector2DField 0; - vectorAverageField 0; - vectorField 0; - velocityComponentLaplacian 0; - velocityLaplacian 0; - viscosityModel 0; - volPointInterpolation 0; - volScalarField 0; - volScalarField::Internal 0; - volSphericalTensorField 0; - volSphericalTensorField::Internal 0; - volSymmTensorField 0; - volSymmTensorField::Internal 0; - volTensorField 0; - volTensorField::Internal 0; - volVectorField 0; - volVectorField::Internal 0; - vtk 0; - walkPatch 0; - wall 0; - wallHeatTransfer 0; - wallLayerCells 0; - wallModel 0; - waveTransmissive 0; - wedge 0; - weighted 0; - word 0; - writer 0; - xmgr 0; - zeroGradient 0; - zoneToCell 0; - zoneToFace 0; - zoneToPoint 0; + lduMatrix 1; + SolverPerformance 1; + vtkUnstructuredReader 1; } diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C index 488764c384..de6e28144d 100644 --- a/src/OpenFOAM/db/IOobject/IOobject.C +++ b/src/OpenFOAM/db/IOobject/IOobject.C @@ -50,12 +50,11 @@ const Foam::NamedEnum // Default fileCheck type Foam::IOobject::fileCheckTypes Foam::IOobject::fileModificationChecking ( - fileCheckTypesNames.read + Foam::debug::namedEnumOptimisationSwitch ( - debug::optimisationSwitches().lookup - ( - "fileModificationChecking" - ) + "fileModificationChecking", + fileCheckTypesNames, + fileModificationChecking ) ); diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C index 7a73a8b440..78b0158a00 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C +++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -455,7 +455,12 @@ registerOptSwitch Foam::UPstream::commsTypes Foam::UPstream::defaultCommsType ( - commsTypeNames.read(Foam::debug::optimisationSwitches().lookup("commsType")) + Foam::debug::namedEnumOptimisationSwitch + ( + "commsType", + commsTypeNames, + defaultCommsType + ) ); registerOptNamedEnum ( diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C index 9fc2d8466d..8f095f96b1 100644 --- a/src/OpenFOAM/global/debug/debug.C +++ b/src/OpenFOAM/global/debug/debug.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,10 +47,45 @@ namespace debug //- Skip documentation : local scope only dictionary* controlDictPtr_(nullptr); + dictionary* debugSwitchesPtr_(nullptr); dictionary* infoSwitchesPtr_(nullptr); dictionary* optimisationSwitchesPtr_(nullptr); +dictionary* debugDefaultSwitchesPtr_(nullptr); +dictionary* infoDefaultSwitchesPtr_(nullptr); +dictionary* optimisationDefaultSwitchesPtr_(nullptr); + +dictionary& debugDefaultSwitches() +{ + if (!debugDefaultSwitchesPtr_) + { + debugDefaultSwitchesPtr_ = new dictionary(); + } + + return *debugDefaultSwitchesPtr_; +} + +dictionary& infoDefaultSwitches() +{ + if (!infoDefaultSwitchesPtr_) + { + infoDefaultSwitchesPtr_ = new dictionary(); + } + + return *infoDefaultSwitchesPtr_; +} + +dictionary& optimisationDefaultSwitches() +{ + if (!optimisationDefaultSwitchesPtr_) + { + optimisationDefaultSwitchesPtr_ = new dictionary(); + } + + return *optimisationDefaultSwitchesPtr_; +} + // Debug switch read and write callback tables. simpleObjectRegistry* debugObjectsPtr_(nullptr); simpleObjectRegistry* infoObjectsPtr_(nullptr); @@ -58,7 +93,6 @@ simpleObjectRegistry* optimisationObjectsPtr_(nullptr); simpleObjectRegistry* dimensionSetObjectsPtr_(nullptr); simpleObjectRegistry* dimensionedConstantObjectsPtr_(nullptr); - // To ensure controlDictPtr_ is deleted at the end of the run class deleteControlDictPtr { @@ -75,9 +109,14 @@ public: deleteDemandDrivenData(dimensionSetObjectsPtr_); deleteDemandDrivenData(dimensionedConstantObjectsPtr_); + deleteDemandDrivenData(debugDefaultSwitchesPtr_); + deleteDemandDrivenData(infoDefaultSwitchesPtr_); + deleteDemandDrivenData(optimisationDefaultSwitchesPtr_); + debugSwitchesPtr_ = nullptr; infoSwitchesPtr_ = nullptr; optimisationSwitchesPtr_ = nullptr; + deleteDemandDrivenData(controlDictPtr_); } }; @@ -177,6 +216,19 @@ Foam::dictionary& Foam::debug::optimisationSwitches() int Foam::debug::debugSwitch(const char* name, const int defaultValue) { + if + ( + debugDefaultSwitches().found(name) + && debugDefaultSwitches().lookup(name) != defaultValue + ) + { + FatalErrorInFunction + << "Multiple defaults set for debug switch " << name + << exit(FatalError); + } + + debugDefaultSwitches().set(name, defaultValue); + return debugSwitches().lookupOrAddDefault ( name, defaultValue, false, false @@ -186,6 +238,19 @@ int Foam::debug::debugSwitch(const char* name, const int defaultValue) int Foam::debug::infoSwitch(const char* name, const int defaultValue) { + if + ( + infoDefaultSwitches().found(name) + && infoDefaultSwitches().lookup(name) != defaultValue + ) + { + FatalErrorInFunction + << "Multiple defaults set for info switch " << name + << exit(FatalError); + } + + infoDefaultSwitches().set(name, defaultValue); + return infoSwitches().lookupOrAddDefault ( name, defaultValue, false, false @@ -195,6 +260,19 @@ int Foam::debug::infoSwitch(const char* name, const int defaultValue) int Foam::debug::optimisationSwitch(const char* name, const int defaultValue) { + if + ( + optimisationDefaultSwitches().found(name) + && optimisationDefaultSwitches().lookup(name) != defaultValue + ) + { + FatalErrorInFunction + << "Multiple defaults set for optimisation switch " << name + << exit(FatalError); + } + + optimisationDefaultSwitches().set(name, defaultValue); + return optimisationSwitches().lookupOrAddDefault ( name, defaultValue, false, false @@ -208,6 +286,43 @@ float Foam::debug::floatOptimisationSwitch const float defaultValue ) { + if + ( + optimisationDefaultSwitches().found(name) + && optimisationDefaultSwitches().lookup(name) != defaultValue + ) + { + FatalErrorInFunction + << exit(FatalError); + } + + optimisationDefaultSwitches().set(name, defaultValue); + + return optimisationSwitches().lookupOrAddDefault + ( + name, defaultValue, false, false + ); +} + + +const Foam::word Foam::debug::wordOptimisationSwitch +( + const char* name, + const word& defaultValue +) +{ + if + ( + optimisationDefaultSwitches().found(name) + && optimisationDefaultSwitches().lookup(name) != defaultValue + ) + { + FatalErrorInFunction + << exit(FatalError); + } + + optimisationDefaultSwitches().set(name, defaultValue); + return optimisationSwitches().lookupOrAddDefault ( name, defaultValue, false, false @@ -450,29 +565,138 @@ void listSwitches } } -} - - -void Foam::debug::listSwitches(const bool unset) +void listSwitches +( + const word& name, + const dictionary& switches, + const dictionary& defaultSwitches, + const simpleObjectRegistry& registry +) { - listSwitches + wordHashSet registeredDefaultSet; + wordHashSet registeredNonDefaultSet; + wordHashSet nonRegisteredDefaultSet; + wordHashSet nonRegisteredNonDefaultSet; + wordHashSet noDefaultSet; + + forAllConstIter(dictionary, switches, iter) + { + const word& name = iter().keyword(); + + const bool hasDefault = defaultSwitches.found(name); + + const bool isRegistered = registry.found(name); + + const bool isDefault = + hasDefault + && defaultSwitches.lookupEntry(name, false, false) == iter(); + + if (hasDefault) + { + if (isRegistered) + { + if (isDefault) + { + registeredDefaultSet.insert(name); + } + else + { + registeredNonDefaultSet.insert(name); + } + } + else + { + if (isDefault) + { + nonRegisteredDefaultSet.insert(name); + } + else + { + nonRegisteredNonDefaultSet.insert(name); + } + } + } + else + { + noDefaultSet.insert(name); + } + } + + auto print = [&](const char* heading, const wordList& names) + { + Info<< indent << "// " << heading << endl; + + forAll(names, i) + { + Info<< switches.lookupEntry(names[i], false, false); + } + }; + + Info<< name << endl + << token::BEGIN_BLOCK << endl << incrIndent; + + print ( - debug::debugSwitches().sortedToc(), - debug::infoSwitches().sortedToc(), - debug::optimisationSwitches().sortedToc(), - unset + "Registered switches with default values", + registeredDefaultSet.sortedToc() ); + Info<< nl; + print + ( + "Registered switches with non default values", + registeredNonDefaultSet.sortedToc() + ); + Info<< nl; + print + ( + "Non-registered switches with default values", + nonRegisteredDefaultSet.sortedToc() + ); + Info<< nl; + print + ( + "Non-registered switches with non-default values", + nonRegisteredNonDefaultSet.sortedToc() + ); + Info<< nl; + print + ( + "Switches without defaults", + noDefaultSet.sortedToc() + ); + + Info<< decrIndent << token::END_BLOCK << endl; +} + } -void Foam::debug::listRegisteredSwitches(const bool unset) +void Foam::debug::listSwitches() { listSwitches ( - debug::debugObjects().sortedToc(), - debug::infoObjects().sortedToc(), - debug::optimisationObjects().sortedToc(), - unset + "DebugSwitches", + debug::debugSwitches(), + debug::debugDefaultSwitches(), + debug::debugObjects() + ); + Info<< endl; + + listSwitches + ( + "InfoSwitches", + debug::infoSwitches(), + debug::infoDefaultSwitches(), + debug::infoObjects() + ); + Info<< endl; + + listSwitches + ( + "OptimisationSwitches", + debug::optimisationSwitches(), + debug::optimisationDefaultSwitches(), + debug::optimisationObjects() ); } diff --git a/src/OpenFOAM/global/debug/debug.H b/src/OpenFOAM/global/debug/debug.H index 391893658c..97d5cb9830 100644 --- a/src/OpenFOAM/global/debug/debug.H +++ b/src/OpenFOAM/global/debug/debug.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,6 +46,8 @@ class Istream; class Ostream; class simpleRegIOobject; class simpleObjectRegistry; +class word; +template class NamedEnum; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,11 +83,37 @@ namespace debug const float defaultValue=0 ); + //- Lookup optimisation switch or add default value. + const word wordOptimisationSwitch + ( + const char* name, + const word& defaultValue + ); + + //- Lookup optimisation switch or add default value. + template + Enum namedEnumOptimisationSwitch + ( + const char* name, + const NamedEnum& enumNames, + const Enum defaultValue + ) + { + return enumNames + [ + debug::wordOptimisationSwitch + ( + name, + enumNames[defaultValue] + ) + ]; + } + //- Internal function to lookup a sub-dictionary from controlDict. dictionary& switchSet(const char* subDictName, dictionary*& subDictPtr); //- List debug switches - void listSwitches(const bool unset); + void listSwitches(); // Registered debug switches @@ -121,12 +149,9 @@ namespace debug //- Get access to registered dimensionedConstant switch objects simpleObjectRegistry& dimensionedConstantObjects(); - //- List registered debug switches - void listRegisteredSwitches(const bool unset); } // End namespace debug - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/OpenFOAM/include/listOptions.H b/src/OpenFOAM/include/listOptions.H index 202654c6cb..cf81acf824 100644 --- a/src/OpenFOAM/include/listOptions.H +++ b/src/OpenFOAM/include/listOptions.H @@ -1,17 +1,7 @@ argList::addBoolOption ( "listSwitches", - "List switches declared in libraries but not set in etc/controlDict" -); -argList::addBoolOption -( - "listRegisteredSwitches", - "List switches registered for run-time modification" -); -argList::addBoolOption -( - "listUnsetSwitches", - "List switches declared in libraries but not set in etc/controlDict" + "List all available debug, info and optimisation switches" ); #ifdef fvPatchField_H diff --git a/src/OpenFOAM/include/listOutput.H b/src/OpenFOAM/include/listOutput.H index c94f052d29..418545dc34 100644 --- a/src/OpenFOAM/include/listOutput.H +++ b/src/OpenFOAM/include/listOutput.H @@ -1,20 +1,8 @@ -bool listOptions = false ; +bool listOptions = false; -if -( - args.optionFound("listSwitches") -) +if (args.optionFound("listSwitches")) { - debug::listSwitches(args.optionFound("includeUnsetSwitches")); - listOptions = true; -} - -if -( - args.optionFound("listRegisteredSwitches") -) -{ - debug::listRegisteredSwitches(args.optionFound("includeUnsetSwitches")); + debug::listSwitches(); listOptions = true; }