diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H index 93c417c475..e74403d96f 100644 --- a/src/OpenFOAM/db/dictionary/dictionary.H +++ b/src/OpenFOAM/db/dictionary/dictionary.H @@ -751,7 +751,7 @@ dictionary operator|(const dictionary& dict1, const dictionary& dict2); void dictArgList ( const string& argString, - word& funcName, + word& configName, wordReList& args, List>& namedArgs ); @@ -810,7 +810,7 @@ wordList listAllConfigFiles // otherwise null fileName findConfigFile ( - const word& funcName, + const word& configName, const fileName& configFilesPath, const word& region = word::null ); @@ -822,19 +822,20 @@ fileName findConfigFile // 'parentDict'. // // Parses the optional arguments: -// 'Q(U)' -> funcName = Q; args = (U) +// 'Q(U)' -> configFileName = Q; args = (U) // -> field U; // // Supports named arguments: // 'patchAverage(patch=inlet, p,U)' // or // 'patchAverage(patch=inlet, field=(p U))' -// -> funcName = patchAverage; +// -> configFileName = patchAverage; // args = (patch=inlet, p,U) // -> patch inlet; // fields (p U); bool readConfigFile ( + const word& configType, const string& argString, dictionary& parentDict, const fileName& configFilesPath, diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C index ccf3743639..66ea4d16fa 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryIO.C +++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C @@ -349,7 +349,7 @@ void listConfigFiles Foam::fileName Foam::findConfigFile ( - const word& funcName, + const word& configName, const fileName& configFilesPath, const word& region ) @@ -359,7 +359,7 @@ Foam::fileName Foam::findConfigFile { const fileName dictFile ( - stringOps::expand("$FOAM_CASE")/"system"/region/funcName + stringOps::expand("$FOAM_CASE")/"system"/region/configName ); if (isFile(dictFile)) @@ -374,7 +374,7 @@ Foam::fileName Foam::findConfigFile { const fileName dictFile ( - stringOps::expand("$FOAM_CASE")/"system"/funcName + stringOps::expand("$FOAM_CASE")/"system"/configName ); if (isFile(dictFile)) @@ -389,7 +389,7 @@ Foam::fileName Foam::findConfigFile forAll(etcDirs, i) { - const fileName dictFile(search(funcName, etcDirs[i])); + const fileName dictFile(search(configName, etcDirs[i])); if (!dictFile.empty()) { @@ -422,6 +422,7 @@ Foam::wordList Foam::listAllConfigFiles bool Foam::readConfigFile ( + const word& configType, const string& argString, dictionary& parentDict, const fileName& configFilesPath, @@ -467,7 +468,7 @@ bool Foam::readConfigFile ISstream& fileStream = fileStreamPtr(); // Delay processing the functionEntries - // until after the function argument entries have been added + // until after the argument entries have been added entry::disableFunctionEntries = true; dictionary funcsDict(funcType, parentDict, fileStream); entry::disableFunctionEntries = false; @@ -545,12 +546,16 @@ bool Foam::readConfigFile funcDict.set("region", region); } - // Set the name of the function entry to that specified by the optional - // funcName argument otherwise automatically generate a unique name - // from the function type and arguments - const word funcName + // Set the name of the entry to that specified by the optional + // entryName argument otherwise automatically generate a unique name + // from the type and arguments + const word entryName ( - funcDict.lookupOrDefault("funcName", string::validate(argString)) + funcDict.lookupOrDefaultBackwardsCompatible + ( + {"entryName", "funcName"}, + string::validate(argString) + ) ); // Check for anything in the configuration that has not been set @@ -587,7 +592,7 @@ bool Foam::readConfigFile } FatalIOErrorInFunction(funcDict0) - << nl << "In function entry:" << nl + << nl << "In " << configType << " entry:" << nl << " " << argString.c_str() << nl << nl << "In " << contextTypeAndValue.first().c_str() << ":" << nl << " " << contextTypeAndValue.second().c_str() << nl; @@ -619,15 +624,15 @@ bool Foam::readConfigFile } FatalIOErrorInFunction(funcDict0) - << nl << "The function entry should be:" << nl + << nl << "The " << configType << " entry should be:" << nl << " " << funcType << '(' << argList.c_str() << ')' << exit(FatalIOError); } // Re-parse the funcDict to execute the functionEntries - // now that the function argument entries have been added + // now that the argument entries have been added dictionary funcArgsDict; - funcArgsDict.add(funcName, funcDict); + funcArgsDict.add(entryName, funcDict); { OStringStream os; funcArgsDict.write(os); @@ -641,7 +646,7 @@ bool Foam::readConfigFile // Merge this configuration dictionary into parentDict parentDict.merge(funcArgsDict); - parentDict.subDict(funcName).name() = funcDict.name(); + parentDict.subDict(entryName).name() = funcDict.name(); return true; } diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.C index 49a1a778c3..d320533629 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.C @@ -64,6 +64,7 @@ bool Foam::functionEntries::includeFuncEntry::execute return readConfigFile ( + "function", fNameArgs, parentDict, functionObjectDictPath, diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C index a78a6ae2bc..488d07e3ac 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C @@ -144,6 +144,7 @@ Foam::autoPtr Foam::functionObjectList::New { readConfigFile ( + "function", args["func"], functionsDict, functionEntries::includeFuncEntry::functionObjectDictPath, @@ -160,6 +161,7 @@ Foam::autoPtr Foam::functionObjectList::New { readConfigFile ( + "function", funcs[i], functionsDict, functionEntries::includeFuncEntry::functionObjectDictPath, diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/includeFvConstraintEntry/includeFvConstraintEntry.C b/src/finiteVolume/cfdTools/general/fvConstraints/includeFvConstraintEntry/includeFvConstraintEntry.C index 0013f2144c..aba133fc32 100644 --- a/src/finiteVolume/cfdTools/general/fvConstraints/includeFvConstraintEntry/includeFvConstraintEntry.C +++ b/src/finiteVolume/cfdTools/general/fvConstraints/includeFvConstraintEntry/includeFvConstraintEntry.C @@ -65,6 +65,7 @@ bool Foam::functionEntries::includeFvConstraintEntry::execute return readConfigFile ( + "constraint", fNameArgs, parentDict, fvConstraintDictPath, diff --git a/src/finiteVolume/cfdTools/general/fvModels/includeFvModelEntry/includeFvModelEntry.C b/src/finiteVolume/cfdTools/general/fvModels/includeFvModelEntry/includeFvModelEntry.C index ffc8fa65ea..b962b5585e 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/includeFvModelEntry/includeFvModelEntry.C +++ b/src/finiteVolume/cfdTools/general/fvModels/includeFvModelEntry/includeFvModelEntry.C @@ -64,6 +64,7 @@ bool Foam::functionEntries::includeFvModelEntry::execute return readConfigFile ( + "model", fNameArgs, parentDict, fvModelDictPath, diff --git a/test/multiphase/multiphaseEuler/populationBalance/binaryBreakup/system/controlDict b/test/multiphase/multiphaseEuler/populationBalance/binaryBreakup/system/controlDict index b627db7eec..2fcf2c8dd2 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/binaryBreakup/system/controlDict +++ b/test/multiphase/multiphaseEuler/populationBalance/binaryBreakup/system/controlDict @@ -59,7 +59,7 @@ functions populationBalance=bubbles, functionType=numberDensity, coordinateType=volume, - funcName=numberDensity + entryName=numberDensity ) } diff --git a/test/multiphase/multiphaseEuler/populationBalance/breakup/system/controlDict b/test/multiphase/multiphaseEuler/populationBalance/breakup/system/controlDict index b627db7eec..2fcf2c8dd2 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/breakup/system/controlDict +++ b/test/multiphase/multiphaseEuler/populationBalance/breakup/system/controlDict @@ -59,7 +59,7 @@ functions populationBalance=bubbles, functionType=numberDensity, coordinateType=volume, - funcName=numberDensity + entryName=numberDensity ) } diff --git a/test/multiphase/multiphaseEuler/populationBalance/coalescence/system/controlDict b/test/multiphase/multiphaseEuler/populationBalance/coalescence/system/controlDict index 1a7261ef8f..63e87f9889 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/coalescence/system/controlDict +++ b/test/multiphase/multiphaseEuler/populationBalance/coalescence/system/controlDict @@ -59,7 +59,7 @@ functions populationBalance=bubbles, functionType=numberDensity, coordinateType=volume, - funcName=numberDensity + entryName=numberDensity ) } diff --git a/test/multiphase/multiphaseEuler/populationBalance/drift/system/controlDict b/test/multiphase/multiphaseEuler/populationBalance/drift/system/controlDict index 1faa4d225c..d82060fa78 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/drift/system/controlDict +++ b/test/multiphase/multiphaseEuler/populationBalance/drift/system/controlDict @@ -59,7 +59,7 @@ functions populationBalance=bubbles, functionType=numberDensity, coordinateType=volume, - funcName=numberDensity + entryName=numberDensity ) #includeFunc populationBalanceMoments @@ -80,7 +80,7 @@ functions #includeFunc probes ( - funcName=probes, + entryName=probes, points=((0.5 0.5 0.5)), integerMoment0(N,v).bubbles, integerMoment1(N,v).bubbles, diff --git a/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/system/controlDict b/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/system/controlDict index 59e76e41a8..5b984ecead 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/system/controlDict +++ b/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/system/controlDict @@ -63,7 +63,7 @@ functions ) #includeFunc graphCell ( - funcName=graph, + entryName=graph, start=(0.05 0 0.05), end=(0.05 1.0 0.05), axis=y, diff --git a/test/multiphase/multiphaseEuler/populationBalance/negativeDrift/system/controlDict b/test/multiphase/multiphaseEuler/populationBalance/negativeDrift/system/controlDict index 2e39118099..390d94c3a6 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/negativeDrift/system/controlDict +++ b/test/multiphase/multiphaseEuler/populationBalance/negativeDrift/system/controlDict @@ -59,7 +59,7 @@ functions populationBalance=bubbles, functionType=numberDensity, coordinateType=volume, - funcName=numberDensity + entryName=numberDensity ) #includeFunc populationBalanceMoments @@ -80,7 +80,7 @@ functions #includeFunc probes ( - funcName=probes, + entryName=probes, points=((0.5 0.5 0.5)), integerMoment0(N,v).bubbles, integerMoment1(N,v).bubbles, diff --git a/test/multiphase/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict b/test/multiphase/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict index 9fb242200b..d0c0cd5594 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict +++ b/test/multiphase/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict @@ -60,7 +60,7 @@ functions functionType=numberDensity, coordinateType=diameter, normalise=yes, - funcName=numberDensity + entryName=numberDensity ) #includeFunc populationBalanceSizeDistribution @@ -69,7 +69,7 @@ functions functionType=volumeDensity, coordinateType=diameter, normalise=yes, - funcName=volumeDensity + entryName=volumeDensity ) } diff --git a/tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict b/tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict index 714dbe5e5e..be78f5540c 100644 --- a/tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict +++ b/tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict @@ -63,14 +63,14 @@ functions { #includeFunc patchAverage ( - funcName=cylinderT, + entryName=cylinderT, region=fluid, patch=fluid_to_solid, field=T ) #includeFunc patchAverage ( - funcName=inletU, + entryName=inletU, region=fluid, patch=inlet, field=U diff --git a/tutorials/modules/CHT/coolingCylinder2D/system/controlDict b/tutorials/modules/CHT/coolingCylinder2D/system/controlDict index c93c4934b4..fab3c896f6 100644 --- a/tutorials/modules/CHT/coolingCylinder2D/system/controlDict +++ b/tutorials/modules/CHT/coolingCylinder2D/system/controlDict @@ -61,14 +61,14 @@ functions { #includeFunc patchAverage ( - funcName=cylinderT, + entryName=cylinderT, region=fluid, patch=fluid_to_solid, field=T ) #includeFunc patchAverage ( - funcName=inletU, + entryName=inletU, region=fluid, patch=inlet, field=U diff --git a/tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict b/tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict index 92d989af67..0c601f4706 100644 --- a/tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict +++ b/tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict @@ -61,7 +61,7 @@ functions { #includeFunc patchAverage ( - funcName=cylinderToil, + entryName=cylinderToil, region=fluid, patch=fluid_to_solid, field=T.oil @@ -69,7 +69,7 @@ functions #includeFunc patchAverage ( - funcName=cylinderTwater, + entryName=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 71a8c62fae..22012d4df3 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 ( - funcName=graph, + entryName=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 ( - funcName=patchWallBoilingProperties, + entryName=patchWallBoilingProperties, patch=wall, surfaceFormat=raw, interpolate=false, diff --git a/tutorials/modules/CHT/wallBoiling/system/controlDict b/tutorials/modules/CHT/wallBoiling/system/controlDict index 74acc96f76..4771f35e23 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(funcName=WHFliquid, writeFields=false, phase=liquid, region=fluid) - #includeFunc wallHeatFlux(funcName=WHFgas, writeFields=false, phase=gas, region=fluid) - #includeFunc wallHeatFlux(funcName=WHFsolid, writeFields=false, region=solid, log=yes) + #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) writeWallBoilingProperties { diff --git a/tutorials/modules/fluid/BernardCells/system/controlDict b/tutorials/modules/fluid/BernardCells/system/controlDict index 944e7c7e37..6ce11d1e1f 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(funcName=streamlines, start=(0 0.5 0), end=(9 0.5 0), nPoints=24, U) + #includeFunc streamlinesLine(entryName=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 850054e15d..582df82f35 100644 --- a/tutorials/modules/incompressibleFluid/T3A/system/controlDict +++ b/tutorials/modules/incompressibleFluid/T3A/system/controlDict @@ -52,7 +52,7 @@ functions #includeFunc graphUniform ( - funcName=wallShearStressGraph, + entryName=wallShearStressGraph, start=(0.04075 0.00075 0), end=(3.04 0.00075 0), nPoints=100, @@ -62,7 +62,7 @@ functions #includeFunc graphUniform ( - funcName=kGraph, + entryName=kGraph, start=(0.04075 0.05 0), end=(3.04 0.05 0), nPoints=100, diff --git a/tutorials/modules/incompressibleFluid/ballValve/system/controlDict b/tutorials/modules/incompressibleFluid/ballValve/system/controlDict index af2dc61982..af732f077b 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(funcName=inletFlowRate, patch=inlet) - #includeFunc patchFlowRate(funcName=lowerOutletFlowRate, patch=lowerOutlet) - #includeFunc patchFlowRate(funcName=upperOutletFlowRate, patch=upperOutlet) + #includeFunc patchFlowRate(entryName=inletFlowRate, patch=inlet) + #includeFunc patchFlowRate(entryName=lowerOutletFlowRate, patch=lowerOutlet) + #includeFunc patchFlowRate(entryName=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 c51f71bb74..b19ad8c0c8 100644 --- a/tutorials/modules/incompressibleFluid/channel395/system/controlDict +++ b/tutorials/modules/incompressibleFluid/channel395/system/controlDict @@ -64,7 +64,7 @@ functions #includeFunc graphLayerAverage ( - funcName = layerAverage, + entryName = 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 6cc8839173..85cc3a49bc 100644 --- a/tutorials/modules/incompressibleFluid/drivaerFastback/system/controlDict.orig +++ b/tutorials/modules/incompressibleFluid/drivaerFastback/system/controlDict.orig @@ -57,7 +57,7 @@ functions #includeFunc streamlinesSphere ( - funcName=streamlines, + entryName=streamlines, centre=(4 0 0.7), radius=1, nPoints=30, @@ -66,7 +66,7 @@ functions #includeFunc cutPlaneSurface ( - funcName=xNormal, + entryName=xNormal, point=(4 0 1), normal=(1 0 0), fields=(p U) @@ -74,13 +74,13 @@ functions #includeFunc cutPlaneSurface ( - funcName=yNormal, + entryName=yNormal, point=(-5 0.02 1), normal=(0 1 0), fields=(p U) ) - #includeFunc patchSurface(funcName=car, patch=".*(body|Wheels)", p) + #includeFunc patchSurface(entryName=car, patch=".*(body|Wheels)", p) } // ************************************************************************* // diff --git a/tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict b/tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict index 969e8a280e..8c3274133e 100644 --- a/tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict +++ b/tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict @@ -53,14 +53,7 @@ functions clouds { type fvModel; - - executeAtStart false; - - fvModel - { - type clouds; - libs ("liblagrangianParcel.so"); - } + #includeModel clouds(entryName=fvModel) } } diff --git a/tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict b/tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict index 7ad8d0e347..321070496c 100644 --- a/tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict +++ b/tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict @@ -53,12 +53,7 @@ functions clouds { type fvModel; - - fvModel - { - type clouds; - libs ("liblagrangianParcel.so"); - } + #includeModel clouds(entryName=fvModel) } } diff --git a/tutorials/modules/incompressibleFluid/impeller/system/controlDict b/tutorials/modules/incompressibleFluid/impeller/system/controlDict index ebcaf0a759..e5a7406f6e 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, funcName=inletFlowRate) - #includeFunc patchFlowRate(patch=outlet, funcName=outletFlowRate) + #includeFunc patchFlowRate(patch=inlet, entryName=inletFlowRate) + #includeFunc patchFlowRate(patch=outlet, entryName=outletFlowRate) cartesianToCylindrical { diff --git a/tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict b/tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict index 11594c2fe0..d784f691a1 100644 --- a/tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict +++ b/tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict @@ -53,12 +53,7 @@ functions clouds { type fvModel; - - fvModel - { - type clouds; - libs ("liblagrangianParcel.so"); - } + #includeModel clouds(entryName=fvModel) } } diff --git a/tutorials/modules/incompressibleFluid/oscillatingInlet/system/controlDict b/tutorials/modules/incompressibleFluid/oscillatingInlet/system/controlDict index e68e97ba25..0ba050a907 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, funcName=inletFlowRate) - #includeFunc patchFlowRate(patch=outlet, funcName=outletFlowRate) + #includeFunc patchFlowRate(patch=inlet, entryName=inletFlowRate) + #includeFunc patchFlowRate(patch=outlet, entryName=outletFlowRate) } diff --git a/tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict b/tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict index 55cb9e9cba..03cd9671c0 100644 --- a/tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict +++ b/tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict @@ -55,7 +55,7 @@ functions { #includeFunc streamlinesLine ( - funcName=streamlines, + entryName=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 2473ad28dc..252c2aca8a 100644 --- a/tutorials/modules/incompressibleFluid/planarContraction/system/controlDict +++ b/tutorials/modules/incompressibleFluid/planarContraction/system/controlDict @@ -47,9 +47,9 @@ runTimeModifiable true; functions { - #includeFunc graphCell(funcName=lineA, start=(-0.0016 0 0), end=(-0.0016 0.0128 0), U) - #includeFunc graphCell(funcName=lineB, start=(-0.0048 0 0), end=(-0.0048 0.0128 0), U) - #includeFunc graphCell(funcName=lineC, start=(-0.0032 0 0), end=(-0.0032 0.0128 0), U) + #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) } // ************************************************************************* // diff --git a/tutorials/modules/incompressibleFluid/planarPoiseuille/system/controlDict b/tutorials/modules/incompressibleFluid/planarPoiseuille/system/controlDict index 9cead2f1e5..5f977eda71 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(funcName=graph, start=(0 0 0), end=(0 1 0), U) - #includeFunc probes(funcName=probes, points=((0 1 0)), U) + #includeFunc graphCell(entryName=graph, start=(0 0 0), end=(0 1 0), U) + #includeFunc probes(entryName=probes, points=((0 1 0)), U) } // ************************************************************************* // diff --git a/tutorials/modules/incompressibleFluid/roomResidenceTime/Allrun b/tutorials/modules/incompressibleFluid/roomResidenceTime/Allrun index 923885b4a4..aae08be27c 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(funcName=inletFlowRate,patch=inlet)" -latestTime + -func "patchFlowRate(entryName=inletFlowRate,patch=inlet)" -latestTime (cd validation && ./Allrun $*) diff --git a/tutorials/modules/multiphaseEuler/Grossetete/system/controlDict b/tutorials/modules/multiphaseEuler/Grossetete/system/controlDict index 376cc4a307..a1839d06fc 100644 --- a/tutorials/modules/multiphaseEuler/Grossetete/system/controlDict +++ b/tutorials/modules/multiphaseEuler/Grossetete/system/controlDict @@ -56,7 +56,7 @@ functions { #includeFunc graphCell ( - funcName=graph, + entryName=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 58ee236255..9d91006e64 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 ( - funcName=graph, + entryName=graph, start=(0 0 0.89), end=(0.025 0 0.89), nPoints=100, @@ -83,7 +83,7 @@ functions functionType=volumeDensity, coordinateType=diameter, normalise=yes, - funcName=probabilityDensity.injection + entryName=probabilityDensity.injection ) #includeFunc populationBalanceSizeDistribution @@ -94,7 +94,7 @@ functions functionType=volumeDensity, coordinateType=diameter, normalise=yes, - funcName=probabilityDensity.outlet + entryName=probabilityDensity.outlet ) } diff --git a/tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict b/tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict index 9dde81e8b5..a21a494c9d 100644 --- a/tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict +++ b/tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict @@ -57,7 +57,7 @@ functions #includeFunc cellMin ( - funcName=min, + entryName=min, alpha.liquid, alpha.gas, p, @@ -70,7 +70,7 @@ functions #includeFunc cellMax ( - funcName=max, + entryName=max, alpha.liquid, alpha.gas, p, @@ -83,7 +83,7 @@ functions #includeFunc graphPatchCutLayerAverage ( - funcName=hydrofoilLowerPressure, + entryName=hydrofoilLowerPressure, patch=hydrofoilLower, direction=(0.15 -0.016 0), nPoints=100, @@ -92,7 +92,7 @@ functions #includeFunc graphPatchCutLayerAverage ( - funcName=hydrofoilUpperPressure, + entryName=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 737977b18d..6ff09b622d 100755 --- a/tutorials/modules/multiphaseEuler/pipeBend/Allrun +++ b/tutorials/modules/multiphaseEuler/pipeBend/Allrun @@ -17,7 +17,7 @@ runApplication reconstructPar -latestTime runApplication foamPostProcess -func " graphLayerAverage ( - funcName=graphCrossSection, + entryName=graphCrossSection, patches=(inlet), axis=distance, d.particles diff --git a/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict b/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict index d9984ff22c..8b1079bfd5 100644 --- a/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict +++ b/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict @@ -63,7 +63,7 @@ functions functionType=volumeDensity, coordinateType=diameter, normalise=yes, - funcName=probabilityDensity.afterBend_1d + entryName=probabilityDensity.afterBend_1d ) #includeFunc populationBalanceSizeDistribution @@ -74,7 +74,7 @@ functions functionType=volumeDensity, coordinateType=diameter, normalise=yes, - funcName=probabilityDensity.afterBend_5d + entryName=probabilityDensity.afterBend_5d ) #includeFunc populationBalanceSizeDistribution @@ -85,7 +85,7 @@ functions functionType=volumeDensity, coordinateType=diameter, normalise=yes, - funcName=probabilityDensity.afterBend_9d + entryName=probabilityDensity.afterBend_9d ) #includeFunc populationBalanceSizeDistribution @@ -96,7 +96,7 @@ functions functionType=volumeDensity, coordinateType=diameter, normalise=yes, - funcName=probabilityDensity.beforeBend_1d + entryName=probabilityDensity.beforeBend_1d ) } diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict b/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict index 0e4c462dff..6cc4b92887 100644 --- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict +++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict @@ -56,7 +56,7 @@ functions { #includeFunc graphCell ( - funcName=graph, + entryName=graph, start=(0 0 1e-3), end=(0.44 0 1e-3), fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles) @@ -72,7 +72,7 @@ functions allCoordinates=yes, normalise=yes, logTransform=yes, - funcName=numberDensity + entryName=numberDensity ) #includeFunc writeObjects diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict index d01b956dda..fb5978fa37 100644 --- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict +++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict @@ -56,7 +56,7 @@ functions { #includeFunc graphCell ( - funcName=graph, + entryName=graph, start=(0 0 1e-3), end=(0.44 0 1e-3), fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles) @@ -72,7 +72,7 @@ functions allCoordinates=yes, normalise=yes, logTransform=yes, - funcName=numberDensity + entryName=numberDensity ) #includeFunc writeObjects diff --git a/tutorials/modules/multiphaseEuler/wallBoilingIATE/Allrun b/tutorials/modules/multiphaseEuler/wallBoilingIATE/Allrun index 02f2a6c4c2..7f73e976a7 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 ( - funcName=graph, + entryName=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 ( - funcName=patchWallBoilingProperties, + entryName=patchWallBoilingProperties, patch=wall, surfaceFormat=raw, interpolate=false, diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/Allrun b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/Allrun index 26ba676605..e6059b78a4 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 ( - funcName=graph, + entryName=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 ( - funcName=patchWallBoilingProperties, + entryName=patchWallBoilingProperties, patch=wall, surfaceFormat=raw, interpolate=false, diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun index b268255cb8..c552fe87ff 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 ( - funcName=graph, + entryName=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 ( - funcName=patchWallBoilingProperties, + entryName=patchWallBoilingProperties, patch=wall, surfaceFormat=raw, interpolate=false,