From dc85d509b00b5724764b8babe2dbf4d9df61f7a9 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Wed, 1 Feb 2023 11:18:58 +0000 Subject: [PATCH] #includeFunc, #includeModel, #includeConstraint: Changed entry renaming option to "name" This is a more intuitive keyword than "funcName" or "entryName". A function object's name and corresponding output directory can now be renamed as follows: #includeFunc patchAverage ( name=cylinderT, // <-- was funcName=... or entryName=... region=fluid, patch=fluid_to_solid, field=T ) Some packaged functions previously relied on a "name" argument that related to an aspect of the function; e.g., the name of the faceZone used by the faceZoneFlowRate function. These have been disambiguated. This has also made them consistent with the preferred input syntax of the underlying function objects. Examples of the changed #includeFunc entries are shown below: #includeFunc faceZoneAverage ( faceZone=f0, // <-- was name=f0 U ) #includeFunc faceZoneFlowRate ( faceZone=f0 // <-- was name=f0 ) #includeFunc populationBalanceSizeDistribution ( populationBalance=bubbles, regionType=cellZone, cellZone=injection, // <-- was name=injection functionType=volumeDensity, coordinateType=diameter, normalise=yes ) #includeFunc triSurfaceAverage ( triSurface=mid.obj, // <-- was name=mid.obj p ) #includeFunc triSurfaceVolumetricFlowRate ( triSurface=mid.obj // <-- was name=mid.obj ) #includeFunc uniform ( fieldType=volScalarField, fieldName=alpha, // <-- was name=alpha dimensions=[0 0 0 0 0 0 0], value=0.2 ) --- .../postProcessing/fieldsOperations/uniform | 2 +- .../populationBalanceSizeDistribution | 2 +- .../surfaceFieldValue/faceZoneAverage | 2 +- .../surfaceFieldValue/faceZoneFlowRate | 2 +- .../surfaceFieldValue/faceZoneValue.cfg | 2 +- .../surfaceFieldValue/patchValue.cfg | 1 - .../surfaceFieldValue/triSurfaceAverage | 2 +- .../surfaceFieldValue/triSurfaceValue.cfg | 2 +- .../triSurfaceVolumetricFlowRate | 2 +- src/OpenFOAM/db/dictionary/dictionaryIO.C | 21 ++++++++++------ .../postProcessing/channel/system/controlDict | 14 +++++------ .../injectionChannel/system/controlDict | 2 +- .../VoFcoolingCylinder2D/system/controlDict | 4 ++-- .../CHT/coolingCylinder2D/system/controlDict | 4 ++-- .../system/controlDict | 4 ++-- tutorials/modules/CHT/wallBoiling/Allrun | 4 ++-- .../CHT/wallBoiling/system/controlDict | 6 ++--- .../fluid/BernardCells/system/controlDict | 2 +- .../T3A/system/controlDict | 4 ++-- .../TJunction/system/controlDict | 4 ++-- .../ballValve/system/controlDict | 6 ++--- .../channel395/system/controlDict | 4 ++-- .../drivaerFastback/system/controlDict.orig | 8 +++---- .../hopperEmptying/system/controlDict | 2 +- .../hopperInitialState/system/controlDict | 2 +- .../impeller/system/controlDict | 4 ++-- .../mixerVessel2DParticles/system/controlDict | 2 +- .../oscillatingInlet/system/controlDict | 4 ++-- .../pitzDailySteady/system/controlDict | 2 +- .../planarContraction/system/controlDict | 6 ++--- .../planarPoiseuille/system/controlDict | 4 ++-- .../roomResidenceTime/Allrun | 2 +- .../nc7h16/system/controlDict | 2 +- .../Grossetete/system/controlDict | 2 +- .../bubblePipe/system/controlDict | 14 +++++------ .../hydrofoil/system/controlDict | 8 +++---- .../modules/multiphaseEuler/pipeBend/Allrun | 2 +- .../pipeBend/system/controlDict | 24 +++++++++---------- .../titaniaSynthesis/system/controlDict | 8 +++---- .../system/controlDict | 8 +++---- .../multiphaseEuler/wallBoilingIATE/Allrun | 4 ++-- .../wallBoilingPolydisperse/Allrun | 4 ++-- .../wallBoilingPolydisperseTwoGroups/Allrun | 4 ++-- 43 files changed, 109 insertions(+), 103 deletions(-) diff --git a/etc/caseDicts/postProcessing/fieldsOperations/uniform b/etc/caseDicts/postProcessing/fieldsOperations/uniform index a0bcf77189..33d643079d 100644 --- a/etc/caseDicts/postProcessing/fieldsOperations/uniform +++ b/etc/caseDicts/postProcessing/fieldsOperations/uniform @@ -14,7 +14,7 @@ type uniform; libs ("libfieldFunctionObjects.so"); fieldType ; -name ; +field ; dimensions ; value ; diff --git a/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution b/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution index 778fd7abaa..2772bfb27f 100644 --- a/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution +++ b/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution @@ -31,7 +31,7 @@ weightType numberConcentration; // volumeConcentration, // numberConcentration regionType all; // cellZone // defaults to all -name cellZoneName; // relevant for regionType all +cellZone cellZoneName; // relevant for regionType all setFormat raw; diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneAverage b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneAverage index 5cba000c3b..21d208da5a 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneAverage +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneAverage @@ -10,7 +10,7 @@ Description \*---------------------------------------------------------------------------*/ -name ; +faceZone ; fields (); diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneFlowRate b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneFlowRate index 903b53213d..c8b01825f3 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneFlowRate +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneFlowRate @@ -12,7 +12,7 @@ Description \*---------------------------------------------------------------------------*/ -name ; +faceZone ; fields (phi); diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg index 5f760e17ac..d23b1e815e 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg @@ -8,6 +8,6 @@ #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" -regionType faceZone; +regionType faceZone; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg index bde008bb9a..06891021c4 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg @@ -9,6 +9,5 @@ #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" regionType patch; -name $patch; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceAverage b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceAverage index 3dc71b0274..24ad41d6dd 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceAverage +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceAverage @@ -12,7 +12,7 @@ Description \*---------------------------------------------------------------------------*/ -name ; +triSurface ; fields (); diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg index 726d9381a1..840f419161 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg @@ -13,7 +13,7 @@ regionType sampledSurface; sampledSurfaceDict { type triSurfaceMesh; - surface $name; + surface $triSurface; source cells; interpolate true; } diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceVolumetricFlowRate b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceVolumetricFlowRate index 44e2933efc..60451dec08 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceVolumetricFlowRate +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceVolumetricFlowRate @@ -13,7 +13,7 @@ Description \*---------------------------------------------------------------------------*/ -name ; +triSurface ; fields (U); diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C index 66ea4d16fa..b1c2bc5469 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryIO.C +++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C @@ -528,6 +528,8 @@ bool Foam::readConfigFile namedArgs[i].first() != "field" && namedArgs[i].first() != "fields" && namedArgs[i].first() != "objects" + && namedArgs[i].first() != "funcName" + && namedArgs[i].first() != "name" ) { const Pair dAk(dictAndKeyword(namedArgs[i].first())); @@ -547,16 +549,21 @@ bool Foam::readConfigFile } // Set the name of the entry to that specified by the optional - // entryName argument otherwise automatically generate a unique name + // name argument otherwise automatically generate a unique name // from the type and arguments - const word entryName - ( - funcDict.lookupOrDefaultBackwardsCompatible + word entryName(string::validate(argString)); + forAll(namedArgs, i) + { + if ( - {"entryName", "funcName"}, - string::validate(argString) + namedArgs[i].first() == "funcName" + || namedArgs[i].first() == "name" ) - ); + { + entryName = namedArgs[i].second(); + entryName.strip(" \n"); + } + } // Check for anything in the configuration that has not been set List> unsetArgs = unsetConfigEntries(funcDict); diff --git a/test/postProcessing/channel/system/controlDict b/test/postProcessing/channel/system/controlDict index d0459236e6..1b832c7bf9 100644 --- a/test/postProcessing/channel/system/controlDict +++ b/test/postProcessing/channel/system/controlDict @@ -167,7 +167,7 @@ fieldsOperationsFunctions #includeFunc uniform ( fieldType=volScalarField, - name=mag(smallU), + field=mag(smallU), dimensions=[0 1 -1 0 0 0 0], value=1e-16 ) @@ -182,7 +182,7 @@ fieldsOperationsFunctions #includeFunc uniform ( fieldType=volScalarField, - name=Ta, + field=Ta, dimensions=[0 0 0 1 0 0 0], value=297 ) @@ -314,7 +314,7 @@ probesFunctions #includeFunc uniform ( fieldType=volScalarField, - name=alpha.dummy, + field=alpha.dummy, dimensions=[0 0 0 0 0 0 0], value=0.2 ) @@ -394,13 +394,13 @@ surfaceFieldValueFunctions #includeFunc patchDifference(patch1=inlet, patch2=outlet, p) - #includeFunc faceZoneAverage(name=f0, U) + #includeFunc faceZoneAverage(faceZone=f0, U) - #includeFunc faceZoneFlowRate(name=f0) + #includeFunc faceZoneFlowRate(faceZone=f0) - #includeFunc triSurfaceAverage(name=mid.obj, p) + #includeFunc triSurfaceAverage(triSurface=mid.obj, p) - #includeFunc triSurfaceVolumetricFlowRate(name=mid.obj) + #includeFunc triSurfaceVolumetricFlowRate(triSurface=mid.obj) #includeFunc triSurfaceDifference ( diff --git a/tutorials/lagrangian/denseParticleFoam/injectionChannel/system/controlDict b/tutorials/lagrangian/denseParticleFoam/injectionChannel/system/controlDict index 6a38e4d17f..fe4520c092 100644 --- a/tutorials/lagrangian/denseParticleFoam/injectionChannel/system/controlDict +++ b/tutorials/lagrangian/denseParticleFoam/injectionChannel/system/controlDict @@ -48,7 +48,7 @@ functions { #includeFunc patchFlowRate(patch=lowerInlet, cloud:massFlux) #includeFunc patchFlowRate(patch=upperInlet, cloud:massFlux) - #includeFunc faceZoneFlowRate(name=mid, cloud:massFlux) + #includeFunc faceZoneFlowRate(faceZone=mid, cloud:massFlux) #includeFunc patchFlowRate(patch=outlet, cloud:massFlux) } diff --git a/tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict b/tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict index be78f5540c..7b30d22e93 100644 --- a/tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict +++ b/tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict @@ -63,14 +63,14 @@ functions { #includeFunc patchAverage ( - entryName=cylinderT, + name=cylinderT, region=fluid, patch=fluid_to_solid, field=T ) #includeFunc patchAverage ( - entryName=inletU, + name=inletU, region=fluid, patch=inlet, field=U diff --git a/tutorials/modules/CHT/coolingCylinder2D/system/controlDict b/tutorials/modules/CHT/coolingCylinder2D/system/controlDict index fab3c896f6..a3b24e9aed 100644 --- a/tutorials/modules/CHT/coolingCylinder2D/system/controlDict +++ b/tutorials/modules/CHT/coolingCylinder2D/system/controlDict @@ -61,14 +61,14 @@ functions { #includeFunc patchAverage ( - entryName=cylinderT, + name=cylinderT, region=fluid, patch=fluid_to_solid, field=T ) #includeFunc patchAverage ( - entryName=inletU, + name=inletU, region=fluid, patch=inlet, field=U diff --git a/tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict b/tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict index 0c601f4706..70080c7831 100644 --- a/tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict +++ b/tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict @@ -61,7 +61,7 @@ functions { #includeFunc patchAverage ( - entryName=cylinderToil, + name=cylinderToil, region=fluid, patch=fluid_to_solid, field=T.oil @@ -69,7 +69,7 @@ functions #includeFunc patchAverage ( - entryName=cylinderTwater, + name=cylinderTwater, region=fluid, patch=fluid_to_solid, field=T.water diff --git a/tutorials/modules/CHT/wallBoiling/Allrun b/tutorials/modules/CHT/wallBoiling/Allrun index 22012d4df3..237c85401f 100755 --- a/tutorials/modules/CHT/wallBoiling/Allrun +++ b/tutorials/modules/CHT/wallBoiling/Allrun @@ -20,7 +20,7 @@ runApplication reconstructPar -latestTime -allRegions runApplication foamPostProcess -latestTime -region fluid -func " graphCell ( - entryName=graph, + name=graph, start=(3.4901 0 0), end=(3.4901 0.0096 0), fields=(alpha.gas T.liquid T.gas) @@ -28,7 +28,7 @@ runApplication foamPostProcess -latestTime -region fluid -func " runApplication -append foamPostProcess -region fluid -latestTime -func " patchSurface ( - entryName=patchWallBoilingProperties, + name=patchWallBoilingProperties, patch=wall, surfaceFormat=raw, interpolate=false, diff --git a/tutorials/modules/CHT/wallBoiling/system/controlDict b/tutorials/modules/CHT/wallBoiling/system/controlDict index 4771f35e23..e12050232b 100644 --- a/tutorials/modules/CHT/wallBoiling/system/controlDict +++ b/tutorials/modules/CHT/wallBoiling/system/controlDict @@ -60,9 +60,9 @@ maxDeltaT 0.005; functions { - #includeFunc wallHeatFlux(entryName=WHFliquid, writeFields=false, phase=liquid, region=fluid) - #includeFunc wallHeatFlux(entryName=WHFgas, writeFields=false, phase=gas, region=fluid) - #includeFunc wallHeatFlux(entryName=WHFsolid, writeFields=false, region=solid, log=yes) + #includeFunc wallHeatFlux(name=WHFliquid, writeFields=false, phase=liquid, region=fluid) + #includeFunc wallHeatFlux(name=WHFgas, writeFields=false, phase=gas, region=fluid) + #includeFunc wallHeatFlux(name=WHFsolid, writeFields=false, region=solid, log=yes) writeWallBoilingProperties { diff --git a/tutorials/modules/fluid/BernardCells/system/controlDict b/tutorials/modules/fluid/BernardCells/system/controlDict index 6ce11d1e1f..28efaab4c9 100644 --- a/tutorials/modules/fluid/BernardCells/system/controlDict +++ b/tutorials/modules/fluid/BernardCells/system/controlDict @@ -49,7 +49,7 @@ runTimeModifiable true; functions { #includeFunc residuals(p_rgh) - #includeFunc streamlinesLine(entryName=streamlines, start=(0 0.5 0), end=(9 0.5 0), nPoints=24, U) + #includeFunc streamlinesLine(name=streamlines, start=(0 0.5 0), end=(9 0.5 0), nPoints=24, U) } // ************************************************************************* // diff --git a/tutorials/modules/incompressibleFluid/T3A/system/controlDict b/tutorials/modules/incompressibleFluid/T3A/system/controlDict index 582df82f35..1c62036e82 100644 --- a/tutorials/modules/incompressibleFluid/T3A/system/controlDict +++ b/tutorials/modules/incompressibleFluid/T3A/system/controlDict @@ -52,7 +52,7 @@ functions #includeFunc graphUniform ( - entryName=wallShearStressGraph, + name=wallShearStressGraph, start=(0.04075 0.00075 0), end=(3.04 0.00075 0), nPoints=100, @@ -62,7 +62,7 @@ functions #includeFunc graphUniform ( - entryName=kGraph, + name=kGraph, start=(0.04075 0.05 0), end=(3.04 0.05 0), nPoints=100, diff --git a/tutorials/modules/incompressibleFluid/TJunction/system/controlDict b/tutorials/modules/incompressibleFluid/TJunction/system/controlDict index afd5766b50..eaaf384c49 100644 --- a/tutorials/modules/incompressibleFluid/TJunction/system/controlDict +++ b/tutorials/modules/incompressibleFluid/TJunction/system/controlDict @@ -82,9 +82,9 @@ functions } #includeFunc patchFlowRate(patch=outlet1) - #includeFunc faceZoneFlowRate(name=fz1) + #includeFunc faceZoneFlowRate(faceZone=fz1) #includeFunc patchFlowRate(patch=outlet2) - #includeFunc faceZoneFlowRate(name=fz2) + #includeFunc faceZoneFlowRate(faceZone=fz2) } // ************************************************************************* // diff --git a/tutorials/modules/incompressibleFluid/ballValve/system/controlDict b/tutorials/modules/incompressibleFluid/ballValve/system/controlDict index af732f077b..9365238d66 100644 --- a/tutorials/modules/incompressibleFluid/ballValve/system/controlDict +++ b/tutorials/modules/incompressibleFluid/ballValve/system/controlDict @@ -52,9 +52,9 @@ maxCo 0.5; functions { - #includeFunc patchFlowRate(entryName=inletFlowRate, patch=inlet) - #includeFunc patchFlowRate(entryName=lowerOutletFlowRate, patch=lowerOutlet) - #includeFunc patchFlowRate(entryName=upperOutletFlowRate, patch=upperOutlet) + #includeFunc patchFlowRate(name=inletFlowRate, patch=inlet) + #includeFunc patchFlowRate(name=lowerOutletFlowRate, patch=lowerOutlet) + #includeFunc patchFlowRate(name=upperOutletFlowRate, patch=upperOutlet) #includeFunc scalarTransport(s) #includeFunc reconstruct(phi) #includeFunc streamlinesPatch(patch=inlet, nPoints=100, U=reconstruct(phi)) diff --git a/tutorials/modules/incompressibleFluid/channel395/system/controlDict b/tutorials/modules/incompressibleFluid/channel395/system/controlDict index b19ad8c0c8..0c3f6b1abf 100644 --- a/tutorials/modules/incompressibleFluid/channel395/system/controlDict +++ b/tutorials/modules/incompressibleFluid/channel395/system/controlDict @@ -53,7 +53,7 @@ functions #includeFunc uniform ( fieldType = volScalarField, - name = half, + field = half, dimensions = [0 0 0 0 0 0 0], value = 0.5 ) @@ -64,7 +64,7 @@ functions #includeFunc graphLayerAverage ( - entryName = layerAverage, + name = layerAverage, patches = (bottomWall), axis = y, symmetric = yes, diff --git a/tutorials/modules/incompressibleFluid/drivaerFastback/system/controlDict.orig b/tutorials/modules/incompressibleFluid/drivaerFastback/system/controlDict.orig index 85cc3a49bc..8a1432af7d 100644 --- a/tutorials/modules/incompressibleFluid/drivaerFastback/system/controlDict.orig +++ b/tutorials/modules/incompressibleFluid/drivaerFastback/system/controlDict.orig @@ -57,7 +57,7 @@ functions #includeFunc streamlinesSphere ( - entryName=streamlines, + name=streamlines, centre=(4 0 0.7), radius=1, nPoints=30, @@ -66,7 +66,7 @@ functions #includeFunc cutPlaneSurface ( - entryName=xNormal, + name=xNormal, point=(4 0 1), normal=(1 0 0), fields=(p U) @@ -74,13 +74,13 @@ functions #includeFunc cutPlaneSurface ( - entryName=yNormal, + name=yNormal, point=(-5 0.02 1), normal=(0 1 0), fields=(p U) ) - #includeFunc patchSurface(entryName=car, patch=".*(body|Wheels)", p) + #includeFunc patchSurface(name=car, patch=".*(body|Wheels)", p) } // ************************************************************************* // diff --git a/tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict b/tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict index 8c3274133e..ec79dd59ec 100644 --- a/tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict +++ b/tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict @@ -53,7 +53,7 @@ functions clouds { type fvModel; - #includeModel clouds(entryName=fvModel) + #includeModel clouds(name=fvModel) } } diff --git a/tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict b/tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict index 321070496c..dfa4d872f5 100644 --- a/tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict +++ b/tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict @@ -53,7 +53,7 @@ functions clouds { type fvModel; - #includeModel clouds(entryName=fvModel) + #includeModel clouds(name=fvModel) } } diff --git a/tutorials/modules/incompressibleFluid/impeller/system/controlDict b/tutorials/modules/incompressibleFluid/impeller/system/controlDict index e5a7406f6e..17b47a8b85 100644 --- a/tutorials/modules/incompressibleFluid/impeller/system/controlDict +++ b/tutorials/modules/incompressibleFluid/impeller/system/controlDict @@ -52,8 +52,8 @@ maxCo 1.0; functions { - #includeFunc patchFlowRate(patch=inlet, entryName=inletFlowRate) - #includeFunc patchFlowRate(patch=outlet, entryName=outletFlowRate) + #includeFunc patchFlowRate(name=inletFlowRate, patch=inlet) + #includeFunc patchFlowRate(name=outletFlowRate, patch=outlet) cartesianToCylindrical { diff --git a/tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict b/tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict index d784f691a1..f100144446 100644 --- a/tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict +++ b/tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict @@ -53,7 +53,7 @@ functions clouds { type fvModel; - #includeModel clouds(entryName=fvModel) + #includeModel clouds(name=fvModel) } } diff --git a/tutorials/modules/incompressibleFluid/oscillatingInlet/system/controlDict b/tutorials/modules/incompressibleFluid/oscillatingInlet/system/controlDict index 0ba050a907..480cd03c82 100644 --- a/tutorials/modules/incompressibleFluid/oscillatingInlet/system/controlDict +++ b/tutorials/modules/incompressibleFluid/oscillatingInlet/system/controlDict @@ -52,8 +52,8 @@ maxCo 0.5; functions { - #includeFunc patchFlowRate(patch=inlet, entryName=inletFlowRate) - #includeFunc patchFlowRate(patch=outlet, entryName=outletFlowRate) + #includeFunc patchFlowRate(name=inletFlowRate, patch=inlet) + #includeFunc patchFlowRate(name=outletFlowRate, patch=outlet) } diff --git a/tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict b/tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict index 03cd9671c0..ca48a991eb 100644 --- a/tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict +++ b/tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict @@ -55,7 +55,7 @@ functions { #includeFunc streamlinesLine ( - entryName=streamlines, + name=streamlines, start=(-0.0205 0.001 0.00001), end=(-0.0205 0.0251 0.00001), nPoints=10, diff --git a/tutorials/modules/incompressibleFluid/planarContraction/system/controlDict b/tutorials/modules/incompressibleFluid/planarContraction/system/controlDict index 252c2aca8a..c76e009fc9 100644 --- a/tutorials/modules/incompressibleFluid/planarContraction/system/controlDict +++ b/tutorials/modules/incompressibleFluid/planarContraction/system/controlDict @@ -47,9 +47,9 @@ runTimeModifiable true; functions { - #includeFunc graphCell(entryName=lineA, start=(-0.0016 0 0), end=(-0.0016 0.0128 0), U) - #includeFunc graphCell(entryName=lineB, start=(-0.0048 0 0), end=(-0.0048 0.0128 0), U) - #includeFunc graphCell(entryName=lineC, start=(-0.0032 0 0), end=(-0.0032 0.0128 0), U) + #includeFunc graphCell(name=lineA, start=(-0.0016 0 0), end=(-0.0016 0.0128 0), U) + #includeFunc graphCell(name=lineB, start=(-0.0048 0 0), end=(-0.0048 0.0128 0), U) + #includeFunc graphCell(name=lineC, start=(-0.0032 0 0), end=(-0.0032 0.0128 0), U) } // ************************************************************************* // diff --git a/tutorials/modules/incompressibleFluid/planarPoiseuille/system/controlDict b/tutorials/modules/incompressibleFluid/planarPoiseuille/system/controlDict index 5f977eda71..eeea4a0bbe 100644 --- a/tutorials/modules/incompressibleFluid/planarPoiseuille/system/controlDict +++ b/tutorials/modules/incompressibleFluid/planarPoiseuille/system/controlDict @@ -48,8 +48,8 @@ runTimeModifiable true; functions { #includeFunc residuals(p, sigma) - #includeFunc graphCell(entryName=graph, start=(0 0 0), end=(0 1 0), U) - #includeFunc probes(entryName=probes, points=((0 1 0)), U) + #includeFunc graphCell(name=graph, start=(0 0 0), end=(0 1 0), U) + #includeFunc probes(name=probes, points=((0 1 0)), U) } // ************************************************************************* // diff --git a/tutorials/modules/incompressibleFluid/roomResidenceTime/Allrun b/tutorials/modules/incompressibleFluid/roomResidenceTime/Allrun index aae08be27c..e9d0a43b34 100755 --- a/tutorials/modules/incompressibleFluid/roomResidenceTime/Allrun +++ b/tutorials/modules/incompressibleFluid/roomResidenceTime/Allrun @@ -11,7 +11,7 @@ runApplication -s age foamPostProcess -solver $(getSolver) -latestTime \ runApplication -s probes1 foamPostProcess -func probes1 -latestTime runApplication -s probes2 foamPostProcess -func probes2 -latestTime runApplication -s patchFlowRate foamPostProcess -latestTime \ - -func "patchFlowRate(entryName=inletFlowRate,patch=inlet)" -latestTime + -func "patchFlowRate(name=inletFlowRate,patch=inlet)" -latestTime (cd validation && ./Allrun $*) diff --git a/tutorials/modules/multicomponentFluid/nc7h16/system/controlDict b/tutorials/modules/multicomponentFluid/nc7h16/system/controlDict index 1f30a3b4f7..3b428dcde1 100644 --- a/tutorials/modules/multicomponentFluid/nc7h16/system/controlDict +++ b/tutorials/modules/multicomponentFluid/nc7h16/system/controlDict @@ -56,7 +56,7 @@ DebugSwitches functions { #includeFunc adjustTimeStepToChemistry - #includeFunc probes(funcName=probe, points=((0 0 0)), T, p) + #includeFunc probes(name=probe, points=((0 0 0)), T, p) } // ************************************************************************* // diff --git a/tutorials/modules/multiphaseEuler/Grossetete/system/controlDict b/tutorials/modules/multiphaseEuler/Grossetete/system/controlDict index a1839d06fc..07d9e1376d 100644 --- a/tutorials/modules/multiphaseEuler/Grossetete/system/controlDict +++ b/tutorials/modules/multiphaseEuler/Grossetete/system/controlDict @@ -56,7 +56,7 @@ functions { #includeFunc graphCell ( - entryName=graph, + name=graph, start=(0.0101 0 0), end=(0.0101 0.01905 0), fields=(alpha.gas) diff --git a/tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict b/tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict index 9d91006e64..0ca20feb98 100644 --- a/tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict +++ b/tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict @@ -60,7 +60,7 @@ functions #includeFunc phaseForces(phase=water) #includeFunc graphUniform ( - entryName=graph, + name=graph, start=(0 0 0.89), end=(0.025 0 0.89), nPoints=100, @@ -77,24 +77,24 @@ functions #includeFunc populationBalanceSizeDistribution ( + name=probabilityDensity.injection, populationBalance=bubbles, regionType=cellZone, - name=injection, + cellZone=injection, functionType=volumeDensity, coordinateType=diameter, - normalise=yes, - entryName=probabilityDensity.injection + normalise=yes ) #includeFunc populationBalanceSizeDistribution ( + name=probabilityDensity.outlet, populationBalance=bubbles, regionType=cellZone, - name=outlet, + cellZone=outlet, functionType=volumeDensity, coordinateType=diameter, - normalise=yes, - entryName=probabilityDensity.outlet + normalise=yes ) } diff --git a/tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict b/tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict index a21a494c9d..7b17d827b2 100644 --- a/tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict +++ b/tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict @@ -57,7 +57,7 @@ functions #includeFunc cellMin ( - entryName=min, + name=min, alpha.liquid, alpha.gas, p, @@ -70,7 +70,7 @@ functions #includeFunc cellMax ( - entryName=max, + name=max, alpha.liquid, alpha.gas, p, @@ -83,7 +83,7 @@ functions #includeFunc graphPatchCutLayerAverage ( - entryName=hydrofoilLowerPressure, + name=hydrofoilLowerPressure, patch=hydrofoilLower, direction=(0.15 -0.016 0), nPoints=100, @@ -92,7 +92,7 @@ functions #includeFunc graphPatchCutLayerAverage ( - entryName=hydrofoilUpperPressure, + name=hydrofoilUpperPressure, patch=hydrofoilUpper, direction=(0.15 -0.016 0), nPoints=100, diff --git a/tutorials/modules/multiphaseEuler/pipeBend/Allrun b/tutorials/modules/multiphaseEuler/pipeBend/Allrun index 6ff09b622d..383b4c819a 100755 --- a/tutorials/modules/multiphaseEuler/pipeBend/Allrun +++ b/tutorials/modules/multiphaseEuler/pipeBend/Allrun @@ -17,7 +17,7 @@ runApplication reconstructPar -latestTime runApplication foamPostProcess -func " graphLayerAverage ( - entryName=graphCrossSection, + name=graphCrossSection, patches=(inlet), axis=distance, d.particles diff --git a/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict b/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict index 8b1079bfd5..f465681159 100644 --- a/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict +++ b/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict @@ -57,46 +57,46 @@ functions #includeFunc populationBalanceSizeDistribution ( + name=probabilityDensity.afterBend_1d, populationBalance=agglomerates, regionType=cellZone, - name=afterBend_1d, + cellZone=afterBend_1d, functionType=volumeDensity, coordinateType=diameter, - normalise=yes, - entryName=probabilityDensity.afterBend_1d + normalise=yes ) #includeFunc populationBalanceSizeDistribution ( + name=probabilityDensity.afterBend_5d, populationBalance=agglomerates, regionType=cellZone, - name=afterBend_5d, + cellZone=afterBend_5d, functionType=volumeDensity, coordinateType=diameter, - normalise=yes, - entryName=probabilityDensity.afterBend_5d + normalise=yes ) #includeFunc populationBalanceSizeDistribution ( + name=probabilityDensity.afterBend_9d, populationBalance=agglomerates, regionType=cellZone, - name=afterBend_9d, + cellZone=afterBend_9d, functionType=volumeDensity, coordinateType=diameter, - normalise=yes, - entryName=probabilityDensity.afterBend_9d + normalise=yes ) #includeFunc populationBalanceSizeDistribution ( + name=probabilityDensity.beforeBend_1d, populationBalance=agglomerates, regionType=cellZone, - name=beforeBend_1d, + cellZone=beforeBend_1d, functionType=volumeDensity, coordinateType=diameter, - normalise=yes, - entryName=probabilityDensity.beforeBend_1d + normalise=yes ) } diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict b/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict index 6cc4b92887..28df413544 100644 --- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict +++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict @@ -56,7 +56,7 @@ functions { #includeFunc graphCell ( - entryName=graph, + name=graph, start=(0 0 1e-3), end=(0.44 0 1e-3), fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles) @@ -64,15 +64,15 @@ functions #includeFunc populationBalanceSizeDistribution ( + name=numberDensity, populationBalance=aggregates, regionType=cellZone, - name=outlet, + cellZone=outlet, functionType=numberDensity, coordinateType=projectedAreaDiameter, allCoordinates=yes, normalise=yes, - logTransform=yes, - entryName=numberDensity + logTransform=yes ) #includeFunc writeObjects diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict index fb5978fa37..7be4e152b9 100644 --- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict +++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict @@ -56,7 +56,7 @@ functions { #includeFunc graphCell ( - entryName=graph, + name=graph, start=(0 0 1e-3), end=(0.44 0 1e-3), fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles) @@ -64,15 +64,15 @@ functions #includeFunc populationBalanceSizeDistribution ( + name=numberDensity, populationBalance=aggregates, regionType=cellZone, - name=outlet, + cellZone=outlet, functionType=numberDensity, coordinateType=projectedAreaDiameter, allCoordinates=yes, normalise=yes, - logTransform=yes, - entryName=numberDensity + logTransform=yes ) #includeFunc writeObjects diff --git a/tutorials/modules/multiphaseEuler/wallBoilingIATE/Allrun b/tutorials/modules/multiphaseEuler/wallBoilingIATE/Allrun index 7f73e976a7..8bb2f1df91 100755 --- a/tutorials/modules/multiphaseEuler/wallBoilingIATE/Allrun +++ b/tutorials/modules/multiphaseEuler/wallBoilingIATE/Allrun @@ -15,7 +15,7 @@ runApplication reconstructPar -latestTime runApplication foamPostProcess -latestTime -func " graphCell ( - entryName=graph, + name=graph, start=(3.4901 0 0), end=(3.4901 0.0096 0), fields=(alpha.gas T.liquid T.gas d.gas) @@ -23,7 +23,7 @@ runApplication foamPostProcess -latestTime -func " runApplication -append foamPostProcess -latestTime -func " patchSurface ( - entryName=patchWallBoilingProperties, + name=patchWallBoilingProperties, patch=wall, surfaceFormat=raw, interpolate=false, diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/Allrun b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/Allrun index e6059b78a4..8c9d1f9f8c 100755 --- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/Allrun +++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/Allrun @@ -16,7 +16,7 @@ runApplication reconstructPar -latestTime runApplication foamPostProcess -latestTime -func " graphCell ( - entryName=graph, + name=graph, start=(3.4901 0 0), end=(3.4901 0.0096 0), fields=(alpha.gas T.liquid T.gas d.gas) @@ -24,7 +24,7 @@ runApplication foamPostProcess -latestTime -func " runApplication -append foamPostProcess -latestTime -func " patchSurface ( - entryName=patchWallBoilingProperties, + name=patchWallBoilingProperties, patch=wall, surfaceFormat=raw, interpolate=false, diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun index c552fe87ff..54a750cc0c 100755 --- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun +++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun @@ -16,7 +16,7 @@ runApplication reconstructPar -latestTime runApplication foamPostProcess -latestTime -func " graphCell ( - entryName=graph, + name=graph, start=(3.4901 0 0), end=(3.4901 0.0096 0), fields=(alpha.gas alpha.gas2 alpha.liquid T.liquid T.gas d.bubbles) @@ -24,7 +24,7 @@ runApplication foamPostProcess -latestTime -func " runApplication -append foamPostProcess -latestTime -func " patchSurface ( - entryName=patchWallBoilingProperties, + name=patchWallBoilingProperties, patch=wall, surfaceFormat=raw, interpolate=false,