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

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

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

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

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

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

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

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

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

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

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

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

@ -53,7 +53,7 @@ functions
clouds
{
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
{
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
{
#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
{

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

@ -53,7 +53,7 @@ functions
clouds
{
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
{
#includeFunc patchFlowRate(patch=inlet, entryName=inletFlowRate)
#includeFunc patchFlowRate(patch=outlet, entryName=outletFlowRate)
#includeFunc patchFlowRate(name=inletFlowRate, patch=inlet)
#includeFunc patchFlowRate(name=outletFlowRate, patch=outlet)
}

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

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

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

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

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

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

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(entryName=inletFlowRate,patch=inlet)" -latestTime
-func "patchFlowRate(name=inletFlowRate,patch=inlet)" -latestTime
(cd validation && ./Allrun $*)