diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg index 616c83068..a5336ef95 100644 --- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg +++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg" +#includeEtc "caseDicts/postProcessing/surfaceFieldValue/patch.cfg" fields (phi); operation sum; diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg index cb4333438..a8733a6e4 100644 --- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg +++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" +#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg" fields (U); operation areaNormalIntegrate; diff --git a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg index 56305b4dd..10ba1d67f 100644 --- a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg +++ b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -type surfaceRegion; +type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg index 8351759b6..1756d08d5 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg +++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg @@ -17,13 +17,13 @@ log false; region1 { - #includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" + #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg" operation areaAverage; fields (p); } region2 { - #includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" + #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg" operation areaAverage; fields (p); } diff --git a/etc/caseDicts/postProcessing/surfaceRegion/faceZone.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg similarity index 89% rename from etc/caseDicts/postProcessing/surfaceRegion/faceZone.cfg rename to etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg index 5f5e55366..1b6fe1dc6 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/faceZone.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" +#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg" regionType faceZone; diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patch.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg similarity index 89% rename from etc/caseDicts/postProcessing/surfaceRegion/patch.cfg rename to etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg index 4dcf74159..e84c077a2 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/patch.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" +#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg" regionType patch; diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patchAverage b/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage similarity index 91% rename from etc/caseDicts/postProcessing/surfaceRegion/patchAverage rename to etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage index 95a98c50b..6ab61f5f9 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/patchAverage +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage @@ -14,6 +14,6 @@ name ; fields (); operation average; -#includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg" +#includeEtc "caseDicts/postProcessing/surfaceFieldValue/patch.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate b/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate similarity index 91% rename from etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate rename to etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate index 4b873a963..f2c457246 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate @@ -14,6 +14,6 @@ name ; fields (); operation areaIntegrate; -#includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg" +#includeEtc "caseDicts/postProcessing/surfaceFieldValue/patch.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg similarity index 95% rename from etc/caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg rename to etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg index 32814fa20..2d8535259 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -type surfaceRegion; +type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/surfaceRegion/triSurfaceRegion.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceRegion.cfg similarity index 91% rename from etc/caseDicts/postProcessing/surfaceRegion/triSurfaceRegion.cfg rename to etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceRegion.cfg index 3c608ed1a..6cae0f37d 100644 --- a/etc/caseDicts/postProcessing/surfaceRegion/triSurfaceRegion.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceRegion.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" +#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg" regionType sampledSurface; diff --git a/src/functionObjects/field/readFields/postProcessingDict b/src/functionObjects/field/readFields/postProcessingDict index ae79cfcbf..a84e7675a 100644 --- a/src/functionObjects/field/readFields/postProcessingDict +++ b/src/functionObjects/field/readFields/postProcessingDict @@ -32,7 +32,7 @@ functions faceObj2 { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); enabled true; writeControl timeStep; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict index 58c9e2842..819d4168f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict @@ -53,9 +53,9 @@ maxDeltaT 1e-03; functions { - surfaceRegion1 + surfaceFieldValue1 { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); writeControl writeTime; log yes; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict index 421743c56..16068ba76 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict @@ -48,9 +48,9 @@ runTimeModifiable yes; functions { - surfaceRegion1 + surfaceFieldValue1 { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); writeControl writeTime; log yes; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict index d4652a506..749f95677 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict @@ -48,9 +48,9 @@ runTimeModifiable yes; functions { - surfaceRegion1 + surfaceFieldValue1 { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); enabled yes; writeControl writeTime; diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict index 2657ece7b..87031371c 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict +++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict @@ -55,7 +55,7 @@ functions { inletFlux { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); writeControl timeStep; log true; diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/extractHeightData b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/extractHeightData index e9c1439e7..b653b581b 100755 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/extractHeightData +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/extractHeightData @@ -1,2 +1,2 @@ #!/bin/sh -awk '{print $1 " " $3}' postProcessing/poolHeight/0/surfaceRegion.dat > poolHeight_vs_time +awk '{print $1 " " $3}' postProcessing/poolHeight/0/surfaceFieldValue.dat > poolHeight_vs_time diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict index aa6d941ef..9a4065a7a 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict @@ -67,7 +67,7 @@ functions poolHeight { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 1; diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/extractHeightData b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/extractHeightData index e9c1439e7..b653b581b 100755 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/extractHeightData +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/extractHeightData @@ -1,2 +1,2 @@ #!/bin/sh -awk '{print $1 " " $3}' postProcessing/poolHeight/0/surfaceRegion.dat > poolHeight_vs_time +awk '{print $1 " " $3}' postProcessing/poolHeight/0/surfaceFieldValue.dat > poolHeight_vs_time diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict index ab6d4bb1f..5207cfca9 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict @@ -67,7 +67,7 @@ functions poolHeight { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 1; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions index 79e38ccc1..1771c675d 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions @@ -8,7 +8,7 @@ inletMassFlowRate { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); fields @@ -31,7 +31,7 @@ inletMassFlowRate outletMassFlowRate { - type surfaceRegion; + type surfaceFieldValue; libs ("libfieldFunctionObjects.so"); fields