From e947e4d301a1163f3524c93c4d64562431d68117 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 11 Jul 2019 19:44:29 +0100 Subject: [PATCH] tutorials: Updated to use the new dictionary "slash" syntax --- .../flameSpreadWaterSuppressionPanel/Allrun | 2 +- .../RAS/SandiaD_LTS/system/controlDict | 6 +- .../reactingFoam/RAS/membrane/0/CH4.orig | 16 ++-- .../reactingFoam/RAS/membrane/0/N2.orig | 16 ++-- .../reactingFoam/RAS/membrane/0/O2.orig | 16 ++-- .../reactingFoam/RAS/membrane/0/include | 1 + .../RAS/membrane/system/setFieldsDict | 12 +-- .../RAS/aerofoilNACA0012/system/blockMeshDict | 83 ++++++++++--------- .../rhoPimpleFoam/RAS/annularThermalMixer/0/T | 23 +++-- .../rhoPimpleFoam/RAS/annularThermalMixer/0/U | 21 +++-- .../RAS/annularThermalMixer/0/alphat | 23 ++++- .../RAS/annularThermalMixer/0/epsilon | 23 +++-- .../rhoPimpleFoam/RAS/annularThermalMixer/0/k | 23 +++-- .../RAS/annularThermalMixer/0/nut | 23 ++++- .../rhoPimpleFoam/RAS/annularThermalMixer/0/p | 23 ++++- .../constant/boundaryConditions | 11 +-- .../annularThermalMixer/constant/caseSettings | 1 + .../constant/dynamicMeshDict | 3 +- .../coolingSphere/system/topoSetDict | 3 +- .../simpleFoam/rotorDisk/system/blockMeshDict | 31 +++---- .../windAroundBuildings/system/blockMeshDict | 31 +++---- .../mixerVesselAMI/system/snappyHexMeshDict | 11 +-- .../RAS/wallBoiling1D_2phase/Allrun | 6 +- .../RAS/wallBoiling1D_3phase/Allrun | 6 +- .../RAS/wallBoiling/Allrun | 4 +- .../RAS/wallBoiling1D/Allrun | 6 +- .../RAS/wallBoilingIATE/Allrun | 4 +- .../RAS/wallBoilingPolyDisperse/Allrun | 4 +- 28 files changed, 258 insertions(+), 174 deletions(-) diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun index 580c1189c1..aa0ef5631f 100755 --- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun +++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun @@ -24,7 +24,7 @@ runApplication extrudeToRegionMesh -dict system/extrudeToRegionMeshDictPyr -over # change samplePatch in the boundary to coupled patch betwee region0 and # pyrolysis foamDictionary constant/filmRegion/polyMesh/boundary \ - -entry entry0.region0_to_filmRegion_coupledWall.samplePatch \ + -entry entry0/region0_to_filmRegion_coupledWall/samplePatch \ -set region0_to_pyrolysisRegion_coupledWall # create faceSets for inlet, outlet, sides for the Film diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict index 3589b85eea..b6a216ac7b 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict @@ -7,7 +7,7 @@ \*---------------------------------------------------------------------------*/ FoamFile { - version 2; + version 10; format ascii; class dictionary; location "system"; @@ -18,7 +18,7 @@ application reactingFoam; startFrom startTime; -startTime 0; +startTime 10; stopAt endTime; @@ -44,5 +44,7 @@ timePrecision 6; runTimeModifiable true; +FoamFile/version 0; + // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0/CH4.orig b/tutorials/combustion/reactingFoam/RAS/membrane/0/CH4.orig index 141b097957..d9ce7828c3 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/0/CH4.orig +++ b/tutorials/combustion/reactingFoam/RAS/membrane/0/CH4.orig @@ -26,24 +26,24 @@ boundaryField inletSleeve { type fixedValue; - value uniform $:sleeve.CH4; + value uniform $!sleeve/CH4; } inletPipe { type fixedValue; - value uniform $:pipe.CH4; + value uniform $!pipe/CH4; } outletSleeve { type inletOutlet; - inletValue uniform $:sleeve.CH4; - value uniform $:sleeve.CH4; + inletValue uniform $!sleeve/CH4; + value uniform $!sleeve/CH4; } outletPipe { type inletOutlet; - inletValue uniform $:pipe.CH4; - value uniform $:pipe.CH4; + inletValue uniform $!pipe/CH4; + value uniform $!pipe/CH4; } wall { @@ -55,7 +55,7 @@ boundaryField samplePatch membranePipe; c 0.1; input massFraction; - value uniform $:sleeve.CH4; + value uniform $!sleeve/CH4; } membranePipe { @@ -63,7 +63,7 @@ boundaryField samplePatch membraneSleeve; c 0.1; input massFraction; - value uniform $:pipe.CH4; + value uniform $!pipe/CH4; } } diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0/N2.orig b/tutorials/combustion/reactingFoam/RAS/membrane/0/N2.orig index c050137d8d..43975072bd 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/0/N2.orig +++ b/tutorials/combustion/reactingFoam/RAS/membrane/0/N2.orig @@ -26,24 +26,24 @@ boundaryField inletSleeve { type fixedValue; - value uniform $:sleeve.N2; + value uniform $!sleeve/N2; } inletPipe { type fixedValue; - value uniform $:pipe.N2; + value uniform $!pipe/N2; } outletSleeve { type inletOutlet; - inletValue uniform $:sleeve.N2; - value uniform $:sleeve.N2; + inletValue uniform $!sleeve/N2; + value uniform $!sleeve/N2; } outletPipe { type inletOutlet; - inletValue uniform $:pipe.N2; - value uniform $:pipe.N2; + inletValue uniform $!pipe/N2; + value uniform $!pipe/N2; } wall { @@ -52,12 +52,12 @@ boundaryField membraneSleeve { type semiPermeableBaffleMassFraction; - value uniform $:sleeve.N2; + value uniform $!sleeve/N2; } membranePipe { type semiPermeableBaffleMassFraction; - value uniform $:pipe.N2; + value uniform $!pipe/N2; } } diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0/O2.orig b/tutorials/combustion/reactingFoam/RAS/membrane/0/O2.orig index 857246d99c..27819ddd9d 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/0/O2.orig +++ b/tutorials/combustion/reactingFoam/RAS/membrane/0/O2.orig @@ -26,24 +26,24 @@ boundaryField inletSleeve { type fixedValue; - value uniform $:sleeve.O2; + value uniform $!sleeve/O2; } inletPipe { type fixedValue; - value uniform $:pipe.O2; + value uniform $!pipe/O2; } outletSleeve { type inletOutlet; - inletValue uniform $:sleeve.O2; - value uniform $:sleeve.O2; + inletValue uniform $!sleeve/O2; + value uniform $!sleeve/O2; } outletPipe { type inletOutlet; - inletValue uniform $:pipe.O2; - value uniform $:pipe.O2; + inletValue uniform $!pipe/O2; + value uniform $!pipe/O2; } wall { @@ -52,12 +52,12 @@ boundaryField membraneSleeve { type semiPermeableBaffleMassFraction; - value uniform $:sleeve.O2; + value uniform $!sleeve/O2; } membranePipe { type semiPermeableBaffleMassFraction; - value uniform $:pipe.O2; + value uniform $!pipe/O2; } } diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0/include b/tutorials/combustion/reactingFoam/RAS/membrane/0/include index edde41bc55..30ac059fc0 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/0/include +++ b/tutorials/combustion/reactingFoam/RAS/membrane/0/include @@ -14,6 +14,7 @@ FoamFile object include; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash; sleeve { diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict index 91242f47d4..3ab0ec99f0 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict +++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict @@ -19,9 +19,9 @@ FoamFile defaultFieldValues ( - volScalarFieldValue CH4 $:sleeve.CH4 - volScalarFieldValue N2 $:sleeve.N2 - volScalarFieldValue O2 $:sleeve.O2 + volScalarFieldValue CH4 $!sleeve/CH4 + volScalarFieldValue N2 $!sleeve/N2 + volScalarFieldValue O2 $!sleeve/O2 ); regions @@ -31,9 +31,9 @@ regions name pipe; fieldValues ( - volScalarFieldValue CH4 $:pipe.CH4 - volScalarFieldValue N2 $:pipe.N2 - volScalarFieldValue O2 $:pipe.O2 + volScalarFieldValue CH4 $!pipe/CH4 + volScalarFieldValue N2 $!pipe/N2 + volScalarFieldValue O2 $!pipe/O2 ); } ); diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict index e157f0728b..8ec817339a 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict @@ -13,6 +13,7 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash domain { @@ -56,82 +57,82 @@ geometry cylinder { type searchableCylinder; - 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 diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/T index 1ba11ce037..107118897a 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/T +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/T @@ -18,25 +18,36 @@ 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; } - staticWalls { $:wall.T; } - movingWalls { $staticWalls; } + outlet + { + $!outlet/T; + } + + staticWalls + { + $!wall/T; + } + + movingWalls + { + $staticWalls; + } #includeEtc "caseDicts/setConstraintTypes" } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/U index 43c89620d2..bed639111e 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/U +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/U @@ -26,18 +26,29 @@ 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; } - staticWalls { $:wall.U; } - movingWalls { $:movingWall.U; } + outlet + { + $!outlet/U; + } + + staticWalls + { + $!wall/U; + } + + movingWalls + { + $!movingWall/U; + } #includeEtc "caseDicts/setConstraintTypes" } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/alphat index 0c63fbc82a..9dd27ad3f9 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/alphat +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/alphat @@ -23,10 +23,25 @@ internalField uniform 0; boundaryField { - inlet { $:calculated.alphat; } - outlet { $:calculated.alphat; } - movingWalls { $:wall.alphat; } - staticWalls { $movingWalls; } + inlet + { + $!calculated/alphat; + } + + outlet + { + $!calculated/alphat; + } + + movingWalls + { + $!wall/alphat; + } + + staticWalls + { + $movingWalls; + } #includeEtc "caseDicts/setConstraintTypes" } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/epsilon index 75ce7e67fc..a6a2ffeeb2 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/epsilon +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/epsilon @@ -19,25 +19,36 @@ 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; } - staticWalls { $:wall.epsilon; } - movingWalls { $staticWalls; } + outlet + { + $!outlet/epsilon; + } + + staticWalls + { + $!wall/epsilon; + } + + movingWalls + { + $staticWalls; + } #includeEtc "caseDicts/setConstraintTypes" } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/k index 0775b1b6f3..0483d98248 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/k +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/k @@ -19,25 +19,36 @@ 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; } - staticWalls { $:wall.k; } - movingWalls { $staticWalls; } + outlet + { + $!outlet/k; + } + + staticWalls + { + $!wall/k; + } + + movingWalls + { + $staticWalls; + } #includeEtc "caseDicts/setConstraintTypes" } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/nut index 046830dfc0..eddb8775a7 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/nut +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/nut @@ -23,10 +23,25 @@ internalField uniform 0; boundaryField { - inlet { $:calculated.nut; } - outlet { $:calculated.nut; } - movingWalls { $:wall.nut; } - staticWalls { $movingWalls; } + inlet + { + $!calculated/nut; + } + + outlet + { + $!calculated/nut; + } + + movingWalls + { + $!wall/nut; + } + + staticWalls + { + $movingWalls; + } #includeEtc "caseDicts/setConstraintTypes" } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/p index 2e1b1448fa..192c6f810c 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/p +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0/p @@ -23,10 +23,25 @@ internalField uniform 1e5; boundaryField { - inlet { $:inlet.p; } - outlet { $:outlet.p; } - staticWalls { $:wall.p; } - movingWalls { $staticWalls; } + inlet + { + $!inlet/p; + } + + outlet + { + $!outlet/p; + } + + staticWalls + { + $!wall/p; + } + + movingWalls + { + $staticWalls; + } #includeEtc "caseDicts/setConstraintTypes" } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions index ae15b90787..b900e3a3ad 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions @@ -14,6 +14,7 @@ FoamFile object caseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash; calculated { @@ -54,21 +55,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 +95,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 diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings index d71f5ba5ed..d2ba45333e 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings @@ -14,6 +14,7 @@ FoamFile object caseSummary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash; innerInlet { diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict index 544b97e0ee..2ec06c56ed 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict @@ -14,6 +14,7 @@ FoamFile object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash; #include "${FOAM_CASE}/constant/caseSettings" @@ -27,6 +28,6 @@ solidBodyMotionFunction rotatingMotion; origin (0 0 0); axis (0 0 1); -omega $:meshMotionProperties.omega; +omega $!meshMotionProperties/omega; // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict index 198a1972d7..43e6fc32e3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict @@ -14,6 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash; #include "$FOAM_CASE/system/blockMeshDict" @@ -27,7 +28,7 @@ actions sourceInfo { centre (0 0 0); - radius $:geometry.sphere.radius; + radius $!geometry/sphere/radius; } } { diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict index afb2fc5874..130bc05d3f 100644 --- a/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict +++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict @@ -13,6 +13,7 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash; backgroundMesh { @@ -31,38 +32,30 @@ convertToMeters 1; vertices ( - ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMin) - ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMin) - ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMin) - ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMin) + ($!backgroundMesh/xMin $!backgroundMesh/yMin $!backgroundMesh/zMin) + ($!backgroundMesh/xMax $!backgroundMesh/yMin $!backgroundMesh/zMin) + ($!backgroundMesh/xMax $!backgroundMesh/yMax $!backgroundMesh/zMin) + ($!backgroundMesh/xMin $!backgroundMesh/yMax $!backgroundMesh/zMin) - ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMax) - ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMax) - ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMax) - ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMax) + ($!backgroundMesh/xMin $!backgroundMesh/yMin $!backgroundMesh/zMax) + ($!backgroundMesh/xMax $!backgroundMesh/yMin $!backgroundMesh/zMax) + ($!backgroundMesh/xMax $!backgroundMesh/yMax $!backgroundMesh/zMax) + ($!backgroundMesh/xMin $!backgroundMesh/yMax $!backgroundMesh/zMax) ); blocks ( hex (0 1 2 3 4 5 6 7) ( - $:backgroundMesh.xCells - $:backgroundMesh.yCells - $:backgroundMesh.zCells + $!backgroundMesh/xCells + $!backgroundMesh/yCells + $!backgroundMesh/zCells ) simpleGrading (1 1 1) ); -edges -( -); - boundary ( ); -mergePatchPairs -( -); - // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict index 179f8803af..8157d01648 100644 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict @@ -13,6 +13,7 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash; backgroundMesh { @@ -31,32 +32,28 @@ convertToMeters 1; vertices ( - ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMin) - ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMin) - ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMin) - ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMin) + ($!backgroundMesh/xMin $!backgroundMesh/yMin $!backgroundMesh/zMin) + ($!backgroundMesh/xMax $!backgroundMesh/yMin $!backgroundMesh/zMin) + ($!backgroundMesh/xMax $!backgroundMesh/yMax $!backgroundMesh/zMin) + ($!backgroundMesh/xMin $!backgroundMesh/yMax $!backgroundMesh/zMin) - ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMax) - ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMax) - ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMax) - ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMax) + ($!backgroundMesh/xMin $!backgroundMesh/yMin $!backgroundMesh/zMax) + ($!backgroundMesh/xMax $!backgroundMesh/yMin $!backgroundMesh/zMax) + ($!backgroundMesh/xMax $!backgroundMesh/yMax $!backgroundMesh/zMax) + ($!backgroundMesh/xMin $!backgroundMesh/yMax $!backgroundMesh/zMax) ); blocks ( hex (0 1 2 3 4 5 6 7) ( - $:backgroundMesh.xCells - $:backgroundMesh.yCells - $:backgroundMesh.zCells + $!backgroundMesh/xCells + $!backgroundMesh/yCells + $!backgroundMesh/zCells ) simpleGrading (1 1 1) ); -edges -( -); - boundary ( inlet @@ -99,8 +96,4 @@ boundary ); -mergePatchPairs -( -); - // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict index e4e7401349..5240ea0db3 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict @@ -13,6 +13,7 @@ FoamFile object snappyHexMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#inputSyntax slash; // Which of the steps to run castellatedMesh true; @@ -274,7 +275,7 @@ castellatedMeshControls level (1 1); patchInfo { - ${...vessel.patchInfo} + $../../vessel/patchInfo } } @@ -283,7 +284,7 @@ castellatedMeshControls level (1 1); patchInfo { - ${...vessel.patchInfo} + $../../vessel/patchInfo } } @@ -292,7 +293,7 @@ castellatedMeshControls level (1 1); patchInfo { - ${...vessel.patchInfo} + $../../vessel/patchInfo } } @@ -301,7 +302,7 @@ castellatedMeshControls level (1 1); patchInfo { - ${...vessel.patchInfo} + $../../vessel/patchInfo } } @@ -310,7 +311,7 @@ castellatedMeshControls level (1 1); patchInfo { - ${...vessel.patchInfo} + $../../vessel/patchInfo } } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun index e2b33f6cea..c9b62404e0 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun @@ -13,9 +13,9 @@ if ! isTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 - foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000' - foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000' - foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' + foamDictionary 0.5/T.liquid -entry boundaryField/wall2/q -set 'uniform 500000' + foamDictionary 0.5/T.liquid -entry boundaryField/wall1/q -set 'uniform 500000' + foamDictionary 0.5/U.liquid -entry boundaryField/inlet/type -set 'fixedValue' runApplication -a $application fi diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun index e2b33f6cea..c9b62404e0 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun @@ -13,9 +13,9 @@ if ! isTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 - foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000' - foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000' - foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' + foamDictionary 0.5/T.liquid -entry boundaryField/wall2/q -set 'uniform 500000' + foamDictionary 0.5/T.liquid -entry boundaryField/wall1/q -set 'uniform 500000' + foamDictionary 0.5/U.liquid -entry boundaryField/inlet/type -set 'fixedValue' runApplication -a $application fi diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun index d525aa4b1a..7011849787 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun @@ -13,8 +13,8 @@ if ! isTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 - foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5' - foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' + foamDictionary 0.5/T.liquid -entry boundaryField/wall2/q -set 'uniform 1e5' + foamDictionary 0.5/U.liquid -entry boundaryField/inlet/type -set 'fixedValue' runApplication -a $application fi diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun index e2b33f6cea..c9b62404e0 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun @@ -13,9 +13,9 @@ if ! isTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 - foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000' - foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000' - foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' + foamDictionary 0.5/T.liquid -entry boundaryField/wall2/q -set 'uniform 500000' + foamDictionary 0.5/T.liquid -entry boundaryField/wall1/q -set 'uniform 500000' + foamDictionary 0.5/U.liquid -entry boundaryField/inlet/type -set 'fixedValue' runApplication -a $application fi diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun index d525aa4b1a..7011849787 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun @@ -13,8 +13,8 @@ if ! isTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 - foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5' - foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' + foamDictionary 0.5/T.liquid -entry boundaryField/wall2/q -set 'uniform 1e5' + foamDictionary 0.5/U.liquid -entry boundaryField/inlet/type -set 'fixedValue' runApplication -a $application fi diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/Allrun index d525aa4b1a..7011849787 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/Allrun @@ -13,8 +13,8 @@ if ! isTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 - foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5' - foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' + foamDictionary 0.5/T.liquid -entry boundaryField/wall2/q -set 'uniform 1e5' + foamDictionary 0.5/U.liquid -entry boundaryField/inlet/type -set 'fixedValue' runApplication -a $application fi