diff --git a/applications/utilities/postProcessing/foamPostProcess/foamPostProcess.C b/applications/utilities/postProcessing/foamPostProcess/foamPostProcess.C index 1df48a5aaa..fe0ca2cf36 100644 --- a/applications/utilities/postProcessing/foamPostProcess/foamPostProcess.C +++ b/applications/utilities/postProcessing/foamPostProcess/foamPostProcess.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2022-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -279,19 +279,10 @@ int main(int argc, char *argv[]) } } - // Externally stored dictionary for functionObjectList - // if not constructed from runTime - dictionary functionsControlDict("controlDict"); - // Construct functionObjectList autoPtr functionsPtr ( - functionObjectList::New - ( - args, - runTime, - functionsControlDict - ) + functionObjectList::New(args, runTime) ); forAll(timeDirs, timei) @@ -303,12 +294,7 @@ int main(int argc, char *argv[]) if (mesh.readUpdate() != fvMesh::UNCHANGED) { // Update functionObjectList if mesh changes - functionsPtr = functionObjectList::New - ( - args, - runTime, - functionsControlDict - ); + functionsPtr = functionObjectList::New(args, runTime); } FatalIOError.throwExceptions(); diff --git a/bin/foamGet b/bin/foamGet index cd8c4155d5..fa8b056844 100755 --- a/bin/foamGet +++ b/bin/foamGet @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2018-2024 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -119,7 +119,7 @@ listArgs () { # Prioritise suggestion locations _tests="\ - caseDicts/postProcessing/ \ + caseDicts/functions/ \ caseDicts/preProcessing/ \ caseDicts/general/ \ caseDicts/mesh/ \ diff --git a/bin/foamInfo b/bin/foamInfo index 18ea9270c7..2a9a159c72 100755 --- a/bin/foamInfo +++ b/bin/foamInfo @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2018-2023 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2018-2024 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -163,7 +163,7 @@ listArgs() { _tests="\ fields/fvPatchFields/ \ fvMesh/fvPatches/ \ - caseDicts/postProcessing/" + caseDicts/functions/" _n=0 for _t in $_tests diff --git a/etc/caseDicts/postProcessing/combustion/Qdot b/etc/caseDicts/functions/combustion/Qdot similarity index 100% rename from etc/caseDicts/postProcessing/combustion/Qdot rename to etc/caseDicts/functions/combustion/Qdot diff --git a/etc/caseDicts/postProcessing/combustion/XiReactionRate b/etc/caseDicts/functions/combustion/XiReactionRate similarity index 100% rename from etc/caseDicts/postProcessing/combustion/XiReactionRate rename to etc/caseDicts/functions/combustion/XiReactionRate diff --git a/etc/caseDicts/postProcessing/control/adjustTimeStepToChemistry b/etc/caseDicts/functions/control/adjustTimeStepToChemistry similarity index 100% rename from etc/caseDicts/postProcessing/control/adjustTimeStepToChemistry rename to etc/caseDicts/functions/control/adjustTimeStepToChemistry diff --git a/etc/caseDicts/postProcessing/control/adjustTimeStepToCombustion b/etc/caseDicts/functions/control/adjustTimeStepToCombustion similarity index 100% rename from etc/caseDicts/postProcessing/control/adjustTimeStepToCombustion rename to etc/caseDicts/functions/control/adjustTimeStepToCombustion diff --git a/etc/caseDicts/postProcessing/control/stopAtClockTime b/etc/caseDicts/functions/control/stopAtClockTime similarity index 100% rename from etc/caseDicts/postProcessing/control/stopAtClockTime rename to etc/caseDicts/functions/control/stopAtClockTime diff --git a/etc/caseDicts/postProcessing/control/stopAtFile b/etc/caseDicts/functions/control/stopAtFile similarity index 100% rename from etc/caseDicts/postProcessing/control/stopAtFile rename to etc/caseDicts/functions/control/stopAtFile diff --git a/etc/caseDicts/postProcessing/control/stopAtTimeStep b/etc/caseDicts/functions/control/stopAtTimeStep similarity index 100% rename from etc/caseDicts/postProcessing/control/stopAtTimeStep rename to etc/caseDicts/functions/control/stopAtTimeStep diff --git a/etc/caseDicts/postProcessing/control/time b/etc/caseDicts/functions/control/time similarity index 100% rename from etc/caseDicts/postProcessing/control/time rename to etc/caseDicts/functions/control/time diff --git a/etc/caseDicts/postProcessing/control/timeStep b/etc/caseDicts/functions/control/timeStep similarity index 100% rename from etc/caseDicts/postProcessing/control/timeStep rename to etc/caseDicts/functions/control/timeStep diff --git a/etc/caseDicts/postProcessing/control/writeObjects b/etc/caseDicts/functions/control/writeObjects similarity index 100% rename from etc/caseDicts/postProcessing/control/writeObjects rename to etc/caseDicts/functions/control/writeObjects diff --git a/etc/caseDicts/postProcessing/fields/CourantNo b/etc/caseDicts/functions/fields/CourantNo similarity index 100% rename from etc/caseDicts/postProcessing/fields/CourantNo rename to etc/caseDicts/functions/fields/CourantNo diff --git a/etc/caseDicts/postProcessing/fields/Lambda2 b/etc/caseDicts/functions/fields/Lambda2 similarity index 100% rename from etc/caseDicts/postProcessing/fields/Lambda2 rename to etc/caseDicts/functions/fields/Lambda2 diff --git a/etc/caseDicts/postProcessing/fields/MachNo b/etc/caseDicts/functions/fields/MachNo similarity index 100% rename from etc/caseDicts/postProcessing/fields/MachNo rename to etc/caseDicts/functions/fields/MachNo diff --git a/etc/caseDicts/postProcessing/fields/PecletNo b/etc/caseDicts/functions/fields/PecletNo similarity index 100% rename from etc/caseDicts/postProcessing/fields/PecletNo rename to etc/caseDicts/functions/fields/PecletNo diff --git a/etc/caseDicts/postProcessing/fields/Q b/etc/caseDicts/functions/fields/Q similarity index 100% rename from etc/caseDicts/postProcessing/fields/Q rename to etc/caseDicts/functions/fields/Q diff --git a/etc/caseDicts/postProcessing/fields/age b/etc/caseDicts/functions/fields/age similarity index 100% rename from etc/caseDicts/postProcessing/fields/age rename to etc/caseDicts/functions/fields/age diff --git a/etc/caseDicts/postProcessing/fields/components b/etc/caseDicts/functions/fields/components similarity index 100% rename from etc/caseDicts/postProcessing/fields/components rename to etc/caseDicts/functions/fields/components diff --git a/etc/caseDicts/postProcessing/fields/ddt b/etc/caseDicts/functions/fields/ddt similarity index 100% rename from etc/caseDicts/postProcessing/fields/ddt rename to etc/caseDicts/functions/fields/ddt diff --git a/etc/caseDicts/postProcessing/fields/div b/etc/caseDicts/functions/fields/div similarity index 100% rename from etc/caseDicts/postProcessing/fields/div rename to etc/caseDicts/functions/fields/div diff --git a/etc/caseDicts/postProcessing/fields/enstrophy b/etc/caseDicts/functions/fields/enstrophy similarity index 100% rename from etc/caseDicts/postProcessing/fields/enstrophy rename to etc/caseDicts/functions/fields/enstrophy diff --git a/etc/caseDicts/postProcessing/fields/fieldAverage b/etc/caseDicts/functions/fields/fieldAverage similarity index 91% rename from etc/caseDicts/postProcessing/fields/fieldAverage rename to etc/caseDicts/functions/fields/fieldAverage index 1d3d24ede2..e4c48b0c7d 100644 --- a/etc/caseDicts/postProcessing/fields/fieldAverage +++ b/etc/caseDicts/functions/fields/fieldAverage @@ -10,7 +10,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg" +#includeEtc "caseDicts/functions/fields/fieldAverage.cfg" mean yes; prime2Mean no; diff --git a/etc/caseDicts/postProcessing/fields/fieldAverage.cfg b/etc/caseDicts/functions/fields/fieldAverage.cfg similarity index 100% rename from etc/caseDicts/postProcessing/fields/fieldAverage.cfg rename to etc/caseDicts/functions/fields/fieldAverage.cfg diff --git a/etc/caseDicts/postProcessing/fields/flowType b/etc/caseDicts/functions/fields/flowType similarity index 100% rename from etc/caseDicts/postProcessing/fields/flowType rename to etc/caseDicts/functions/fields/flowType diff --git a/etc/caseDicts/postProcessing/fields/grad b/etc/caseDicts/functions/fields/grad similarity index 100% rename from etc/caseDicts/postProcessing/fields/grad rename to etc/caseDicts/functions/fields/grad diff --git a/etc/caseDicts/postProcessing/fields/log b/etc/caseDicts/functions/fields/log similarity index 100% rename from etc/caseDicts/postProcessing/fields/log rename to etc/caseDicts/functions/fields/log diff --git a/etc/caseDicts/postProcessing/fields/mag b/etc/caseDicts/functions/fields/mag similarity index 100% rename from etc/caseDicts/postProcessing/fields/mag rename to etc/caseDicts/functions/fields/mag diff --git a/etc/caseDicts/postProcessing/fields/magSqr b/etc/caseDicts/functions/fields/magSqr similarity index 100% rename from etc/caseDicts/postProcessing/fields/magSqr rename to etc/caseDicts/functions/fields/magSqr diff --git a/etc/caseDicts/postProcessing/fields/massFractions b/etc/caseDicts/functions/fields/massFractions similarity index 100% rename from etc/caseDicts/postProcessing/fields/massFractions rename to etc/caseDicts/functions/fields/massFractions diff --git a/etc/caseDicts/postProcessing/fields/moleFractions b/etc/caseDicts/functions/fields/moleFractions similarity index 100% rename from etc/caseDicts/postProcessing/fields/moleFractions rename to etc/caseDicts/functions/fields/moleFractions diff --git a/etc/caseDicts/postProcessing/fields/randomise b/etc/caseDicts/functions/fields/randomise similarity index 92% rename from etc/caseDicts/postProcessing/fields/randomise rename to etc/caseDicts/functions/fields/randomise index 004fb4156d..f3c16c7fd6 100644 --- a/etc/caseDicts/postProcessing/fields/randomise +++ b/etc/caseDicts/functions/fields/randomise @@ -11,7 +11,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/fields/randomise.cfg" +#includeEtc "caseDicts/functions/fields/randomise.cfg" field ; diff --git a/etc/caseDicts/postProcessing/fields/randomise.cfg b/etc/caseDicts/functions/fields/randomise.cfg similarity index 100% rename from etc/caseDicts/postProcessing/fields/randomise.cfg rename to etc/caseDicts/functions/fields/randomise.cfg diff --git a/etc/caseDicts/postProcessing/fields/reconstruct b/etc/caseDicts/functions/fields/reconstruct similarity index 100% rename from etc/caseDicts/postProcessing/fields/reconstruct rename to etc/caseDicts/functions/fields/reconstruct diff --git a/etc/caseDicts/postProcessing/fields/scale b/etc/caseDicts/functions/fields/scale similarity index 100% rename from etc/caseDicts/postProcessing/fields/scale rename to etc/caseDicts/functions/fields/scale diff --git a/etc/caseDicts/postProcessing/fields/shearStress b/etc/caseDicts/functions/fields/shearStress similarity index 100% rename from etc/caseDicts/postProcessing/fields/shearStress rename to etc/caseDicts/functions/fields/shearStress diff --git a/etc/caseDicts/postProcessing/fields/streamFunction b/etc/caseDicts/functions/fields/streamFunction similarity index 100% rename from etc/caseDicts/postProcessing/fields/streamFunction rename to etc/caseDicts/functions/fields/streamFunction diff --git a/etc/caseDicts/postProcessing/fields/surfaceInterpolate b/etc/caseDicts/functions/fields/surfaceInterpolate similarity index 100% rename from etc/caseDicts/postProcessing/fields/surfaceInterpolate rename to etc/caseDicts/functions/fields/surfaceInterpolate diff --git a/etc/caseDicts/postProcessing/fields/totalEnthalpy b/etc/caseDicts/functions/fields/totalEnthalpy similarity index 100% rename from etc/caseDicts/postProcessing/fields/totalEnthalpy rename to etc/caseDicts/functions/fields/totalEnthalpy diff --git a/etc/caseDicts/postProcessing/fields/turbulenceFields b/etc/caseDicts/functions/fields/turbulenceFields similarity index 100% rename from etc/caseDicts/postProcessing/fields/turbulenceFields rename to etc/caseDicts/functions/fields/turbulenceFields diff --git a/etc/caseDicts/postProcessing/fields/turbulenceIntensity b/etc/caseDicts/functions/fields/turbulenceIntensity similarity index 100% rename from etc/caseDicts/postProcessing/fields/turbulenceIntensity rename to etc/caseDicts/functions/fields/turbulenceIntensity diff --git a/etc/caseDicts/postProcessing/fields/vorticity b/etc/caseDicts/functions/fields/vorticity similarity index 100% rename from etc/caseDicts/postProcessing/fields/vorticity rename to etc/caseDicts/functions/fields/vorticity diff --git a/etc/caseDicts/postProcessing/fields/wallHeatFlux b/etc/caseDicts/functions/fields/wallHeatFlux similarity index 100% rename from etc/caseDicts/postProcessing/fields/wallHeatFlux rename to etc/caseDicts/functions/fields/wallHeatFlux diff --git a/etc/caseDicts/postProcessing/fields/wallHeatTransferCoeff b/etc/caseDicts/functions/fields/wallHeatTransferCoeff similarity index 100% rename from etc/caseDicts/postProcessing/fields/wallHeatTransferCoeff rename to etc/caseDicts/functions/fields/wallHeatTransferCoeff diff --git a/etc/caseDicts/postProcessing/fields/wallShearStress b/etc/caseDicts/functions/fields/wallShearStress similarity index 100% rename from etc/caseDicts/postProcessing/fields/wallShearStress rename to etc/caseDicts/functions/fields/wallShearStress diff --git a/etc/caseDicts/postProcessing/fields/writeCellCentres b/etc/caseDicts/functions/fields/writeCellCentres similarity index 100% rename from etc/caseDicts/postProcessing/fields/writeCellCentres rename to etc/caseDicts/functions/fields/writeCellCentres diff --git a/etc/caseDicts/postProcessing/fields/writeCellVolumes b/etc/caseDicts/functions/fields/writeCellVolumes similarity index 100% rename from etc/caseDicts/postProcessing/fields/writeCellVolumes rename to etc/caseDicts/functions/fields/writeCellVolumes diff --git a/etc/caseDicts/postProcessing/fields/writeVTK b/etc/caseDicts/functions/fields/writeVTK similarity index 100% rename from etc/caseDicts/postProcessing/fields/writeVTK rename to etc/caseDicts/functions/fields/writeVTK diff --git a/etc/caseDicts/postProcessing/fields/yPlus b/etc/caseDicts/functions/fields/yPlus similarity index 100% rename from etc/caseDicts/postProcessing/fields/yPlus rename to etc/caseDicts/functions/fields/yPlus diff --git a/etc/caseDicts/postProcessing/fieldsOperations/add b/etc/caseDicts/functions/fieldsOperations/add similarity index 100% rename from etc/caseDicts/postProcessing/fieldsOperations/add rename to etc/caseDicts/functions/fieldsOperations/add diff --git a/etc/caseDicts/postProcessing/fieldsOperations/divide b/etc/caseDicts/functions/fieldsOperations/divide similarity index 100% rename from etc/caseDicts/postProcessing/fieldsOperations/divide rename to etc/caseDicts/functions/fieldsOperations/divide diff --git a/etc/caseDicts/postProcessing/fieldsOperations/multiply b/etc/caseDicts/functions/fieldsOperations/multiply similarity index 100% rename from etc/caseDicts/postProcessing/fieldsOperations/multiply rename to etc/caseDicts/functions/fieldsOperations/multiply diff --git a/etc/caseDicts/postProcessing/fieldsOperations/subtract b/etc/caseDicts/functions/fieldsOperations/subtract similarity index 100% rename from etc/caseDicts/postProcessing/fieldsOperations/subtract rename to etc/caseDicts/functions/fieldsOperations/subtract diff --git a/etc/caseDicts/postProcessing/fieldsOperations/uniform b/etc/caseDicts/functions/fieldsOperations/uniform similarity index 100% rename from etc/caseDicts/postProcessing/fieldsOperations/uniform rename to etc/caseDicts/functions/fieldsOperations/uniform diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg b/etc/caseDicts/functions/forces/forceCoeffs.cfg similarity index 89% rename from etc/caseDicts/postProcessing/forces/forceCoeffs.cfg rename to etc/caseDicts/functions/forces/forceCoeffs.cfg index 1f9a0e065d..a62fb5ff4c 100644 --- a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg +++ b/etc/caseDicts/functions/forces/forceCoeffs.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/forces/forces.cfg" +#includeEtc "caseDicts/functions/forces/forces.cfg" type forceCoeffs; diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible b/etc/caseDicts/functions/forces/forceCoeffsCompressible similarity index 95% rename from etc/caseDicts/postProcessing/forces/forceCoeffsCompressible rename to etc/caseDicts/functions/forces/forceCoeffsCompressible index e273a8edf3..660660d4a9 100644 --- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible +++ b/etc/caseDicts/functions/forces/forceCoeffsCompressible @@ -12,7 +12,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg" +#includeEtc "caseDicts/functions/forces/forceCoeffs.cfg" patches (); // Names of patches on which to calculate forces diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible b/etc/caseDicts/functions/forces/forceCoeffsIncompressible similarity index 94% rename from etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible rename to etc/caseDicts/functions/forces/forceCoeffsIncompressible index ba2ac8d21e..33d8761fae 100644 --- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible +++ b/etc/caseDicts/functions/forces/forceCoeffsIncompressible @@ -12,7 +12,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg" +#includeEtc "caseDicts/functions/forces/forceCoeffsIncompressible.cfg" patches (); // Names of patches on which to calculate forces diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg b/etc/caseDicts/functions/forces/forceCoeffsIncompressible.cfg similarity index 89% rename from etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg rename to etc/caseDicts/functions/forces/forceCoeffsIncompressible.cfg index eba9e0ac08..9bcc6dec95 100644 --- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg +++ b/etc/caseDicts/functions/forces/forceCoeffsIncompressible.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg" +#includeEtc "caseDicts/functions/forces/forceCoeffs.cfg" rho rhoInf; rhoInf 1; // Redundant, but currently read in diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/functions/forces/forces.cfg similarity index 100% rename from etc/caseDicts/postProcessing/forces/forces.cfg rename to etc/caseDicts/functions/forces/forces.cfg diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible b/etc/caseDicts/functions/forces/forcesCompressible similarity index 94% rename from etc/caseDicts/postProcessing/forces/forcesCompressible rename to etc/caseDicts/functions/forces/forcesCompressible index b506ca4d09..ffac76c3e6 100644 --- a/etc/caseDicts/postProcessing/forces/forcesCompressible +++ b/etc/caseDicts/functions/forces/forcesCompressible @@ -11,7 +11,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/forces/forces.cfg" +#includeEtc "caseDicts/functions/forces/forces.cfg" patches (); // Names of patches on which to calculate forces diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible b/etc/caseDicts/functions/forces/forcesIncompressible similarity index 93% rename from etc/caseDicts/postProcessing/forces/forcesIncompressible rename to etc/caseDicts/functions/forces/forcesIncompressible index 971dbbdf66..2d2ea82499 100644 --- a/etc/caseDicts/postProcessing/forces/forcesIncompressible +++ b/etc/caseDicts/functions/forces/forcesIncompressible @@ -12,7 +12,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/forces/forcesIncompressible.cfg" +#includeEtc "caseDicts/functions/forces/forcesIncompressible.cfg" patches (); // Names of patches on which to calculate forces diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg b/etc/caseDicts/functions/forces/forcesIncompressible.cfg similarity index 89% rename from etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg rename to etc/caseDicts/functions/forces/forcesIncompressible.cfg index 5fec4bce04..f433f14bc7 100644 --- a/etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg +++ b/etc/caseDicts/functions/forces/forcesIncompressible.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/forces/forces.cfg" +#includeEtc "caseDicts/functions/forces/forces.cfg" rho rhoInf; diff --git a/etc/caseDicts/postProcessing/graphs/graph.cfg b/etc/caseDicts/functions/graphs/graph.cfg similarity index 100% rename from etc/caseDicts/postProcessing/graphs/graph.cfg rename to etc/caseDicts/functions/graphs/graph.cfg diff --git a/etc/caseDicts/postProcessing/graphs/graphCell b/etc/caseDicts/functions/graphs/graphCell similarity index 94% rename from etc/caseDicts/postProcessing/graphs/graphCell rename to etc/caseDicts/functions/graphs/graphCell index ba876d51c9..8a0989532e 100644 --- a/etc/caseDicts/postProcessing/graphs/graphCell +++ b/etc/caseDicts/functions/graphs/graphCell @@ -21,6 +21,6 @@ axis distance; // The independent variable of the graph. Can be "x", // "y", "z", "xyz" (all coordinates written out), or // "distance" (from the start point). -#includeEtc "caseDicts/postProcessing/graphs/graphCell.cfg" +#includeEtc "caseDicts/functions/graphs/graphCell.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/graphs/graphCell.cfg b/etc/caseDicts/functions/graphs/graphCell.cfg similarity index 91% rename from etc/caseDicts/postProcessing/graphs/graphCell.cfg rename to etc/caseDicts/functions/graphs/graphCell.cfg index c3b858c302..f913b48a5e 100644 --- a/etc/caseDicts/postProcessing/graphs/graphCell.cfg +++ b/etc/caseDicts/functions/graphs/graphCell.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/graphs/graph.cfg" +#includeEtc "caseDicts/functions/graphs/graph.cfg" sets ( diff --git a/etc/caseDicts/postProcessing/graphs/graphCellFace b/etc/caseDicts/functions/graphs/graphCellFace similarity index 94% rename from etc/caseDicts/postProcessing/graphs/graphCellFace rename to etc/caseDicts/functions/graphs/graphCellFace index 9c02d11066..ecce633c38 100644 --- a/etc/caseDicts/postProcessing/graphs/graphCellFace +++ b/etc/caseDicts/functions/graphs/graphCellFace @@ -21,6 +21,6 @@ axis distance; // The independent variable of the graph. Can be "x", // "y", "z", "xyz" (all coordinates written out), or // "distance" (from the start point). -#includeEtc "caseDicts/postProcessing/graphs/graphCellFace.cfg" +#includeEtc "caseDicts/functions/graphs/graphCellFace.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/graphs/graphCellFace.cfg b/etc/caseDicts/functions/graphs/graphCellFace.cfg similarity index 91% rename from etc/caseDicts/postProcessing/graphs/graphCellFace.cfg rename to etc/caseDicts/functions/graphs/graphCellFace.cfg index 66da2f1d8f..ca7d4ed0b7 100644 --- a/etc/caseDicts/postProcessing/graphs/graphCellFace.cfg +++ b/etc/caseDicts/functions/graphs/graphCellFace.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/graphs/graph.cfg" +#includeEtc "caseDicts/functions/graphs/graph.cfg" sets ( diff --git a/etc/caseDicts/postProcessing/graphs/graphFace b/etc/caseDicts/functions/graphs/graphFace similarity index 94% rename from etc/caseDicts/postProcessing/graphs/graphFace rename to etc/caseDicts/functions/graphs/graphFace index 96d83d66ed..1823222aac 100644 --- a/etc/caseDicts/postProcessing/graphs/graphFace +++ b/etc/caseDicts/functions/graphs/graphFace @@ -21,6 +21,6 @@ axis distance; // The independent variable of the graph. Can be "x", // "y", "z", "xyz" (all coordinates written out), or // "distance" (from the start point). -#includeEtc "caseDicts/postProcessing/graphs/graphFace.cfg" +#includeEtc "caseDicts/functions/graphs/graphFace.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/graphs/graphFace.cfg b/etc/caseDicts/functions/graphs/graphFace.cfg similarity index 91% rename from etc/caseDicts/postProcessing/graphs/graphFace.cfg rename to etc/caseDicts/functions/graphs/graphFace.cfg index 12a3b45c19..cc410733ec 100644 --- a/etc/caseDicts/postProcessing/graphs/graphFace.cfg +++ b/etc/caseDicts/functions/graphs/graphFace.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/graphs/graph.cfg" +#includeEtc "caseDicts/functions/graphs/graph.cfg" sets ( diff --git a/etc/caseDicts/postProcessing/graphs/graphLayerAverage b/etc/caseDicts/functions/graphs/graphLayerAverage similarity index 95% rename from etc/caseDicts/postProcessing/graphs/graphLayerAverage rename to etc/caseDicts/functions/graphs/graphLayerAverage index 429089f587..edd5e6cc06 100644 --- a/etc/caseDicts/postProcessing/graphs/graphLayerAverage +++ b/etc/caseDicts/functions/graphs/graphLayerAverage @@ -27,6 +27,6 @@ fields (); // Fields to average //weightField ; // Field or fields with which to weight //weightFields (); // the average -#includeEtc "caseDicts/postProcessing/graphs/graphLayerAverage.cfg" +#includeEtc "caseDicts/functions/graphs/graphLayerAverage.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/graphs/graphLayerAverage.cfg b/etc/caseDicts/functions/graphs/graphLayerAverage.cfg similarity index 100% rename from etc/caseDicts/postProcessing/graphs/graphLayerAverage.cfg rename to etc/caseDicts/functions/graphs/graphLayerAverage.cfg diff --git a/etc/caseDicts/postProcessing/graphs/graphPatchCutLayerAverage b/etc/caseDicts/functions/graphs/graphPatchCutLayerAverage similarity index 95% rename from etc/caseDicts/postProcessing/graphs/graphPatchCutLayerAverage rename to etc/caseDicts/functions/graphs/graphPatchCutLayerAverage index ebc9401ac7..363e3df564 100644 --- a/etc/caseDicts/postProcessing/graphs/graphPatchCutLayerAverage +++ b/etc/caseDicts/functions/graphs/graphPatchCutLayerAverage @@ -32,6 +32,6 @@ axis default; // The independent variable of the graph. Can be fields (); -#includeEtc "caseDicts/postProcessing/graphs/graphPatchCutLayerAverage.cfg" +#includeEtc "caseDicts/functions/graphs/graphPatchCutLayerAverage.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/graphs/graphPatchCutLayerAverage.cfg b/etc/caseDicts/functions/graphs/graphPatchCutLayerAverage.cfg similarity index 100% rename from etc/caseDicts/postProcessing/graphs/graphPatchCutLayerAverage.cfg rename to etc/caseDicts/functions/graphs/graphPatchCutLayerAverage.cfg diff --git a/etc/caseDicts/postProcessing/graphs/graphUniform b/etc/caseDicts/functions/graphs/graphUniform similarity index 94% rename from etc/caseDicts/postProcessing/graphs/graphUniform rename to etc/caseDicts/functions/graphs/graphUniform index ccf80ff66b..eae5f9a9a9 100644 --- a/etc/caseDicts/postProcessing/graphs/graphUniform +++ b/etc/caseDicts/functions/graphs/graphUniform @@ -22,6 +22,6 @@ axis distance; // The independent variable of the graph. Can be "x", // "y", "z", "xyz" (all coordinates written out), or // "distance" (from the start point). -#includeEtc "caseDicts/postProcessing/graphs/graphUniform.cfg" +#includeEtc "caseDicts/functions/graphs/graphUniform.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/graphs/graphUniform.cfg b/etc/caseDicts/functions/graphs/graphUniform.cfg similarity index 92% rename from etc/caseDicts/postProcessing/graphs/graphUniform.cfg rename to etc/caseDicts/functions/graphs/graphUniform.cfg index 270c689cac..a6fc7f69b0 100644 --- a/etc/caseDicts/postProcessing/graphs/graphUniform.cfg +++ b/etc/caseDicts/functions/graphs/graphUniform.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/graphs/graph.cfg" +#includeEtc "caseDicts/functions/graphs/graph.cfg" sets ( diff --git a/etc/caseDicts/postProcessing/lagrangian/dsmcFields b/etc/caseDicts/functions/lagrangian/dsmcFields similarity index 100% rename from etc/caseDicts/postProcessing/lagrangian/dsmcFields rename to etc/caseDicts/functions/lagrangian/dsmcFields diff --git a/etc/caseDicts/postProcessing/lagrangian/stopAtEmptyClouds b/etc/caseDicts/functions/lagrangian/stopAtEmptyClouds similarity index 100% rename from etc/caseDicts/postProcessing/lagrangian/stopAtEmptyClouds rename to etc/caseDicts/functions/lagrangian/stopAtEmptyClouds diff --git a/etc/caseDicts/postProcessing/mesh/checkMesh b/etc/caseDicts/functions/mesh/checkMesh similarity index 100% rename from etc/caseDicts/postProcessing/mesh/checkMesh rename to etc/caseDicts/functions/mesh/checkMesh diff --git a/etc/caseDicts/postProcessing/multiphase/phaseForces b/etc/caseDicts/functions/multiphase/phaseForces similarity index 100% rename from etc/caseDicts/postProcessing/multiphase/phaseForces rename to etc/caseDicts/functions/multiphase/phaseForces diff --git a/etc/caseDicts/postProcessing/multiphase/phaseMap b/etc/caseDicts/functions/multiphase/phaseMap similarity index 100% rename from etc/caseDicts/postProcessing/multiphase/phaseMap rename to etc/caseDicts/functions/multiphase/phaseMap diff --git a/etc/caseDicts/postProcessing/multiphase/populationBalanceInitialDistributionFs b/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs similarity index 100% rename from etc/caseDicts/postProcessing/multiphase/populationBalanceInitialDistributionFs rename to etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs diff --git a/etc/caseDicts/postProcessing/multiphase/populationBalanceMoments b/etc/caseDicts/functions/multiphase/populationBalanceMoments similarity index 100% rename from etc/caseDicts/postProcessing/multiphase/populationBalanceMoments rename to etc/caseDicts/functions/multiphase/populationBalanceMoments diff --git a/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution b/etc/caseDicts/functions/multiphase/populationBalanceSizeDistribution similarity index 100% rename from etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution rename to etc/caseDicts/functions/multiphase/populationBalanceSizeDistribution diff --git a/etc/caseDicts/postProcessing/multiphase/wallBoilingProperties b/etc/caseDicts/functions/multiphase/wallBoilingProperties similarity index 100% rename from etc/caseDicts/postProcessing/multiphase/wallBoilingProperties rename to etc/caseDicts/functions/multiphase/wallBoilingProperties diff --git a/etc/caseDicts/postProcessing/numerical/residuals b/etc/caseDicts/functions/numerical/residuals similarity index 92% rename from etc/caseDicts/postProcessing/numerical/residuals rename to etc/caseDicts/functions/numerical/residuals index 8b320ca3ab..ab5b2c3596 100644 --- a/etc/caseDicts/postProcessing/numerical/residuals +++ b/etc/caseDicts/functions/numerical/residuals @@ -12,7 +12,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/numerical/residuals.cfg" +#includeEtc "caseDicts/functions/numerical/residuals.cfg" fields (); diff --git a/etc/caseDicts/postProcessing/numerical/residuals.cfg b/etc/caseDicts/functions/numerical/residuals.cfg similarity index 100% rename from etc/caseDicts/postProcessing/numerical/residuals.cfg rename to etc/caseDicts/functions/numerical/residuals.cfg diff --git a/etc/caseDicts/postProcessing/pressure/pressure.cfg b/etc/caseDicts/functions/pressure/pressure.cfg similarity index 100% rename from etc/caseDicts/postProcessing/pressure/pressure.cfg rename to etc/caseDicts/functions/pressure/pressure.cfg diff --git a/etc/caseDicts/postProcessing/pressure/staticPressureIncompressible b/etc/caseDicts/functions/pressure/staticPressureIncompressible similarity index 90% rename from etc/caseDicts/postProcessing/pressure/staticPressureIncompressible rename to etc/caseDicts/functions/pressure/staticPressureIncompressible index 53cd190dbe..53765e7c5e 100644 --- a/etc/caseDicts/postProcessing/pressure/staticPressureIncompressible +++ b/etc/caseDicts/functions/pressure/staticPressureIncompressible @@ -11,7 +11,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/pressure/staticPressureIncompressible.cfg" +#includeEtc "caseDicts/functions/pressure/staticPressureIncompressible.cfg" rhoInf ; // Density with which to scale the kinematic pressure diff --git a/etc/caseDicts/postProcessing/pressure/staticPressureIncompressible.cfg b/etc/caseDicts/functions/pressure/staticPressureIncompressible.cfg similarity index 89% rename from etc/caseDicts/postProcessing/pressure/staticPressureIncompressible.cfg rename to etc/caseDicts/functions/pressure/staticPressureIncompressible.cfg index e5adca6789..7859b97ba6 100644 --- a/etc/caseDicts/postProcessing/pressure/staticPressureIncompressible.cfg +++ b/etc/caseDicts/functions/pressure/staticPressureIncompressible.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg" +#includeEtc "caseDicts/functions/pressure/pressure.cfg" calcTotal no; calcCoeff no; diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible b/etc/caseDicts/functions/pressure/totalPressureCompressible similarity index 89% rename from etc/caseDicts/postProcessing/pressure/totalPressureCompressible rename to etc/caseDicts/functions/pressure/totalPressureCompressible index e5fd6cd502..3a1a338053 100644 --- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible +++ b/etc/caseDicts/functions/pressure/totalPressureCompressible @@ -11,6 +11,6 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/pressure/totalPressureCompressible.cfg" +#includeEtc "caseDicts/functions/pressure/totalPressureCompressible.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg b/etc/caseDicts/functions/pressure/totalPressureCompressible.cfg similarity index 89% rename from etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg rename to etc/caseDicts/functions/pressure/totalPressureCompressible.cfg index ed7e41a05d..36a6f47ae8 100644 --- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg +++ b/etc/caseDicts/functions/pressure/totalPressureCompressible.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg" +#includeEtc "caseDicts/functions/pressure/pressure.cfg" calcTotal yes; calcCoeff no; diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible b/etc/caseDicts/functions/pressure/totalPressureIncompressible similarity index 90% rename from etc/caseDicts/postProcessing/pressure/totalPressureIncompressible rename to etc/caseDicts/functions/pressure/totalPressureIncompressible index 800607cb74..c7393978e8 100644 --- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible +++ b/etc/caseDicts/functions/pressure/totalPressureIncompressible @@ -11,7 +11,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg" +#includeEtc "caseDicts/functions/pressure/totalPressureIncompressible.cfg" rhoInf ; // Density with which to scale the kinematic pressure diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg b/etc/caseDicts/functions/pressure/totalPressureIncompressible.cfg similarity index 89% rename from etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg rename to etc/caseDicts/functions/pressure/totalPressureIncompressible.cfg index 458c3c0e98..e169ae1929 100644 --- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg +++ b/etc/caseDicts/functions/pressure/totalPressureIncompressible.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg" +#includeEtc "caseDicts/functions/pressure/pressure.cfg" calcTotal yes; calcCoeff no; diff --git a/etc/caseDicts/postProcessing/probes/boundaryProbes b/etc/caseDicts/functions/probes/boundaryProbes similarity index 92% rename from etc/caseDicts/postProcessing/probes/boundaryProbes rename to etc/caseDicts/functions/probes/boundaryProbes index c256b6f31f..f049e4b181 100644 --- a/etc/caseDicts/postProcessing/probes/boundaryProbes +++ b/etc/caseDicts/functions/probes/boundaryProbes @@ -18,6 +18,6 @@ patches (".*"); fields (); -#includeEtc "caseDicts/postProcessing/probes/boundaryProbes.cfg" +#includeEtc "caseDicts/functions/probes/boundaryProbes.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/probes/boundaryProbes.cfg b/etc/caseDicts/functions/probes/boundaryProbes.cfg similarity index 100% rename from etc/caseDicts/postProcessing/probes/boundaryProbes.cfg rename to etc/caseDicts/functions/probes/boundaryProbes.cfg diff --git a/etc/caseDicts/postProcessing/probes/interfaceHeight b/etc/caseDicts/functions/probes/interfaceHeight similarity index 94% rename from etc/caseDicts/postProcessing/probes/interfaceHeight rename to etc/caseDicts/functions/probes/interfaceHeight index a1beb17c4a..717e439711 100644 --- a/etc/caseDicts/postProcessing/probes/interfaceHeight +++ b/etc/caseDicts/functions/probes/interfaceHeight @@ -19,6 +19,6 @@ points (); alpha ; -#includeEtc "caseDicts/postProcessing/probes/interfaceHeight.cfg" +#includeEtc "caseDicts/functions/probes/interfaceHeight.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/probes/interfaceHeight.cfg b/etc/caseDicts/functions/probes/interfaceHeight.cfg similarity index 100% rename from etc/caseDicts/postProcessing/probes/interfaceHeight.cfg rename to etc/caseDicts/functions/probes/interfaceHeight.cfg diff --git a/etc/caseDicts/postProcessing/probes/internalProbes b/etc/caseDicts/functions/probes/internalProbes similarity index 91% rename from etc/caseDicts/postProcessing/probes/internalProbes rename to etc/caseDicts/functions/probes/internalProbes index e81933cd49..667c3c8b30 100644 --- a/etc/caseDicts/postProcessing/probes/internalProbes +++ b/etc/caseDicts/functions/probes/internalProbes @@ -16,6 +16,6 @@ fields (); ordered no; -#includeEtc "caseDicts/postProcessing/probes/internalProbes.cfg" +#includeEtc "caseDicts/functions/probes/internalProbes.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/probes/internalProbes.cfg b/etc/caseDicts/functions/probes/internalProbes.cfg similarity index 100% rename from etc/caseDicts/postProcessing/probes/internalProbes.cfg rename to etc/caseDicts/functions/probes/internalProbes.cfg diff --git a/etc/caseDicts/postProcessing/probes/probes b/etc/caseDicts/functions/probes/probes similarity index 92% rename from etc/caseDicts/postProcessing/probes/probes rename to etc/caseDicts/functions/probes/probes index fa9efab5e1..5320196b53 100644 --- a/etc/caseDicts/postProcessing/probes/probes +++ b/etc/caseDicts/functions/probes/probes @@ -14,6 +14,6 @@ points (); fields (); -#includeEtc "caseDicts/postProcessing/probes/probes.cfg" +#includeEtc "caseDicts/functions/probes/probes.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/probes/probes.cfg b/etc/caseDicts/functions/probes/probes.cfg similarity index 100% rename from etc/caseDicts/postProcessing/probes/probes.cfg rename to etc/caseDicts/functions/probes/probes.cfg diff --git a/etc/caseDicts/postProcessing/solvers/particles b/etc/caseDicts/functions/solvers/particles similarity index 100% rename from etc/caseDicts/postProcessing/solvers/particles rename to etc/caseDicts/functions/solvers/particles diff --git a/etc/caseDicts/postProcessing/solvers/phaseScalarTransport b/etc/caseDicts/functions/solvers/phaseScalarTransport similarity index 94% rename from etc/caseDicts/postProcessing/solvers/phaseScalarTransport rename to etc/caseDicts/functions/solvers/phaseScalarTransport index 93d1916045..e9f5398819 100644 --- a/etc/caseDicts/postProcessing/solvers/phaseScalarTransport +++ b/etc/caseDicts/functions/solvers/phaseScalarTransport @@ -17,7 +17,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/solvers/phaseScalarTransport.cfg" +#includeEtc "caseDicts/functions/solvers/phaseScalarTransport.cfg" field ; // Name of the transported scalar schemesField $field; // Name of the field from which to use schemes diff --git a/etc/caseDicts/postProcessing/solvers/phaseScalarTransport.cfg b/etc/caseDicts/functions/solvers/phaseScalarTransport.cfg similarity index 100% rename from etc/caseDicts/postProcessing/solvers/phaseScalarTransport.cfg rename to etc/caseDicts/functions/solvers/phaseScalarTransport.cfg diff --git a/etc/caseDicts/postProcessing/solvers/scalarTransport b/etc/caseDicts/functions/solvers/scalarTransport similarity index 94% rename from etc/caseDicts/postProcessing/solvers/scalarTransport rename to etc/caseDicts/functions/solvers/scalarTransport index 7ff32398bb..2c3d8b6b91 100644 --- a/etc/caseDicts/postProcessing/solvers/scalarTransport +++ b/etc/caseDicts/functions/solvers/scalarTransport @@ -16,7 +16,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/solvers/scalarTransport.cfg" +#includeEtc "caseDicts/functions/solvers/scalarTransport.cfg" field ; // Name of the transported scalar schemesField $field; // Name of the field from which to use schemes diff --git a/etc/caseDicts/postProcessing/solvers/scalarTransport.cfg b/etc/caseDicts/functions/solvers/scalarTransport.cfg similarity index 100% rename from etc/caseDicts/postProcessing/solvers/scalarTransport.cfg rename to etc/caseDicts/functions/solvers/scalarTransport.cfg diff --git a/etc/caseDicts/postProcessing/streamlines/streamlines.cfg b/etc/caseDicts/functions/streamlines/streamlines.cfg similarity index 100% rename from etc/caseDicts/postProcessing/streamlines/streamlines.cfg rename to etc/caseDicts/functions/streamlines/streamlines.cfg diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesLine b/etc/caseDicts/functions/streamlines/streamlinesLine similarity index 92% rename from etc/caseDicts/postProcessing/streamlines/streamlinesLine rename to etc/caseDicts/functions/streamlines/streamlinesLine index 420616b55c..01931eb99d 100644 --- a/etc/caseDicts/postProcessing/streamlines/streamlinesLine +++ b/etc/caseDicts/functions/streamlines/streamlinesLine @@ -20,6 +20,6 @@ fields (); direction both; // Direction in which to track from the starting points. Can be // "both", "forward" or "backward" -#includeEtc "caseDicts/postProcessing/streamlines/streamlinesLine.cfg" +#includeEtc "caseDicts/functions/streamlines/streamlinesLine.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesLine.cfg b/etc/caseDicts/functions/streamlines/streamlinesLine.cfg similarity index 89% rename from etc/caseDicts/postProcessing/streamlines/streamlinesLine.cfg rename to etc/caseDicts/functions/streamlines/streamlinesLine.cfg index 9f9b59852d..127edb6882 100644 --- a/etc/caseDicts/postProcessing/streamlines/streamlinesLine.cfg +++ b/etc/caseDicts/functions/streamlines/streamlinesLine.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/streamlines/streamlines.cfg" +#includeEtc "caseDicts/functions/streamlines/streamlines.cfg" seedSampleSet { diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesPatch b/etc/caseDicts/functions/streamlines/streamlinesPatch similarity index 92% rename from etc/caseDicts/postProcessing/streamlines/streamlinesPatch rename to etc/caseDicts/functions/streamlines/streamlinesPatch index 4c1a42d8cb..f9d4b585bd 100644 --- a/etc/caseDicts/postProcessing/streamlines/streamlinesPatch +++ b/etc/caseDicts/functions/streamlines/streamlinesPatch @@ -19,6 +19,6 @@ fields (); direction both; // Direction in which to track from the starting points. Can be // "both", "forward" or "backward" -#includeEtc "caseDicts/postProcessing/streamlines/streamlinesPatch.cfg" +#includeEtc "caseDicts/functions/streamlines/streamlinesPatch.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesPatch.cfg b/etc/caseDicts/functions/streamlines/streamlinesPatch.cfg similarity index 89% rename from etc/caseDicts/postProcessing/streamlines/streamlinesPatch.cfg rename to etc/caseDicts/functions/streamlines/streamlinesPatch.cfg index ca465f69ee..2835ef8f35 100644 --- a/etc/caseDicts/postProcessing/streamlines/streamlinesPatch.cfg +++ b/etc/caseDicts/functions/streamlines/streamlinesPatch.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/streamlines/streamlines.cfg" +#includeEtc "caseDicts/functions/streamlines/streamlines.cfg" seedSampleSet { diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesPoints b/etc/caseDicts/functions/streamlines/streamlinesPoints similarity index 92% rename from etc/caseDicts/postProcessing/streamlines/streamlinesPoints rename to etc/caseDicts/functions/streamlines/streamlinesPoints index 890132288b..5a9e8e7055 100644 --- a/etc/caseDicts/postProcessing/streamlines/streamlinesPoints +++ b/etc/caseDicts/functions/streamlines/streamlinesPoints @@ -18,6 +18,6 @@ fields (); direction both; // Direction in which to track from the starting points. Can be // "both", "forward" or "backward" -#includeEtc "caseDicts/postProcessing/streamlines/streamlinesPoints.cfg" +#includeEtc "caseDicts/functions/streamlines/streamlinesPoints.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesPoints.cfg b/etc/caseDicts/functions/streamlines/streamlinesPoints.cfg similarity index 89% rename from etc/caseDicts/postProcessing/streamlines/streamlinesPoints.cfg rename to etc/caseDicts/functions/streamlines/streamlinesPoints.cfg index 5501d280b1..48c1f01240 100644 --- a/etc/caseDicts/postProcessing/streamlines/streamlinesPoints.cfg +++ b/etc/caseDicts/functions/streamlines/streamlinesPoints.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/streamlines/streamlines.cfg" +#includeEtc "caseDicts/functions/streamlines/streamlines.cfg" seedSampleSet { diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesSphere b/etc/caseDicts/functions/streamlines/streamlinesSphere similarity index 92% rename from etc/caseDicts/postProcessing/streamlines/streamlinesSphere rename to etc/caseDicts/functions/streamlines/streamlinesSphere index 18508697e4..ec6ea53a70 100644 --- a/etc/caseDicts/postProcessing/streamlines/streamlinesSphere +++ b/etc/caseDicts/functions/streamlines/streamlinesSphere @@ -20,6 +20,6 @@ fields (); direction both; // Direction in which to track from the starting points. Can be // "both", "forward" or "backward" -#includeEtc "caseDicts/postProcessing/streamlines/streamlinesSphere.cfg" +#includeEtc "caseDicts/functions/streamlines/streamlinesSphere.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesSphere.cfg b/etc/caseDicts/functions/streamlines/streamlinesSphere.cfg similarity index 89% rename from etc/caseDicts/postProcessing/streamlines/streamlinesSphere.cfg rename to etc/caseDicts/functions/streamlines/streamlinesSphere.cfg index 6bd9ee1254..3fd19c7a0a 100644 --- a/etc/caseDicts/postProcessing/streamlines/streamlinesSphere.cfg +++ b/etc/caseDicts/functions/streamlines/streamlinesSphere.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/streamlines/streamlines.cfg" +#includeEtc "caseDicts/functions/streamlines/streamlines.cfg" seedSampleSet { diff --git a/etc/caseDicts/postProcessing/surface/cutPlaneSurface b/etc/caseDicts/functions/surface/cutPlaneSurface similarity index 92% rename from etc/caseDicts/postProcessing/surface/cutPlaneSurface rename to etc/caseDicts/functions/surface/cutPlaneSurface index 2fdfb6dafd..90d856ade0 100644 --- a/etc/caseDicts/postProcessing/surface/cutPlaneSurface +++ b/etc/caseDicts/functions/surface/cutPlaneSurface @@ -19,6 +19,6 @@ fields (); interpolate true; // If false, write cell data to the surface triangles. // If true, write interpolated data at the surface points. -#includeEtc "caseDicts/postProcessing/surface/cutPlaneSurface.cfg" +#includeEtc "caseDicts/functions/surface/cutPlaneSurface.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surface/cutPlaneSurface.cfg b/etc/caseDicts/functions/surface/cutPlaneSurface.cfg similarity index 91% rename from etc/caseDicts/postProcessing/surface/cutPlaneSurface.cfg rename to etc/caseDicts/functions/surface/cutPlaneSurface.cfg index 26a75b8ee8..81bd143d6f 100644 --- a/etc/caseDicts/postProcessing/surface/cutPlaneSurface.cfg +++ b/etc/caseDicts/functions/surface/cutPlaneSurface.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surface/surface.cfg" +#includeEtc "caseDicts/functions/surface/surface.cfg" surfaces ( diff --git a/etc/caseDicts/postProcessing/surface/isoSurface b/etc/caseDicts/functions/surface/isoSurface similarity index 93% rename from etc/caseDicts/postProcessing/surface/isoSurface rename to etc/caseDicts/functions/surface/isoSurface index b167729170..eaa5149aab 100644 --- a/etc/caseDicts/postProcessing/surface/isoSurface +++ b/etc/caseDicts/functions/surface/isoSurface @@ -18,6 +18,6 @@ fields (); interpolate true; // If false, write cell data to the surface triangles. // If true, write interpolated data at the surface points. -#includeEtc "caseDicts/postProcessing/surface/isoSurface.cfg" +#includeEtc "caseDicts/functions/surface/isoSurface.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surface/isoSurface.cfg b/etc/caseDicts/functions/surface/isoSurface.cfg similarity index 91% rename from etc/caseDicts/postProcessing/surface/isoSurface.cfg rename to etc/caseDicts/functions/surface/isoSurface.cfg index d68b4e4934..748ad780d3 100644 --- a/etc/caseDicts/postProcessing/surface/isoSurface.cfg +++ b/etc/caseDicts/functions/surface/isoSurface.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surface/surface.cfg" +#includeEtc "caseDicts/functions/surface/surface.cfg" surfaces ( diff --git a/etc/caseDicts/postProcessing/surface/patchSurface b/etc/caseDicts/functions/surface/patchSurface similarity index 93% rename from etc/caseDicts/postProcessing/surface/patchSurface rename to etc/caseDicts/functions/surface/patchSurface index dd453ed92a..b6482d79bc 100644 --- a/etc/caseDicts/postProcessing/surface/patchSurface +++ b/etc/caseDicts/functions/surface/patchSurface @@ -17,6 +17,6 @@ fields (); interpolate true; // If false, write cell data to the surface triangles. // If true, write interpolated data at the surface points. -#includeEtc "caseDicts/postProcessing/surface/patchSurface.cfg" +#includeEtc "caseDicts/functions/surface/patchSurface.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surface/patchSurface.cfg b/etc/caseDicts/functions/surface/patchSurface.cfg similarity index 91% rename from etc/caseDicts/postProcessing/surface/patchSurface.cfg rename to etc/caseDicts/functions/surface/patchSurface.cfg index d700f1ab81..3ea922b0e8 100644 --- a/etc/caseDicts/postProcessing/surface/patchSurface.cfg +++ b/etc/caseDicts/functions/surface/patchSurface.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surface/surface.cfg" +#includeEtc "caseDicts/functions/surface/surface.cfg" surfaces ( diff --git a/etc/caseDicts/postProcessing/surface/surface.cfg b/etc/caseDicts/functions/surface/surface.cfg similarity index 100% rename from etc/caseDicts/postProcessing/surface/surface.cfg rename to etc/caseDicts/functions/surface/surface.cfg diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneAverage b/etc/caseDicts/functions/surfaceFieldValue/faceZoneAverage similarity index 90% rename from etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneAverage rename to etc/caseDicts/functions/surfaceFieldValue/faceZoneAverage index 21d208da5a..e4c70a09be 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneAverage +++ b/etc/caseDicts/functions/surfaceFieldValue/faceZoneAverage @@ -16,6 +16,6 @@ fields (); operation areaAverage; -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/faceZoneValue.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneFlowRate b/etc/caseDicts/functions/surfaceFieldValue/faceZoneFlowRate similarity index 92% rename from etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneFlowRate rename to etc/caseDicts/functions/surfaceFieldValue/faceZoneFlowRate index c8b01825f3..7d5e2b3497 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneFlowRate +++ b/etc/caseDicts/functions/surfaceFieldValue/faceZoneFlowRate @@ -18,6 +18,6 @@ fields (phi); operation orientedSum; -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/faceZoneValue.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg b/etc/caseDicts/functions/surfaceFieldValue/faceZoneValue.cfg similarity index 87% rename from etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg rename to etc/caseDicts/functions/surfaceFieldValue/faceZoneValue.cfg index c6e18734bb..486b349cf4 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg +++ b/etc/caseDicts/functions/surfaceFieldValue/faceZoneValue.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/surfaceValue.cfg" select faceZone; diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage b/etc/caseDicts/functions/surfaceFieldValue/patchAverage similarity index 90% rename from etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage rename to etc/caseDicts/functions/surfaceFieldValue/patchAverage index 8dd3dd9ee9..fc0db8300e 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage +++ b/etc/caseDicts/functions/surfaceFieldValue/patchAverage @@ -16,6 +16,6 @@ fields (); operation areaAverage; -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/patchValue.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference b/etc/caseDicts/functions/surfaceFieldValue/patchDifference similarity index 90% rename from etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference rename to etc/caseDicts/functions/surfaceFieldValue/patchDifference index 924baf51e2..a38454765f 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference +++ b/etc/caseDicts/functions/surfaceFieldValue/patchDifference @@ -16,6 +16,6 @@ patch2 ; fields (); -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/patchDifference.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/patchDifference.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference.cfg b/etc/caseDicts/functions/surfaceFieldValue/patchDifference.cfg similarity index 88% rename from etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference.cfg rename to etc/caseDicts/functions/surfaceFieldValue/patchDifference.cfg index 0b070a3ed3..44b87b3203 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference.cfg +++ b/etc/caseDicts/functions/surfaceFieldValue/patchDifference.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceDifference.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/surfaceDifference.cfg" region1 { diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchFlowRate b/etc/caseDicts/functions/surfaceFieldValue/patchFlowRate similarity index 92% rename from etc/caseDicts/postProcessing/surfaceFieldValue/patchFlowRate rename to etc/caseDicts/functions/surfaceFieldValue/patchFlowRate index 94828ad484..b9a3ac062d 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchFlowRate +++ b/etc/caseDicts/functions/surfaceFieldValue/patchFlowRate @@ -18,6 +18,6 @@ fields (phi); operation sum; -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/patchValue.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate b/etc/caseDicts/functions/surfaceFieldValue/patchIntegrate similarity index 90% rename from etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate rename to etc/caseDicts/functions/surfaceFieldValue/patchIntegrate index 18d70fd3e2..179005c5cf 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate +++ b/etc/caseDicts/functions/surfaceFieldValue/patchIntegrate @@ -16,6 +16,6 @@ fields (); operation areaIntegrate; -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/patchValue.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg b/etc/caseDicts/functions/surfaceFieldValue/patchValue.cfg similarity index 86% rename from etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg rename to etc/caseDicts/functions/surfaceFieldValue/patchValue.cfg index 647fad8b5c..1370afe151 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg +++ b/etc/caseDicts/functions/surfaceFieldValue/patchValue.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/surfaceValue.cfg" select patch; diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceDifference.cfg b/etc/caseDicts/functions/surfaceFieldValue/surfaceDifference.cfg similarity index 83% rename from etc/caseDicts/postProcessing/surfaceFieldValue/surfaceDifference.cfg rename to etc/caseDicts/functions/surfaceFieldValue/surfaceDifference.cfg index 4ce6eb2561..11c38878a4 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceDifference.cfg +++ b/etc/caseDicts/functions/surfaceFieldValue/surfaceDifference.cfg @@ -16,14 +16,14 @@ operation subtract; region1 { - #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" + #includeEtc "caseDicts/functions/surfaceFieldValue/surfaceValue.cfg" operation areaAverage; fields $fields; } region2 { - #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" + #includeEtc "caseDicts/functions/surfaceFieldValue/surfaceValue.cfg" operation areaAverage; fields $fields; } diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg b/etc/caseDicts/functions/surfaceFieldValue/surfaceValue.cfg similarity index 100% rename from etc/caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg rename to etc/caseDicts/functions/surfaceFieldValue/surfaceValue.cfg diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceAverage b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceAverage similarity index 91% rename from etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceAverage rename to etc/caseDicts/functions/surfaceFieldValue/triSurfaceAverage index 24ad41d6dd..3a0928e738 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceAverage +++ b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceAverage @@ -18,6 +18,6 @@ fields (); operation areaAverage; -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/triSurfaceValue.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceDifference similarity index 90% rename from etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference rename to etc/caseDicts/functions/surfaceFieldValue/triSurfaceDifference index 850e0f5839..da053897a0 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference +++ b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceDifference @@ -16,6 +16,6 @@ name2 ; fields (); -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/triSurfaceDifference.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference.cfg b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceDifference.cfg similarity index 90% rename from etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference.cfg rename to etc/caseDicts/functions/surfaceFieldValue/triSurfaceDifference.cfg index df7a26663c..c9f79649c7 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference.cfg +++ b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceDifference.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceDifference.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/surfaceDifference.cfg" region1 { diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceValue.cfg similarity index 89% rename from etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg rename to etc/caseDicts/functions/surfaceFieldValue/triSurfaceValue.cfg index c4f86a3cab..c4b5b4f5b4 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg +++ b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceValue.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/surfaceValue.cfg" select sampledSurface; diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceVolumetricFlowRate b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceVolumetricFlowRate similarity index 92% rename from etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceVolumetricFlowRate rename to etc/caseDicts/functions/surfaceFieldValue/triSurfaceVolumetricFlowRate index 60451dec08..5ffb73ef24 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceVolumetricFlowRate +++ b/etc/caseDicts/functions/surfaceFieldValue/triSurfaceVolumetricFlowRate @@ -19,6 +19,6 @@ fields (U); operation areaNormalIntegrate; -#includeEtc "caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg" +#includeEtc "caseDicts/functions/surfaceFieldValue/triSurfaceValue.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/volFieldValue/cellMax b/etc/caseDicts/functions/volFieldValue/cellMax similarity index 90% rename from etc/caseDicts/postProcessing/volFieldValue/cellMax rename to etc/caseDicts/functions/volFieldValue/cellMax index ef4911da74..b18f835256 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/cellMax +++ b/etc/caseDicts/functions/volFieldValue/cellMax @@ -10,7 +10,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/cellMax.cfg" +#includeEtc "caseDicts/functions/volFieldValue/cellMax.cfg" fields (); diff --git a/etc/caseDicts/postProcessing/volFieldValue/cellMax.cfg b/etc/caseDicts/functions/volFieldValue/cellMax.cfg similarity index 88% rename from etc/caseDicts/postProcessing/volFieldValue/cellMax.cfg rename to etc/caseDicts/functions/volFieldValue/cellMax.cfg index 3c025bb9e5..6b9cac4fa2 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/cellMax.cfg +++ b/etc/caseDicts/functions/volFieldValue/cellMax.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/volValue.cfg" +#includeEtc "caseDicts/functions/volFieldValue/volValue.cfg" operation max; diff --git a/etc/caseDicts/postProcessing/volFieldValue/cellMaxMag b/etc/caseDicts/functions/volFieldValue/cellMaxMag similarity index 90% rename from etc/caseDicts/postProcessing/volFieldValue/cellMaxMag rename to etc/caseDicts/functions/volFieldValue/cellMaxMag index 9f2dc03c87..233beb454a 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/cellMaxMag +++ b/etc/caseDicts/functions/volFieldValue/cellMaxMag @@ -10,7 +10,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/cellMaxMag.cfg" +#includeEtc "caseDicts/functions/volFieldValue/cellMaxMag.cfg" fields (); diff --git a/etc/caseDicts/postProcessing/volFieldValue/cellMaxMag.cfg b/etc/caseDicts/functions/volFieldValue/cellMaxMag.cfg similarity index 88% rename from etc/caseDicts/postProcessing/volFieldValue/cellMaxMag.cfg rename to etc/caseDicts/functions/volFieldValue/cellMaxMag.cfg index 3cefb0ede1..b99f8f6dc9 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/cellMaxMag.cfg +++ b/etc/caseDicts/functions/volFieldValue/cellMaxMag.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/volValue.cfg" +#includeEtc "caseDicts/functions/volFieldValue/volValue.cfg" operation maxMag; diff --git a/etc/caseDicts/postProcessing/volFieldValue/cellMin b/etc/caseDicts/functions/volFieldValue/cellMin similarity index 90% rename from etc/caseDicts/postProcessing/volFieldValue/cellMin rename to etc/caseDicts/functions/volFieldValue/cellMin index 7487728cb3..40a9693f43 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/cellMin +++ b/etc/caseDicts/functions/volFieldValue/cellMin @@ -10,7 +10,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/cellMin.cfg" +#includeEtc "caseDicts/functions/volFieldValue/cellMin.cfg" fields (); diff --git a/etc/caseDicts/postProcessing/volFieldValue/cellMin.cfg b/etc/caseDicts/functions/volFieldValue/cellMin.cfg similarity index 88% rename from etc/caseDicts/postProcessing/volFieldValue/cellMin.cfg rename to etc/caseDicts/functions/volFieldValue/cellMin.cfg index b19b66c79d..16873bd6a7 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/cellMin.cfg +++ b/etc/caseDicts/functions/volFieldValue/cellMin.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/volValue.cfg" +#includeEtc "caseDicts/functions/volFieldValue/volValue.cfg" operation min; diff --git a/etc/caseDicts/postProcessing/volFieldValue/cellMinMag b/etc/caseDicts/functions/volFieldValue/cellMinMag similarity index 90% rename from etc/caseDicts/postProcessing/volFieldValue/cellMinMag rename to etc/caseDicts/functions/volFieldValue/cellMinMag index f8c3be3986..adfb5d9366 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/cellMinMag +++ b/etc/caseDicts/functions/volFieldValue/cellMinMag @@ -10,7 +10,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/cellMinMag.cfg" +#includeEtc "caseDicts/functions/volFieldValue/cellMinMag.cfg" fields (); diff --git a/etc/caseDicts/postProcessing/volFieldValue/cellMinMag.cfg b/etc/caseDicts/functions/volFieldValue/cellMinMag.cfg similarity index 88% rename from etc/caseDicts/postProcessing/volFieldValue/cellMinMag.cfg rename to etc/caseDicts/functions/volFieldValue/cellMinMag.cfg index 482b864a45..c77b4a9884 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/cellMinMag.cfg +++ b/etc/caseDicts/functions/volFieldValue/cellMinMag.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/volValue.cfg" +#includeEtc "caseDicts/functions/volFieldValue/volValue.cfg" operation minMag; diff --git a/etc/caseDicts/postProcessing/volFieldValue/volAverage b/etc/caseDicts/functions/volFieldValue/volAverage similarity index 90% rename from etc/caseDicts/postProcessing/volFieldValue/volAverage rename to etc/caseDicts/functions/volFieldValue/volAverage index d96090abc4..21622d837c 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/volAverage +++ b/etc/caseDicts/functions/volFieldValue/volAverage @@ -10,7 +10,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/volAverage.cfg" +#includeEtc "caseDicts/functions/volFieldValue/volAverage.cfg" fields (); diff --git a/etc/caseDicts/postProcessing/volFieldValue/volAverage.cfg b/etc/caseDicts/functions/volFieldValue/volAverage.cfg similarity index 88% rename from etc/caseDicts/postProcessing/volFieldValue/volAverage.cfg rename to etc/caseDicts/functions/volFieldValue/volAverage.cfg index cad4d64f93..5193da4957 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/volAverage.cfg +++ b/etc/caseDicts/functions/volFieldValue/volAverage.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/volValue.cfg" +#includeEtc "caseDicts/functions/volFieldValue/volValue.cfg" operation volAverage; diff --git a/etc/caseDicts/postProcessing/volFieldValue/volIntegrate b/etc/caseDicts/functions/volFieldValue/volIntegrate similarity index 90% rename from etc/caseDicts/postProcessing/volFieldValue/volIntegrate rename to etc/caseDicts/functions/volFieldValue/volIntegrate index 72f18955f5..37f3528944 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/volIntegrate +++ b/etc/caseDicts/functions/volFieldValue/volIntegrate @@ -10,7 +10,7 @@ Description \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/volIntegrate.cfg" +#includeEtc "caseDicts/functions/volFieldValue/volIntegrate.cfg" fields (); diff --git a/etc/caseDicts/postProcessing/volFieldValue/volIntegrate.cfg b/etc/caseDicts/functions/volFieldValue/volIntegrate.cfg similarity index 88% rename from etc/caseDicts/postProcessing/volFieldValue/volIntegrate.cfg rename to etc/caseDicts/functions/volFieldValue/volIntegrate.cfg index 70fe112b70..cca02a38b3 100644 --- a/etc/caseDicts/postProcessing/volFieldValue/volIntegrate.cfg +++ b/etc/caseDicts/functions/volFieldValue/volIntegrate.cfg @@ -6,7 +6,7 @@ \\/ M anipulation | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/volFieldValue/volValue.cfg" +#includeEtc "caseDicts/functions/volFieldValue/volValue.cfg" operation volIntegrate; diff --git a/etc/caseDicts/postProcessing/volFieldValue/volValue.cfg b/etc/caseDicts/functions/volFieldValue/volValue.cfg similarity index 100% rename from etc/caseDicts/postProcessing/volFieldValue/volValue.cfg rename to etc/caseDicts/functions/volFieldValue/volValue.cfg diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index 0885484242..1965fe21a0 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -431,8 +431,10 @@ Foam::Time::Time setControls(); - // Add a watch on the controlDict file after runTimeModifiable_ is set + // Add a watch on the controlDict and functions files + // after runTimeModifiable_ is set controlDict_.addWatch(); + functionObjects_.addWatch(); } @@ -495,8 +497,10 @@ Foam::Time::Time setControls(); - // Add a watch on the controlDict file after runTimeModifiable_ is set + // Add a watch on the controlDict and functions files + // after runTimeModifiable_ is set controlDict_.addWatch(); + functionObjects_.addWatch(); } @@ -560,8 +564,10 @@ Foam::Time::Time setControls(); - // Add a watch on the controlDict file after runTimeModifiable_ is set + // Add a watch on the controlDict and functions files + // after runTimeModifiable_ is set controlDict_.addWatch(); + functionObjects_.addWatch(); } diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H index b757b31b56..59b2d58d59 100644 --- a/src/OpenFOAM/db/dictionary/dictionary.H +++ b/src/OpenFOAM/db/dictionary/dictionary.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -795,17 +795,17 @@ Pair dictAndKeyword(const word& scopedName); // The search scheme allows for version-specific and // version-independent files using the following hierarchy: // - \b user settings: -// - ~/.OpenFOAM/\/caseDicts/postProcessing -// - ~/.OpenFOAM/caseDicts/postProcessing +// - ~/.OpenFOAM/\/caseDicts/functions +// - ~/.OpenFOAM/caseDicts/functions // - \b group (site) settings (when $WM_PROJECT_SITE is set): -// - $WM_PROJECT_SITE/\/etc/caseDicts/postProcessing -// - $WM_PROJECT_SITE/etc/caseDicts/postProcessing +// - $WM_PROJECT_SITE/\/etc/caseDicts/functions +// - $WM_PROJECT_SITE/etc/caseDicts/functions // - \b group (site) settings (when $WM_PROJECT_SITE is not set): // - $WM_PROJECT_INST_DIR/site/\/etc/ -// caseDicts/postProcessing -// - $WM_PROJECT_INST_DIR/site/etc/caseDicts/postProcessing +// caseDicts/functions +// - $WM_PROJECT_INST_DIR/site/etc/caseDicts/functions // - \b other (shipped) settings: -// - $WM_PROJECT_DIR/etc/caseDicts/postProcessing +// - $WM_PROJECT_DIR/etc/caseDicts/functions wordList listAllConfigFiles ( const fileName& configFilesPath @@ -817,17 +817,17 @@ wordList listAllConfigFiles // The search scheme allows for version-specific and // version-independent files using the following hierarchy: // - \b user settings: -// - ~/.OpenFOAM/\/caseDicts/postProcessing -// - ~/.OpenFOAM/caseDicts/postProcessing +// - ~/.OpenFOAM/\/caseDicts/functions +// - ~/.OpenFOAM/caseDicts/functions // - \b group (site) settings (when $WM_PROJECT_SITE is set): -// - $WM_PROJECT_SITE/\/etc/caseDicts/postProcessing -// - $WM_PROJECT_SITE/etc/caseDicts/postProcessing +// - $WM_PROJECT_SITE/\/etc/caseDicts/functions +// - $WM_PROJECT_SITE/etc/caseDicts/functions // - \b group (site) settings (when $WM_PROJECT_SITE is not set): // - $WM_PROJECT_INST_DIR/site/\/etc/ -// caseDicts/postProcessing -// - $WM_PROJECT_INST_DIR/site/etc/caseDicts/postProcessing +// caseDicts/functions +// - $WM_PROJECT_INST_DIR/site/etc/caseDicts/functions // - \b other (shipped) settings: -// - $WM_PROJECT_DIR/etc/caseDicts/postProcessing +// - $WM_PROJECT_DIR/etc/caseDicts/functions // // \return The path of the configuration file if found // otherwise null diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.C index 1ef2458df9..112ad072ef 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ namespace functionEntries Foam::fileName Foam::functionEntries::includeFuncEntry::functionObjectDictPath ( - "caseDicts/postProcessing" + "caseDicts/functions" ); diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H index d01ed97d3f..5d0f23157c 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,16 +32,16 @@ Description directories allowing for version-specific and version-independent files using the following hierarchy: - \b user settings: - - ~/.OpenFOAM/\/caseDicts/postProcessing - - ~/.OpenFOAM/caseDicts/postProcessing + - ~/.OpenFOAM/\/caseDicts/functions + - ~/.OpenFOAM/caseDicts/functions - \b group (site) settings (when $WM_PROJECT_SITE is set): - - $WM_PROJECT_SITE/\/etc/caseDicts/postProcessing - - $WM_PROJECT_SITE/etc/caseDicts/postProcessing + - $WM_PROJECT_SITE/\/etc/caseDicts/functions + - $WM_PROJECT_SITE/etc/caseDicts/functions - \b group (site) settings (when $WM_PROJECT_SITE is not set): - - $WM_PROJECT_INST_DIR/site/\/etc/caseDicts/postProcessing - - $WM_PROJECT_INST_DIR/site/etc/caseDicts/postProcessing + - $WM_PROJECT_INST_DIR/site/\/etc/caseDicts/functions + - $WM_PROJECT_INST_DIR/site/etc/caseDicts/functions - \b other (shipped) settings: - - $WM_PROJECT_DIR/etc/caseDicts/postProcessing + - $WM_PROJECT_DIR/etc/caseDicts/functions The optional field arguments included in the name are inserted in 'field' or 'fields' entries in the functionObject dictionary and included in the name diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C index 4c80b56183..5690ede8dd 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,333 +26,47 @@ License #include "functionObjectList.H" #include "argList.H" #include "timeControlFunctionObject.H" -#include "dictionaryEntry.H" // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // -Foam::functionObject* Foam::functionObjectList::remove -( - const word& key, - label& oldIndex -) -{ - functionObject* ptr = 0; - - // Find index of existing functionObject - HashTable