zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#includeFunc: Changed entry renaming option funcName -> entryName

Browse Source 
so that the same option with a rational name is also available for #includeModel
and #includeConstraint.  Support for funcName is maintained for
backwards-compatibility.
This commit is contained in:
Henry Weller
2023-01-31 18:25:10 +00:00
parent 75da5c3d4c
commit 5982e04bc8
42 changed files with 99 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tutorials/modules/CHT/VoFcoolingCylinder2D/system/controlDict
View File

@ -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

4
tutorials/modules/CHT/coolingCylinder2D/system/controlDict
View File

@ -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

4
tutorials/modules/CHT/multiphaseCoolingCylinder2D/system/controlDict
View File

@ -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

4
tutorials/modules/CHT/wallBoiling/Allrun
View File

@ -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,

6
tutorials/modules/CHT/wallBoiling/system/controlDict
View File

@ -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
{

2
tutorials/modules/fluid/BernardCells/system/controlDict
View File

@ -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)
}
// ************************************************************************* //

4
tutorials/modules/incompressibleFluid/T3A/system/controlDict
View File

@ -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,

6
tutorials/modules/incompressibleFluid/ballValve/system/controlDict
View File

@ -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))

2
tutorials/modules/incompressibleFluid/channel395/system/controlDict
View File

@ -64,7 +64,7 @@ functions
#includeFunc graphLayerAverage
(
funcName = layerAverage,
entryName = layerAverage,
patches = (bottomWall),
axis = y,
symmetric = yes,

8
tutorials/modules/incompressibleFluid/drivaerFastback/system/controlDict.orig
View File

@ -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)
}
// ************************************************************************* //

9
tutorials/modules/incompressibleFluid/hopperParticles/hopperEmptying/system/controlDict
View File

@ -53,14 +53,7 @@ functions
clouds
{
type fvModel;
executeAtStart false;
fvModel
{
type clouds;
libs ("liblagrangianParcel.so");
}
#includeModel clouds(entryName=fvModel)
}
}

7
tutorials/modules/incompressibleFluid/hopperParticles/hopperInitialState/system/controlDict
View File

@ -53,12 +53,7 @@ functions
clouds
{
type fvModel;
fvModel
{
type clouds;
libs ("liblagrangianParcel.so");
}
#includeModel clouds(entryName=fvModel)
}
}

4
tutorials/modules/incompressibleFluid/impeller/system/controlDict
View File

@ -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
{

7
tutorials/modules/incompressibleFluid/mixerVessel2DParticles/system/controlDict
View File

@ -53,12 +53,7 @@ functions
clouds
{
type fvModel;
fvModel
{
type clouds;
libs ("liblagrangianParcel.so");
}
#includeModel clouds(entryName=fvModel)
}
}

4
tutorials/modules/incompressibleFluid/oscillatingInlet/system/controlDict
View File

@ -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)
}

2
tutorials/modules/incompressibleFluid/pitzDailySteady/system/controlDict
View File

@ -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,

6
tutorials/modules/incompressibleFluid/planarContraction/system/controlDict
View File

@ -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)
}
// ************************************************************************* //

4
tutorials/modules/incompressibleFluid/planarPoiseuille/system/controlDict
View File

@ -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)
}
// ************************************************************************* //

2
tutorials/modules/incompressibleFluid/roomResidenceTime/Allrun
View File

@ -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 $*)

2
tutorials/modules/multiphaseEuler/Grossetete/system/controlDict
View File

@ -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)

6
tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict
View File

@ -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
)
}

8
tutorials/modules/multiphaseEuler/hydrofoil/system/controlDict
View File

@ -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,

2
tutorials/modules/multiphaseEuler/pipeBend/Allrun
View File

@ -17,7 +17,7 @@ runApplication reconstructPar -latestTime
runApplication foamPostProcess -func "
graphLayerAverage
(
funcName=graphCrossSection,
entryName=graphCrossSection,
patches=(inlet),
axis=distance,
d.particles

8
tutorials/modules/multiphaseEuler/pipeBend/system/controlDict
View File

@ -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
)
}

4
tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict
View File

@ -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

4
tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict
View File

@ -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

4
tutorials/modules/multiphaseEuler/wallBoilingIATE/Allrun
View File

@ -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,

4
tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/Allrun
View File

@ -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,

4
tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun
View File

@ -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,