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

#includeFunc, #includeModel, #includeConstraint: Changed entry renaming option to "name"

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/caseDicts/postProcessing/fieldsOperations/uniform
View File

@ -14,7 +14,7 @@ type uniform;
libs ("libfieldFunctionObjects.so"); libs ("libfieldFunctionObjects.so");
fieldType <fieldType>; fieldType <fieldType>;
name <name>; field <fieldName>;
dimensions <dimensions>; dimensions <dimensions>;
value <value>; value <value>;

2
etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution
View File

@ -31,7 +31,7 @@ weightType numberConcentration; // volumeConcentration,
// numberConcentration // numberConcentration
regionType all; // cellZone regionType all; // cellZone
// defaults to all // defaults to all
name cellZoneName; // relevant for regionType all cellZone cellZoneName; // relevant for regionType all
setFormat raw; setFormat raw;

2
etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneAverage
View File

@ -10,7 +10,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
name <faceZoneName>; faceZone <faceZoneName>;
fields (<fieldNames>); fields (<fieldNames>);

2
etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneFlowRate
View File

@ -12,7 +12,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
name <faceZoneName>; faceZone <faceZoneName>;
fields (phi); fields (phi);

2
etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg
View File

@ -8,6 +8,6 @@
#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg"
regionType faceZone; regionType faceZone;
// ************************************************************************* // // ************************************************************************* //

1
etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg
View File

@ -9,6 +9,5 @@
#includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg"
regionType patch; regionType patch;
name $patch;
// ************************************************************************* // // ************************************************************************* //

2
etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceAverage
View File

@ -12,7 +12,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
name <triSurfaceFileName>; triSurface <triSurfaceFileName>;
fields (<fieldNames>); fields (<fieldNames>);

2
etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg
View File

@ -13,7 +13,7 @@ regionType sampledSurface;
sampledSurfaceDict sampledSurfaceDict
{ {
type triSurfaceMesh; type triSurfaceMesh;
surface $name; surface $triSurface;
source cells; source cells;
interpolate true; interpolate true;
} }

2
etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceVolumetricFlowRate
View File

@ -13,7 +13,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
name <triSurfaceFileName>; triSurface <triSurfaceFileName>;
fields (U); fields (U);

21
src/OpenFOAM/db/dictionary/dictionaryIO.C
View File

@ -528,6 +528,8 @@ bool Foam::readConfigFile
namedArgs[i].first() != "field" namedArgs[i].first() != "field"
&& namedArgs[i].first() != "fields" && namedArgs[i].first() != "fields"
&& namedArgs[i].first() != "objects" && namedArgs[i].first() != "objects"
&& namedArgs[i].first() != "funcName"
&& namedArgs[i].first() != "name"
) )
{ {
const Pair<word> dAk(dictAndKeyword(namedArgs[i].first())); const Pair<word> dAk(dictAndKeyword(namedArgs[i].first()));
@ -547,16 +549,21 @@ bool Foam::readConfigFile
} }
// Set the name of the entry to that specified by the optional // 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 // from the type and arguments
const word entryName word entryName(string::validate<word>(argString));
( forAll(namedArgs, i)
funcDict.lookupOrDefaultBackwardsCompatible {
if
( (
{"entryName", "funcName"}, namedArgs[i].first() == "funcName"
string::validate<word>(argString) || namedArgs[i].first() == "name"
) )
); {
entryName = namedArgs[i].second();
entryName.strip(" \n");
}
}
// Check for anything in the configuration that has not been set // Check for anything in the configuration that has not been set
List<Tuple2<word, string>> unsetArgs = unsetConfigEntries(funcDict); List<Tuple2<word, string>> unsetArgs = unsetConfigEntries(funcDict);

14
test/postProcessing/channel/system/controlDict
View File

