#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
    )
This commit is contained in:
Will Bainbridge
2023-02-01 11:18:58 +00:00
parent 574165dc13
commit dc85d509b0
43 changed files with 109 additions and 103 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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