TUT: use '/' dictionary scoping for variables and foamDictionary (#1073)

- leave windAroundBuildings blockMeshDict with older '.' syntax
  (to test compatibility)
This commit is contained in:
Mark Olesen
2023-08-17 12:10:40 +02:00
parent 886ba89ddb
commit 36f8542e01
32 changed files with 297 additions and 264 deletions

View File

@ -56,82 +56,82 @@ geometry
cylinder
{
type cylinder;
point1 ($:aerofoil.xUpper -1e3 0);
point2 ($:aerofoil.xUpper 1e3 0);
radius $:domain.zMax;
point1 ($/aerofoil/xUpper -1e3 0);
point2 ($/aerofoil/xUpper 1e3 0);
radius $/domain/zMax;
}
}
vertices
(
project ($aerofoil.xLower -0.1 $domain.zMin) (cylinder)
($aerofoil.xTrail -0.1 $domain.zMin)
($domain.xMax -0.1 $domain.zMin)
project ($/aerofoil/xLower -0.1 $/domain/zMin) (cylinder)
($/aerofoil/xTrail -0.1 $/domain/zMin)
($/domain/xMax -0.1 $/domain/zMin)
project ($domain.xMin -0.1 $aerofoil.zLead) (cylinder)
project ($aerofoil.xLead -0.1 $aerofoil.zLead) (aerofoil)
project ($aerofoil.xTrail -0.1 $aerofoil.zTrail) (aerofoil)
($domain.xMax -0.1 $aerofoil.zTrail)
project ($/domain/xMin -0.1 $/aerofoil/zLead) (cylinder)
project ($/aerofoil/xLead -0.1 $/aerofoil/zLead) (aerofoil)
project ($/aerofoil/xTrail -0.1 $/aerofoil/zTrail) (aerofoil)
($/domain/xMax -0.1 $/aerofoil/zTrail)
project ($aerofoil.xLower -0.1 $aerofoil.zLower) (aerofoil)
project ($aerofoil.xUpper -0.1 $aerofoil.zUpper) (aerofoil)
project ($/aerofoil/xLower -0.1 $/aerofoil/zLower) (aerofoil)
project ($/aerofoil/xUpper -0.1 $/aerofoil/zUpper) (aerofoil)
project ($aerofoil.xUpper -0.1 $domain.zMax) (aerofoil)
project ($aerofoil.xTrail -0.1 $domain.zMax) (aerofoil)
($domain.xMax -0.1 $domain.zMax)
project ($/aerofoil/xUpper -0.1 $/domain/zMax) (aerofoil)
project ($/aerofoil/xTrail -0.1 $/domain/zMax) (aerofoil)
($/domain/xMax -0.1 $/domain/zMax)
project ($aerofoil.xLower 0.1 $domain.zMin) (cylinder)
($aerofoil.xTrail 0.1 $domain.zMin)
($domain.xMax 0.1 $domain.zMin)
project ($/aerofoil/xLower 0.1 $/domain/zMin) (cylinder)
($/aerofoil/xTrail 0.1 $/domain/zMin)
($/domain/xMax 0.1 $/domain/zMin)
project ($domain.xMin 0.1 $aerofoil.zLead) (cylinder)
project ($aerofoil.xLead 0.1 $aerofoil.zLead) (aerofoil)
project ($aerofoil.xTrail 0.1 $aerofoil.zTrail) (aerofoil)
($domain.xMax 0.1 $aerofoil.zTrail)
project ($/domain/xMin 0.1 $/aerofoil/zLead) (cylinder)
project ($/aerofoil/xLead 0.1 $/aerofoil/zLead) (aerofoil)
project ($/aerofoil/xTrail 0.1 $/aerofoil/zTrail) (aerofoil)
($/domain/xMax 0.1 $/aerofoil/zTrail)
project ($aerofoil.xLower 0.1 $aerofoil.zLower) (aerofoil)
project ($aerofoil.xUpper 0.1 $aerofoil.zUpper) (aerofoil)
project ($/aerofoil/xLower 0.1 $/aerofoil/zLower) (aerofoil)
project ($/aerofoil/xUpper 0.1 $/aerofoil/zUpper) (aerofoil)
project ($aerofoil.xUpper 0.1 $domain.zMax) (aerofoil)
project ($aerofoil.xTrail 0.1 $domain.zMax) (aerofoil)
($domain.xMax 0.1 $domain.zMax)
project ($/aerofoil/xUpper 0.1 $/domain/zMax) (aerofoil)
project ($/aerofoil/xTrail 0.1 $/domain/zMax) (aerofoil)
($/domain/xMax 0.1 $/domain/zMax)
);
blocks
(
hex ( 7 4 16 19 0 3 15 12)
($:domain.xUCells 1 $:domain.zCells)
($/domain/xUCells 1 $/domain/zCells)
edgeGrading
(
$:domain.leadGrading $:domain.leadGrading $:domain.xUGrading $:domain.xUGrading
$/domain/leadGrading $/domain/leadGrading $/domain/xUGrading $/domain/xUGrading
1 1 1 1
$:domain.zGrading $:domain.zGrading $:domain.zGrading $:domain.zGrading
$/domain/zGrading $/domain/zGrading $/domain/zGrading $/domain/zGrading
)
hex ( 5 7 19 17 1 0 12 13)
($:domain.xMCells 1 $:domain.zCells)
simpleGrading (1 1 $:domain.zGrading)
($/domain/xMCells 1 $/domain/zCells)
simpleGrading (1 1 $/domain/zGrading)
hex ( 17 18 6 5 13 14 2 1)
($:domain.xDCells 1 $:domain.zCells)
simpleGrading ($:domain.xDGrading 1 $:domain.zGrading)
($/domain/xDCells 1 $/domain/zCells)
simpleGrading ($/domain/xDGrading 1 $/domain/zGrading)
hex ( 20 16 4 8 21 15 3 9)
($:domain.xUCells 1 $:domain.zCells)
($/domain/xUCells 1 $/domain/zCells)
edgeGrading
(
$:domain.leadGrading $:domain.leadGrading $:domain.xUGrading $:domain.xUGrading
$/domain/leadGrading $/domain/leadGrading $/domain/xUGrading $/domain/xUGrading
1 1 1 1
$:domain.zGrading $:domain.zGrading $:domain.zGrading $:domain.zGrading
$/domain/zGrading $/domain/zGrading $/domain/zGrading $/domain/zGrading
)
hex ( 17 20 8 5 22 21 9 10)
($:domain.xMCells 1 $:domain.zCells)
simpleGrading (1 1 $:domain.zGrading)
($/domain/xMCells 1 $/domain/zCells)
simpleGrading (1 1 $/domain/zGrading)
hex ( 5 6 18 17 10 11 23 22)
($:domain.xDCells 1 $:domain.zCells)
simpleGrading ($:domain.xDGrading 1 $:domain.zGrading)
($/domain/xDCells 1 $/domain/zCells)
simpleGrading ($/domain/xDGrading 1 $/domain/zGrading)
);
edges
@ -223,4 +223,7 @@ boundary
);
// Cleanup
#remove ( domain aerofoil )
// ************************************************************************* //

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -18,30 +18,30 @@ FoamFile
dimensions [0 0 0 1 0 0 0];
internalField uniform $:outerInlet.T;
internalField uniform $/outerInlet/T;
boundaryField
{
innerInlet
{
type fixedValue;
value uniform $:innerInlet.T;
value uniform $/innerInlet/T;
}
outerInlet
{
type fixedValue;
value uniform $:outerInlet.T;
value uniform $/outerInlet/T;
}
outlet
{
$:outlet.T;
$/outlet/T;
}
staticWalls
{
$:wall.T;
$/wall/T;
}
movingWalls

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -25,28 +25,28 @@ boundaryField
innerInlet
{
type fixedValue;
value uniform $:innerInlet.U;
value uniform $/innerInlet/U;
}
outerInlet
{
type fixedValue;
value uniform $:outerInlet.U;
value uniform $/outerInlet/U;
}
outlet
{
$:outlet.U;
$/outlet/U;
}
staticWalls
{
$:wall.U;
$/wall/U;
}
movingWalls
{
$:movingWall.U;
$/movingWall/U;
}
#includeEtc "caseDicts/setConstraintTypes"

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -24,17 +24,17 @@ boundaryField
{
inlet
{
$:calculated.alphat;
$/calculated/alphat;
}
outlet
{
$:calculated.alphat;
$/calculated/alphat;
}
movingWalls
{
$:wall.alphat;
$/wall/alphat;
}
staticWalls

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -19,30 +19,30 @@ FoamFile
dimensions [0 2 -3 0 0 0 0];
internalField uniform $:innerInlet.epsilon;
internalField uniform $/innerInlet/epsilon;
boundaryField
{
innerInlet
{
type fixedValue;
value uniform $:innerInlet.epsilon;
value uniform $/innerInlet/epsilon;
}
outerInlet
{
type fixedValue;
value uniform $:outerInlet.epsilon;
value uniform $/outerInlet/epsilon;
}
outlet
{
$:outlet.epsilon;
$/outlet/epsilon;
}
staticWalls
{
$:wall.epsilon;
$/wall/epsilon;
}
movingWalls

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -18,30 +18,30 @@ FoamFile
dimensions [0 2 -2 0 0 0 0];
internalField uniform $:innerInlet.k;
internalField uniform $/innerInlet/k;
boundaryField
{
innerInlet
{
type fixedValue;
value uniform $:innerInlet.k;
value uniform $/innerInlet/k;
}
outerInlet
{
type fixedValue;
value uniform $:outerInlet.k;
value uniform $/outerInlet/k;
}
outlet
{
$:outlet.k;
$/outlet/k;
}
staticWalls
{
$:wall.k;
$/wall/k;
}
movingWalls

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -24,17 +24,17 @@ boundaryField
{
inlet
{
$:calculated.nut;
$/calculated/nut;
}
outlet
{
$:calculated.nut;
$/calculated/nut;
}
movingWalls
{
$:wall.nut;
$/wall/nut;
}
staticWalls

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -24,17 +24,17 @@ boundaryField
{
inlet
{
$:inlet.p;
$/inlet/p;
}
outlet
{
$:outlet.p;
$/outlet/p;
}
staticWalls
{
$:wall.p;
$/wall/p;
}
movingWalls

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -54,21 +54,21 @@ outlet
T
{
type inletOutlet;
inletValue uniform $:outerInlet.T;
inletValue uniform $/outerInlet/T;
value $inletValue;
}
k
{
type inletOutlet;
inletValue uniform $:innerInlet.k;
inletValue uniform $/innerInlet/k;
value $inletValue;
}
epsilon
{
type inletOutlet;
inletValue uniform $:innerInlet.epsilon;
inletValue uniform $/innerInlet/epsilon;
value $inletValue;
}
}
@ -94,13 +94,13 @@ wall
k
{
type kqRWallFunction;
value uniform $:innerInlet.k;
value uniform $/innerInlet/k;
}
epsilon
{
type epsilonWallFunction;
value uniform $:innerInlet.epsilon;
value uniform $/innerInlet/epsilon;
}
nut

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -26,7 +26,10 @@ solidBodyMotionFunction rotatingMotion;
origin (0 0 0);
axis (0 0 1);
omega $:meshMotionProperties.omega;
omega $/meshMotionProperties/omega;
// Cleanup
#remove ( meshMotionProperties )
// ************************************************************************* //

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2306 |
| \\ / O peration | Version: v2312 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -56,82 +56,82 @@ geometry
cylinder
{
type cylinder;
point1 ($:aerofoil.xUpper -1e3 0);
point2 ($:aerofoil.xUpper 1e3 0);
radius $:domain.zMax;
point1 ($/aerofoil/xUpper -1e3 0);
point2 ($/aerofoil/xUpper 1e3 0);
radius $/domain/zMax;
}
}
vertices
(
project ($aerofoil.xLower -0.1 $domain.zMin) (cylinder)
($aerofoil.xTrail -0.1 $domain.zMin)
($domain.xMax -0.1 $domain.zMin)
project ($/aerofoil/xLower -0.1 $/domain/zMin) (cylinder)
($/aerofoil/xTrail -0.1 $/domain/zMin)
($/domain/xMax -0.1 $/domain/zMin)
project ($domain.xMin -0.1 $aerofoil.zLead) (cylinder)
project ($aerofoil.xLead -0.1 $aerofoil.zLead) (aerofoil)
project ($aerofoil.xTrail -0.1 $aerofoil.zTrail) (aerofoil)
($domain.xMax -0.1 $aerofoil.zTrail)
project ($/domain/xMin -0.1 $/aerofoil/zLead) (cylinder)
project ($/aerofoil/xLead -0.1 $/aerofoil/zLead) (aerofoil)
project ($/aerofoil/xTrail -0.1 $/aerofoil/zTrail) (aerofoil)
($/domain/xMax -0.1 $/aerofoil/zTrail)
project ($aerofoil.xLower -0.1 $aerofoil.zLower) (aerofoil)
project ($aerofoil.xUpper -0.1 $aerofoil.zUpper) (aerofoil)
project ($/aerofoil/xLower -0.1 $/aerofoil/zLower) (aerofoil)
project ($/aerofoil/xUpper -0.1 $/aerofoil/zUpper) (aerofoil)
project ($aerofoil.xUpper -0.1 $domain.zMax) (aerofoil)
project ($aerofoil.xTrail -0.1 $domain.zMax) (aerofoil)
($domain.xMax -0.1 $domain.zMax)
project ($/aerofoil/xUpper -0.1 $/domain/zMax) (aerofoil)
project ($/aerofoil/xTrail -0.1 $/domain/zMax) (aerofoil)
($/domain/xMax -0.1 $/domain/zMax)
project ($aerofoil.xLower 0.1 $domain.zMin) (cylinder)
($aerofoil.xTrail 0.1 $domain.zMin)
($domain.xMax 0.1 $domain.zMin)
project ($/aerofoil/xLower 0.1 $/domain/zMin) (cylinder)
($/aerofoil/xTrail 0.1 $/domain/zMin)
($/domain/xMax 0.1 $/domain/zMin)
project ($domain.xMin 0.1 $aerofoil.zLead) (cylinder)
project ($aerofoil.xLead 0.1 $aerofoil.zLead) (aerofoil)
project ($aerofoil.xTrail 0.1 $aerofoil.zTrail) (aerofoil)
($domain.xMax 0.1 $aerofoil.zTrail)
project ($/domain/xMin 0.1 $/aerofoil/zLead) (cylinder)
project ($/aerofoil/xLead 0.1 $/aerofoil/zLead) (aerofoil)
project ($/aerofoil/xTrail 0.1 $/aerofoil/zTrail) (aerofoil)
($/domain/xMax 0.1 $/aerofoil/zTrail)
project ($aerofoil.xLower 0.1 $aerofoil.zLower) (aerofoil)
project ($aerofoil.xUpper 0.1 $aerofoil.zUpper) (aerofoil)
project ($/aerofoil/xLower 0.1 $/aerofoil/zLower) (aerofoil)
project ($/aerofoil/xUpper 0.1 $/aerofoil/zUpper) (aerofoil)
project ($aerofoil.xUpper 0.1 $domain.zMax) (aerofoil)
project ($aerofoil.xTrail 0.1 $domain.zMax) (aerofoil)
($domain.xMax 0.1 $domain.zMax)
project ($/aerofoil/xUpper 0.1 $/domain/zMax) (aerofoil)
project ($/aerofoil/xTrail 0.1 $/domain/zMax) (aerofoil)
($/domain/xMax 0.1 $/domain/zMax)
);
blocks
(
hex ( 7 4 16 19 0 3 15 12)
($:domain.xUCells 1 $:domain.zCells)
($/domain/xUCells 1 $/domain/zCells)
edgeGrading
(
$:domain.leadGrading $:domain.leadGrading $:domain.xUGrading $:domain.xUGrading
$/domain/leadGrading $/domain/leadGrading $/domain/xUGrading $/domain/xUGrading
1 1 1 1
$:domain.zGrading $:domain.zGrading $:domain.zGrading $:domain.zGrading
$/domain/zGrading $/domain/zGrading $/domain/zGrading $/domain/zGrading
)
hex ( 5 7 19 17 1 0 12 13)
($:domain.xMCells 1 $:domain.zCells)
simpleGrading (1 1 $:domain.zGrading)
($/domain/xMCells 1 $/domain/zCells)
simpleGrading (1 1 $/domain/zGrading)
hex ( 17 18 6 5 13 14 2 1)
($:domain.xDCells 1 $:domain.zCells)
simpleGrading ($:domain.xDGrading 1 $:domain.zGrading)
($/domain/xDCells 1 $/domain/zCells)
simpleGrading ($/domain/xDGrading 1 $/domain/zGrading)
hex ( 20 16 4 8 21 15 3 9)
($:domain.xUCells 1 $:domain.zCells)
($/domain/xUCells 1 $/domain/zCells)
edgeGrading
(
$:domain.leadGrading $:domain.leadGrading $:domain.xUGrading $:domain.xUGrading
$/domain/leadGrading $/domain/leadGrading $/domain/xUGrading $/domain/xUGrading
1 1 1 1
$:domain.zGrading $:domain.zGrading $:domain.zGrading $:domain.zGrading
$/domain/zGrading $/domain/zGrading $/domain/zGrading $/domain/zGrading
)
hex ( 17 20 8 5 22 21 9 10)
($:domain.xMCells 1 $:domain.zCells)
simpleGrading (1 1 $:domain.zGrading)
($/domain/xMCells 1 $/domain/zCells)
simpleGrading (1 1 $/domain/zGrading)
hex ( 5 6 18 17 10 11 23 22)
($:domain.xDCells 1 $:domain.zCells)
simpleGrading ($:domain.xDGrading 1 $:domain.zGrading)
($/domain/xDCells 1 $/domain/zCells)
simpleGrading ($/domain/xDGrading 1 $/domain/zGrading)
);
edges
@ -222,5 +222,7 @@ boundary
}
);
// Cleanup
#remove ( domain aerofoil )
// ************************************************************************* //

View File

@ -17,30 +17,30 @@ runApplication decomposePar
runParallel $(getApplication)
#- Run with processorAgglomerator
foamDictionary -entry solvers.p.processorAgglomerator -set 'masterCoarsest' system/fvSolution
foamDictionary -entry solvers/p/processorAgglomerator -set masterCoarsest system/fvSolution
runParallel -s masterCoarsest $(getApplication)
#- Run with processorAgglomerator+nCellsInMasterLevel
foamDictionary -entry solvers.p.nCellsInMasterLevel -set '1' system/fvSolution
foamDictionary -entry solvers/p/nCellsInMasterLevel -set 1 system/fvSolution
runParallel -s nCellsInMasterLevel $(getApplication)
#- Run with processorAgglomerator - multiple masters
foamDictionary -entry solvers.p.nMasters -set '2' system/fvSolution
foamDictionary -entry solvers/p/nMasters -set 2 system/fvSolution
runParallel -s masterCoarsest2 $(getApplication)
#- Run with processorAgglomerator
foamDictionary -entry solvers.p.processorAgglomerator -set 'procFaces' system/fvSolution
foamDictionary -entry solvers.p.nAgglomeratingCells -set 100 system/fvSolution
foamDictionary -entry solvers/p/processorAgglomerator -set procFaces system/fvSolution
foamDictionary -entry solvers/p/nAgglomeratingCells -set 100 system/fvSolution
runParallel -s procFaces $(getApplication)
foamDictionary -entry solvers.p.nAgglomeratingCells -remove system/fvSolution
foamDictionary -entry solvers/p/nAgglomeratingCells -remove system/fvSolution
#- Run with processorAgglomerator
foamDictionary -entry solvers.p.processorAgglomerator -set 'eager' system/fvSolution
foamDictionary -entry solvers/p/processorAgglomerator -set eager system/fvSolution
runParallel -s eager $(getApplication)
#- Run with processorAgglomerator
foamDictionary -entry solvers.p.processorAgglomerator -set 'manual' system/fvSolution
foamDictionary -entry solvers.p.processorAgglomeration -set '((9 ((0 1 2 3)(4 5 6 7))))' system/fvSolution
foamDictionary -entry solvers/p/processorAgglomerator -set manual system/fvSolution
foamDictionary -entry solvers/p/processorAgglomeration -set '((9 ((0 1 2 3)(4 5 6 7))))' system/fvSolution
runParallel -s manual $(getApplication)
#------------------------------------------------------------------------------