@ -167,7 +167,7 @@ fieldsOperationsFunctions
#includeFunc uniform #includeFunc uniform
( (
fieldType=volScalarField, fieldType=volScalarField,
name=mag(smallU), field=mag(smallU),
dimensions=[0 1 -1 0 0 0 0], dimensions=[0 1 -1 0 0 0 0],
value=1e-16 value=1e-16
) )
@ -182,7 +182,7 @@ fieldsOperationsFunctions
#includeFunc uniform #includeFunc uniform
( (
fieldType=volScalarField, fieldType=volScalarField,
name=Ta, field=Ta,
dimensions=[0 0 0 1 0 0 0], dimensions=[0 0 0 1 0 0 0],
value=297 value=297
) )
@ -314,7 +314,7 @@ probesFunctions
#includeFunc uniform #includeFunc uniform
( (
fieldType=volScalarField, fieldType=volScalarField,
name=alpha.dummy, field=alpha.dummy,
dimensions=[0 0 0 0 0 0 0], dimensions=[0 0 0 0 0 0 0],
value=0.2 value=0.2
) )
@ -394,13 +394,13 @@ surfaceFieldValueFunctions
#includeFunc patchDifference(patch1=inlet, patch2=outlet, p) #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 #includeFunc triSurfaceDifference
( (

2
tutorials/lagrangian/denseParticleFoam/injectionChannel/system/controlDict
View File

@ -48,7 +48,7 @@ functions
{ {
#includeFunc patchFlowRate(patch=lowerInlet, cloud:massFlux) #includeFunc patchFlowRate(patch=lowerInlet, cloud:massFlux)
#includeFunc patchFlowRate(patch=upperInlet, 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) #includeFunc patchFlowRate(patch=outlet, cloud:massFlux)
} }

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

@ -63,14 +63,14 @@ functions
{ {
#includeFunc patchAverage #includeFunc patchAverage
( (
entryName=cylinderT, name=cylinderT,
region=fluid, region=fluid,
patch=fluid_to_solid, patch=fluid_to_solid,
field=T field=T
) )
#includeFunc patchAverage #includeFunc patchAverage
( (
entryName=inletU, name=inletU,
region=fluid, region=fluid,
patch=inlet, patch=inlet,
field=U field=U

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

@ -61,14 +61,14 @@ functions
{ {
#includeFunc patchAverage #includeFunc patchAverage
( (
entryName=cylinderT, name=cylinderT,
region=fluid, region=fluid,
patch=fluid_to_solid, patch=fluid_to_solid,
field=T field=T
) )
#includeFunc patchAverage #includeFunc patchAverage
( (
entryName=inletU, name=inletU,
region=fluid, region=fluid,
patch=inlet, patch=inlet,
field=U field=U

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

@ -61,7 +61,7 @@ functions
{ {
#includeFunc patchAverage #includeFunc patchAverage
( (
entryName=cylinderToil, name=cylinderToil,
region=fluid, region=fluid,
patch=fluid_to_solid, patch=fluid_to_solid,
field=T.oil field=T.oil
@ -69,7 +69,7 @@ functions
#includeFunc patchAverage #includeFunc patchAverage
( (
entryName=cylinderTwater, name=cylinderTwater,
region=fluid, region=fluid,
patch=fluid_to_solid, patch=fluid_to_solid,
field=T.water 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 " runApplication foamPostProcess -latestTime -region fluid -func "
graphCell graphCell
( (
entryName=graph, name=graph,
start=(3.4901 0 0), start=(3.4901 0 0),
end=(3.4901 0.0096 0), end=(3.4901 0.0096 0),
fields=(alpha.gas T.liquid T.gas) fields=(alpha.gas T.liquid T.gas)
@ -28,7 +28,7 @@ runApplication foamPostProcess -latestTime -region fluid -func "
runApplication -append foamPostProcess -region fluid -latestTime -func " runApplication -append foamPostProcess -region fluid -latestTime -func "
patchSurface patchSurface
( (
entryName=patchWallBoilingProperties, name=patchWallBoilingProperties,
patch=wall, patch=wall,
surfaceFormat=raw, surfaceFormat=raw,
interpolate=false, interpolate=false,

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

@ -60,9 +60,9 @@ maxDeltaT 0.005;
functions functions
{ {
#includeFunc wallHeatFlux(entryName=WHFliquid, writeFields=false, phase=liquid, region=fluid) #includeFunc wallHeatFlux(name=WHFliquid, writeFields=false, phase=liquid, region=fluid)
#includeFunc wallHeatFlux(entryName=WHFgas, writeFields=false, phase=gas, region=fluid) #includeFunc wallHeatFlux(name=WHFgas, writeFields=false, phase=gas, region=fluid)
#includeFunc wallHeatFlux(entryName=WHFsolid, writeFields=false, region=solid, log=yes) #includeFunc wallHeatFlux(name=WHFsolid, writeFields=false, region=solid, log=yes)
writeWallBoilingProperties writeWallBoilingProperties
{ {

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

@ -49,7 +49,7 @@ runTimeModifiable true;
functions functions
{ {
#includeFunc residuals(p_rgh) #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)
} }
// ************************************************************************* // // ************************************************************************* //

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

@ -52,7 +52,7 @@ functions
#includeFunc graphUniform #includeFunc graphUniform
( (
entryName=wallShearStressGraph, name=wallShearStressGraph,
start=(0.04075 0.00075 0), start=(0.04075 0.00075 0),
end=(3.04 0.00075 0), end=(3.04 0.00075 0),
nPoints=100, nPoints=100,
@ -62,7 +62,7 @@ functions
#includeFunc graphUniform #includeFunc graphUniform
( (
entryName=kGraph, name=kGraph,
start=(0.04075 0.05 0), start=(0.04075 0.05 0),
end=(3.04 0.05 0), end=(3.04 0.05 0),
nPoints=100, nPoints=100,

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

@ -82,9 +82,9 @@ functions
} }
#includeFunc patchFlowRate(patch=outlet1) #includeFunc patchFlowRate(patch=outlet1)
#includeFunc faceZoneFlowRate(name=fz1) #includeFunc faceZoneFlowRate(faceZone=fz1)
#includeFunc patchFlowRate(patch=outlet2) #includeFunc patchFlowRate(patch=outlet2)
#includeFunc faceZoneFlowRate(name=fz2) #includeFunc faceZoneFlowRate(faceZone=fz2)
} }
// ************************************************************************* // // ************************************************************************* //

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

@ -52,9 +52,9 @@ maxCo 0.5;
functions functions
{ {
#includeFunc patchFlowRate(entryName=inletFlowRate, patch=inlet) #includeFunc patchFlowRate(name=inletFlowRate, patch=inlet)
#includeFunc patchFlowRate(entryName=lowerOutletFlowRate, patch=lowerOutlet) #includeFunc patchFlowRate(name=lowerOutletFlowRate, patch=lowerOutlet)
#includeFunc patchFlowRate(entryName=upperOutletFlowRate, patch=upperOutlet) #includeFunc patchFlowRate(name=upperOutletFlowRate, patch=upperOutlet)
#includeFunc scalarTransport(s) #includeFunc scalarTransport(s)
#includeFunc reconstruct(phi) #includeFunc reconstruct(phi)
#includeFunc streamlinesPatch(patch=inlet, nPoints=100, U=reconstruct(phi)) #includeFunc streamlinesPatch(patch=inlet, nPoints=100, U=reconstruct(phi))

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

@ -53,7 +53,7 @@ functions
#includeFunc uniform #includeFunc uniform
( (
fieldType = volScalarField, fieldType = volScalarField,
name = half, field = half,
dimensions = [0 0 0 0 0 0 0], dimensions = [0 0 0 0 0 0 0],
value = 0.5 value = 0.5
) )
@ -64,7 +64,7 @@ functions
#includeFunc graphLayerAverage #includeFunc graphLayerAverage
( (
entryName = layerAverage, name = layerAverage,
patches = (bottomWall), patches = (bottomWall),
axis = y, axis = y,
symmetric = yes, symmetric = yes,

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

@ -57,7 +57,7 @@ functions
#includeFunc streamlinesSphere #includeFunc streamlinesSphere
( (
entryName=streamlines, name=streamlines,
centre=(4 0 0.7), centre=(4 0 0.7),
radius=1, radius=1,
nPoints=30, nPoints=30,
@ -66,7 +66,7 @@ functions
#includeFunc cutPlaneSurface #includeFunc cutPlaneSurface
( (
entryName=xNormal, name=xNormal,
point=(4 0 1), point=(4 0 1),
normal=(1 0 0), normal=(1 0 0),
fields=(p U) fields=(p U)
@ -74,13 +74,13 @@ functions
#includeFunc cutPlaneSurface #includeFunc cutPlaneSurface
( (
entryName=yNormal, name=yNormal,
point=(-5 0.02 1), point=(-5 0.02 1),
normal=(0 1 0), normal=(0 1 0),
fields=(p U) fields=(p U)
) )
#includeFunc patchSurface(entryName=car, patch=".*(body|Wheels)", p) #includeFunc patchSurface(name=car, patch=".*(body|Wheels)", p)
} }
// ************************************************************************* // // ************************************************************************* //

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

@ -53,7 +53,7 @@ functions
clouds clouds
{ {
type fvModel; type fvModel;
#includeModel clouds(entryName=fvModel) #includeModel clouds(name=fvModel)
} }
} }

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

@ -53,7 +53,7 @@ functions
clouds clouds
{ {
type fvModel; type fvModel;
#includeModel clouds(entryName=fvModel) #includeModel clouds(name=fvModel)
} }
} }

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

@ -52,8 +52,8 @@ maxCo 1.0;
functions functions
{ {
#includeFunc patchFlowRate(patch=inlet, entryName=inletFlowRate) #includeFunc patchFlowRate(name=inletFlowRate, patch=inlet)
#includeFunc patchFlowRate(patch=outlet, entryName=outletFlowRate) #includeFunc patchFlowRate(name=outletFlowRate, patch=outlet)
cartesianToCylindrical cartesianToCylindrical
{ {

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

@ -53,7 +53,7 @@ functions
clouds clouds
{ {
type fvModel; type fvModel;
#includeModel clouds(entryName=fvModel) #includeModel clouds(name=fvModel)
} }
} }

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

@ -52,8 +52,8 @@ maxCo 0.5;
functions functions
{ {
#includeFunc patchFlowRate(patch=inlet, entryName=inletFlowRate) #includeFunc patchFlowRate(name=inletFlowRate, patch=inlet)
#includeFunc patchFlowRate(patch=outlet, entryName=outletFlowRate) #includeFunc patchFlowRate(name=outletFlowRate, patch=outlet)
} }

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

@ -55,7 +55,7 @@ functions
{ {
#includeFunc streamlinesLine #includeFunc streamlinesLine
( (
entryName=streamlines, name=streamlines,
start=(-0.0205 0.001 0.00001), start=(-0.0205 0.001 0.00001),
end=(-0.0205 0.0251 0.00001), end=(-0.0205 0.0251 0.00001),
nPoints=10, nPoints=10,

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

@ -47,9 +47,9 @@ runTimeModifiable true;
functions functions
{ {
#includeFunc graphCell(entryName=lineA, start=(-0.0016 0 0), end=(-0.0016 0.0128 0), U) #includeFunc graphCell(name=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(name=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=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 functions
{ {
#includeFunc residuals(p, sigma) #includeFunc residuals(p, sigma)
#includeFunc graphCell(entryName=graph, start=(0 0 0), end=(0 1 0), U) #includeFunc graphCell(name=graph, start=(0 0 0), end=(0 1 0), U)
#includeFunc probes(entryName=probes, points=((0 1 0)), U) #includeFunc probes(name=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 probes1 foamPostProcess -func probes1 -latestTime
runApplication -s probes2 foamPostProcess -func probes2 -latestTime runApplication -s probes2 foamPostProcess -func probes2 -latestTime
runApplication -s patchFlowRate foamPostProcess -latestTime \ runApplication -s patchFlowRate foamPostProcess -latestTime \
-func "patchFlowRate(entryName=inletFlowRate,patch=inlet)" -latestTime -func "patchFlowRate(name=inletFlowRate,patch=inlet)" -latestTime
(cd validation && ./Allrun $*) (cd validation && ./Allrun $*)

2
tutorials/modules/multicomponentFluid/nc7h16/system/controlDict
View File

@ -56,7 +56,7 @@ DebugSwitches
functions functions
{ {
#includeFunc adjustTimeStepToChemistry #includeFunc adjustTimeStepToChemistry
#includeFunc probes(funcName=probe, points=((0 0 0)), T, p) #includeFunc probes(name=probe, points=((0 0 0)), T, p)
} }
// ************************************************************************* // // ************************************************************************* //

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

@ -56,7 +56,7 @@ functions
{ {
#includeFunc graphCell #includeFunc graphCell
( (
entryName=graph, name=graph,
start=(0.0101 0 0), start=(0.0101 0 0),
end=(0.0101 0.01905 0), end=(0.0101 0.01905 0),
fields=(alpha.gas) fields=(alpha.gas)

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

@ -60,7 +60,7 @@ functions
#includeFunc phaseForces(phase=water) #includeFunc phaseForces(phase=water)
#includeFunc graphUniform #includeFunc graphUniform
( (
entryName=graph, name=graph,
start=(0 0 0.89), start=(0 0 0.89),
end=(0.025 0 0.89), end=(0.025 0 0.89),
nPoints=100, nPoints=100,
@ -77,24 +77,24 @@ functions
#includeFunc populationBalanceSizeDistribution #includeFunc populationBalanceSizeDistribution
( (
name=probabilityDensity.injection,
populationBalance=bubbles, populationBalance=bubbles,
regionType=cellZone, regionType=cellZone,
name=injection, cellZone=injection,
functionType=volumeDensity, functionType=volumeDensity,
coordinateType=diameter, coordinateType=diameter,
normalise=yes, normalise=yes
entryName=probabilityDensity.injection
) )
#includeFunc populationBalanceSizeDistribution #includeFunc populationBalanceSizeDistribution
( (
name=probabilityDensity.outlet,
populationBalance=bubbles, populationBalance=bubbles,
regionType=cellZone, regionType=cellZone,
name=outlet, cellZone=outlet,
functionType=volumeDensity, functionType=volumeDensity,
coordinateType=diameter, coordinateType=diameter,
normalise=yes, normalise=yes
entryName=probabilityDensity.outlet
) )
} }

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

@ -57,7 +57,7 @@ functions
#includeFunc cellMin #includeFunc cellMin
( (
entryName=min, name=min,
alpha.liquid, alpha.liquid,
alpha.gas, alpha.gas,
p, p,
@ -70,7 +70,7 @@ functions
#includeFunc cellMax #includeFunc cellMax
( (
entryName=max, name=max,
alpha.liquid, alpha.liquid,
alpha.gas, alpha.gas,
p, p,
@ -83,7 +83,7 @@ functions
#includeFunc graphPatchCutLayerAverage #includeFunc graphPatchCutLayerAverage
( (
entryName=hydrofoilLowerPressure, name=hydrofoilLowerPressure,
patch=hydrofoilLower, patch=hydrofoilLower,
direction=(0.15 -0.016 0), direction=(0.15 -0.016 0),
nPoints=100, nPoints=100,
@ -92,7 +92,7 @@ functions
#includeFunc graphPatchCutLayerAverage #includeFunc graphPatchCutLayerAverage
( (
entryName=hydrofoilUpperPressure, name=hydrofoilUpperPressure,
patch=hydrofoilUpper, patch=hydrofoilUpper,
direction=(0.15 -0.016 0), direction=(0.15 -0.016 0),
nPoints=100, nPoints=100,

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

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

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

@ -57,46 +57,46 @@ functions
#includeFunc populationBalanceSizeDistribution #includeFunc populationBalanceSizeDistribution
( (
name=probabilityDensity.afterBend_1d,
populationBalance=agglomerates, populationBalance=agglomerates,
regionType=cellZone, regionType=cellZone,
name=afterBend_1d, cellZone=afterBend_1d,
functionType=volumeDensity, functionType=volumeDensity,
coordinateType=diameter, coordinateType=diameter,
normalise=yes, normalise=yes
entryName=probabilityDensity.afterBend_1d
) )
#includeFunc populationBalanceSizeDistribution #includeFunc populationBalanceSizeDistribution
( (
name=probabilityDensity.afterBend_5d,
populationBalance=agglomerates, populationBalance=agglomerates,
regionType=cellZone, regionType=cellZone,
name=afterBend_5d, cellZone=afterBend_5d,
functionType=volumeDensity, functionType=volumeDensity,
coordinateType=diameter, coordinateType=diameter,
normalise=yes, normalise=yes
entryName=probabilityDensity.afterBend_5d
) )
#includeFunc populationBalanceSizeDistribution #includeFunc populationBalanceSizeDistribution
( (
name=probabilityDensity.afterBend_9d,
populationBalance=agglomerates, populationBalance=agglomerates,
regionType=cellZone, regionType=cellZone,
name=afterBend_9d, cellZone=afterBend_9d,
functionType=volumeDensity, functionType=volumeDensity,
coordinateType=diameter, coordinateType=diameter,
normalise=yes, normalise=yes
entryName=probabilityDensity.afterBend_9d
) )
#includeFunc populationBalanceSizeDistribution #includeFunc populationBalanceSizeDistribution
( (
name=probabilityDensity.beforeBend_1d,
populationBalance=agglomerates, populationBalance=agglomerates,
regionType=cellZone, regionType=cellZone,
name=beforeBend_1d, cellZone=beforeBend_1d,
functionType=volumeDensity, functionType=volumeDensity,
coordinateType=diameter, coordinateType=diameter,
normalise=yes, normalise=yes
entryName=probabilityDensity.beforeBend_1d
) )
} }

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

@ -56,7 +56,7 @@ functions
{ {
#includeFunc graphCell #includeFunc graphCell
( (
entryName=graph, name=graph,
start=(0 0 1e-3), start=(0 0 1e-3),
end=(0.44 0 1e-3), end=(0.44 0 1e-3),
fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles) fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles)
@ -64,15 +64,15 @@ functions
#includeFunc populationBalanceSizeDistribution #includeFunc populationBalanceSizeDistribution
( (
name=numberDensity,
populationBalance=aggregates, populationBalance=aggregates,
regionType=cellZone, regionType=cellZone,
name=outlet, cellZone=outlet,
functionType=numberDensity, functionType=numberDensity,
coordinateType=projectedAreaDiameter, coordinateType=projectedAreaDiameter,
allCoordinates=yes, allCoordinates=yes,
normalise=yes, normalise=yes,
logTransform=yes, logTransform=yes
entryName=numberDensity
) )
#includeFunc writeObjects #includeFunc writeObjects

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

@ -56,7 +56,7 @@ functions
{ {
#includeFunc graphCell #includeFunc graphCell
( (
entryName=graph, name=graph,
start=(0 0 1e-3), start=(0 0 1e-3),
end=(0.44 0 1e-3), end=(0.44 0 1e-3),
fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles) fields=(TiCl4.vapour O2.vapour Cl2.vapour alpha.particles)
@ -64,15 +64,15 @@ functions
#includeFunc populationBalanceSizeDistribution #includeFunc populationBalanceSizeDistribution
( (
name=numberDensity,
populationBalance=aggregates, populationBalance=aggregates,
regionType=cellZone, regionType=cellZone,
name=outlet, cellZone=outlet,
functionType=numberDensity, functionType=numberDensity,
coordinateType=projectedAreaDiameter, coordinateType=projectedAreaDiameter,
allCoordinates=yes, allCoordinates=yes,
normalise=yes, normalise=yes,
logTransform=yes, logTransform=yes
entryName=numberDensity
) )
#includeFunc writeObjects #includeFunc writeObjects

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

@ -15,7 +15,7 @@ runApplication reconstructPar -latestTime
runApplication foamPostProcess -latestTime -func " runApplication foamPostProcess -latestTime -func "
graphCell graphCell
( (
entryName=graph, name=graph,
start=(3.4901 0 0), start=(3.4901 0 0),
end=(3.4901 0.0096 0), end=(3.4901 0.0096 0),
fields=(alpha.gas T.liquid T.gas d.gas) fields=(alpha.gas T.liquid T.gas d.gas)
@ -23,7 +23,7 @@ runApplication foamPostProcess -latestTime -func "
runApplication -append foamPostProcess -latestTime -func " runApplication -append foamPostProcess -latestTime -func "
patchSurface patchSurface
( (
entryName=patchWallBoilingProperties, name=patchWallBoilingProperties,
patch=wall, patch=wall,
surfaceFormat=raw, surfaceFormat=raw,
interpolate=false, interpolate=false,

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

@ -16,7 +16,7 @@ runApplication reconstructPar -latestTime
runApplication foamPostProcess -latestTime -func " runApplication foamPostProcess -latestTime -func "
graphCell graphCell
( (
entryName=graph, name=graph,
start=(3.4901 0 0), start=(3.4901 0 0),
end=(3.4901 0.0096 0), end=(3.4901 0.0096 0),
fields=(alpha.gas T.liquid T.gas d.gas) fields=(alpha.gas T.liquid T.gas d.gas)
@ -24,7 +24,7 @@ runApplication foamPostProcess -latestTime -func "
runApplication -append foamPostProcess -latestTime -func " runApplication -append foamPostProcess -latestTime -func "
patchSurface patchSurface
( (
entryName=patchWallBoilingProperties, name=patchWallBoilingProperties,
patch=wall, patch=wall,
surfaceFormat=raw, surfaceFormat=raw,
interpolate=false, interpolate=false,

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

@ -16,7 +16,7 @@ runApplication reconstructPar -latestTime
runApplication foamPostProcess -latestTime -func " runApplication foamPostProcess -latestTime -func "
graphCell graphCell
( (
entryName=graph, name=graph,
start=(3.4901 0 0), start=(3.4901 0 0),
end=(3.4901 0.0096 0), end=(3.4901 0.0096 0),
fields=(alpha.gas alpha.gas2 alpha.liquid T.liquid T.gas d.bubbles) 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 " runApplication -append foamPostProcess -latestTime -func "
patchSurface patchSurface
( (
entryName=patchWallBoilingProperties, name=patchWallBoilingProperties,
patch=wall, patch=wall,
surfaceFormat=raw, surfaceFormat=raw,
interpolate=false, interpolate=false,