From 6c8732df5b38da3252e3d132b53519b0d187e485 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 23 Jul 2020 20:36:51 +0100 Subject: [PATCH] dictionary: Set the default scoping syntax to 'slash' The new optional 'slash' scoping syntax is now the default and provides a more intuitive and flexible syntax than the previous 'dot' syntax, corresponding to the common directory/file access syntax used in UNIX, providing support for reading entries from other dictionary files. In the 'slash' syntax '/' is the scope operator '../' is the parent dictionary scope operator '!' is the top-level dictionary scope operator Examples: internalField 3.4; active { type fixedValue; value.air $internalField; } inactive { type anotherFixedValue; value $../active/value.air; anotherValue $!active/value.air; sub { value $../../active/value.air; anotherValue $!active/value.air; } } "U.*" { solver GAMG; } e.air { $U.air; } external { value $testSlashDict2!active/value.air; } active2 { $testSlashDict2!active; } If there is a part of the keyword before the '!' then this is taken to be the file name of the dictionary from which the entry will be looked-up using the part of the keyword after the '!'. For example given a file testSlashDict containing internalField 5.6; active { type fixedValue; value.air $internalField; } entries from it can be read directly from another file, e.g. external { value $testSlashDict2!active/value.air; } active2 { $testSlashDict2!active; } which expands to external { value 5.6; } active2 { type fixedValue; value.air 5.6; } These examples are provided in applications/test/dictionary. The the default syntax can be changed from 'slash' to 'dot' in etc/controlDict to revert to the previous behaviour: OptimisationSwitches { . . . // Default dictionary scoping syntax inputSyntax slash; // Change to dot for previous behaviour } or within a specific dictionary by adding the entry See applications/test/dictionary/testDotDict. --- etc/controlDict | 2 +- etc/templates/axisymmetricJet/system/blockMeshDict | 1 - etc/templates/closedVolume/system/blockMeshDict | 1 - .../closedVolumeRotating/system/blockMeshDict | 1 - .../compressibleInflowOutflow/system/blockMeshDict | 1 - etc/templates/inflowOutflow/system/blockMeshDict | 1 - .../inflowOutflowRotating/system/blockMeshDict | 1 - etc/templates/singleFluidCHT/system/blockMeshDict | 1 - .../inputSyntaxEntry/inputSyntaxEntry.C | 4 ++-- .../inputSyntaxEntry/inputSyntaxEntry.H | 11 ++++++----- tutorials/combustion/coldEngineFoam/freePiston/0/T | 1 - tutorials/combustion/coldEngineFoam/freePiston/0/U | 1 - .../combustion/coldEngineFoam/freePiston/0/air | 1 - .../combustion/coldEngineFoam/freePiston/0/alphat | 1 - .../combustion/coldEngineFoam/freePiston/0/epsilon | 1 - .../freePiston/0/include/boundaryConditions | 1 - .../freePiston/0/include/caseSettings | 1 - tutorials/combustion/coldEngineFoam/freePiston/0/k | 1 - .../combustion/coldEngineFoam/freePiston/0/nut | 1 - tutorials/combustion/coldEngineFoam/freePiston/0/p | 1 - .../combustion/reactingFoam/RAS/membrane/0/include | 1 - .../RAS/aerofoilNACA0012/system/blockMeshDict | 1 - .../constant/boundaryConditions | 1 - .../RAS/annularThermalMixer/constant/caseSettings | 1 - .../annularThermalMixer/constant/dynamicMeshDict | 1 - .../aerofoilNACA0012/system/blockMeshDict | 1 - .../coolingSphere/system/topoSetDict | 1 - .../simpleFoam/rotorDisk/system/blockMeshDict | 1 - .../windAroundBuildings/system/blockMeshDict | 1 - .../RAS/mixerVesselAMI/system/snappyHexMeshDict | 1 - .../RAS/planingHullW3/system/blockMeshDict.1 | 1 - .../RAS/planingHullW3/system/blockMeshDict.2 | 1 - .../RAS/bubblePipe/system/blockMeshDict | 14 +++++++------- .../RAS/wallBoiling/system/blockMeshDict | 14 +++++++------- .../RAS/wallBoilingIATE/system/blockMeshDict | 14 +++++++------- .../wallBoilingPolydisperse/system/blockMeshDict | 14 +++++++------- .../system/blockMeshDict | 14 +++++++------- 37 files changed, 44 insertions(+), 72 deletions(-) diff --git a/etc/controlDict b/etc/controlDict index 27e849ddbf..138c6be2f0 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -81,7 +81,7 @@ OptimisationSwitches stopAtWriteNowSignal -1; // Default dictionary scoping syntax - inputSyntax dot; + inputSyntax slash; } diff --git a/etc/templates/axisymmetricJet/system/blockMeshDict b/etc/templates/axisymmetricJet/system/blockMeshDict index 37ad19905b..fe4eac0143 100644 --- a/etc/templates/axisymmetricJet/system/blockMeshDict +++ b/etc/templates/axisymmetricJet/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/etc/templates/closedVolume/system/blockMeshDict b/etc/templates/closedVolume/system/blockMeshDict index c43d32a188..e2bf5b3933 100644 --- a/etc/templates/closedVolume/system/blockMeshDict +++ b/etc/templates/closedVolume/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/etc/templates/closedVolumeRotating/system/blockMeshDict b/etc/templates/closedVolumeRotating/system/blockMeshDict index 12b4eab36a..9a839eed32 100644 --- a/etc/templates/closedVolumeRotating/system/blockMeshDict +++ b/etc/templates/closedVolumeRotating/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; // Example configuration: // - Cylindrical mesh along z-axis (0 < z < 10) diff --git a/etc/templates/compressibleInflowOutflow/system/blockMeshDict b/etc/templates/compressibleInflowOutflow/system/blockMeshDict index a3f38f06cb..6e43996cfc 100644 --- a/etc/templates/compressibleInflowOutflow/system/blockMeshDict +++ b/etc/templates/compressibleInflowOutflow/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/etc/templates/inflowOutflow/system/blockMeshDict b/etc/templates/inflowOutflow/system/blockMeshDict index a3f38f06cb..6e43996cfc 100644 --- a/etc/templates/inflowOutflow/system/blockMeshDict +++ b/etc/templates/inflowOutflow/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/etc/templates/inflowOutflowRotating/system/blockMeshDict b/etc/templates/inflowOutflowRotating/system/blockMeshDict index 20a4c8db67..24f4302420 100644 --- a/etc/templates/inflowOutflowRotating/system/blockMeshDict +++ b/etc/templates/inflowOutflowRotating/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; // Example configuration: // - Cylindrical mesh along z-axis (0 < z < 10) diff --git a/etc/templates/singleFluidCHT/system/blockMeshDict b/etc/templates/singleFluidCHT/system/blockMeshDict index a3f38f06cb..6e43996cfc 100644 --- a/etc/templates/singleFluidCHT/system/blockMeshDict +++ b/etc/templates/singleFluidCHT/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.C index 8e37a52815..e7b1ae6f1f 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ Foam::functionEntries::inputSyntaxEntry::inputSyntax "inputSyntax" ) ) - : DOT + : SLASH ); // Initialise the current dictionary syntax to the default diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.H index 9b03bc275b..b17771e5bc 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.H +++ b/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,12 +35,13 @@ Description The possible input syntax: - \par slash use '/' as the scope operator '../' to go to the parent dictionary - and '!' to go to the top-level dictionary + '!' to go to the top-level dictionary + - \par dot use '.' as the scope operator '..' to go to the parent dictionary - and ':' to go to the top-level dictionary + ':' to go to the top-level dictionary - The default dictionary syntax is \c dot but can be changed to \c slash in + The default dictionary syntax is \c slash but can be changed to \c dot in etc/controlDict \verbatim OptimisationSwitches @@ -48,7 +49,7 @@ Description . . . - inputSyntax slash; + inputSyntax dot; } \endverbatim diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/T b/tutorials/combustion/coldEngineFoam/freePiston/0/T index c3a471c589..cad964a14f 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/T +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/T @@ -14,7 +14,6 @@ FoamFile object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; dimensions [0 0 0 1 0 0 0]; diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/U b/tutorials/combustion/coldEngineFoam/freePiston/0/U index f9ee829058..708290c7ef 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/U +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/U @@ -14,7 +14,6 @@ FoamFile object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; dimensions [0 1 -1 0 0 0 0]; diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/air b/tutorials/combustion/coldEngineFoam/freePiston/0/air index 1a8fd32459..4bb4b3efd6 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/air +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/air @@ -14,7 +14,6 @@ FoamFile object air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; dimensions [0 0 0 0 0 0 0]; diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/alphat b/tutorials/combustion/coldEngineFoam/freePiston/0/alphat index 38007571c2..c110525672 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/alphat +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/alphat @@ -14,7 +14,6 @@ FoamFile object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; dimensions [1 -1 -1 0 0 0 0]; diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon b/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon index 07cf54cd41..e6a4b2f2bf 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon @@ -14,7 +14,6 @@ FoamFile object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; dimensions [0 2 -3 0 0 0 0]; diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions b/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions index bfc8bb7048..b0355ce95c 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions @@ -13,7 +13,6 @@ FoamFile object boundaryConditions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; wall { diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings b/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings index dc11a7de3e..3d77f0d33a 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings @@ -13,7 +13,6 @@ FoamFile object caseSettings; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; internalField { diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/k b/tutorials/combustion/coldEngineFoam/freePiston/0/k index 7ca0227b8e..6d7942b4f2 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/k +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/k @@ -14,7 +14,6 @@ FoamFile object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; dimensions [0 2 -2 0 0 0 0]; diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/nut b/tutorials/combustion/coldEngineFoam/freePiston/0/nut index c96bdc6f11..e6d24e99a7 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/nut +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/nut @@ -14,7 +14,6 @@ FoamFile object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; dimensions [0 2 -1 0 0 0 0]; diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/p b/tutorials/combustion/coldEngineFoam/freePiston/0/p index 7b0f0886a8..98bcc3fde7 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/0/p +++ b/tutorials/combustion/coldEngineFoam/freePiston/0/p @@ -14,7 +14,6 @@ FoamFile object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; dimensions [1 -1 -2 0 0 0 0]; diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0/include b/tutorials/combustion/reactingFoam/RAS/membrane/0/include index 30ac059fc0..edde41bc55 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/0/include +++ b/tutorials/combustion/reactingFoam/RAS/membrane/0/include @@ -14,7 +14,6 @@ FoamFile object include; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; sleeve { diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict index 8ec817339a..16ef7811c1 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash domain { diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions index b900e3a3ad..134c7a9189 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions @@ -14,7 +14,6 @@ FoamFile object caseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; calculated { diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings index d2ba45333e..d71f5ba5ed 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings @@ -14,7 +14,6 @@ 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 2ec06c56ed..74a5583c61 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict @@ -14,7 +14,6 @@ FoamFile object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; #include "${FOAM_CASE}/constant/caseSettings" diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict index 87bd355f51..3db4bc3982 100644 --- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict +++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash domain { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict index 43e6fc32e3..6b9b5d1f8a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict @@ -14,7 +14,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; #include "$FOAM_CASE/system/blockMeshDict" diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict index 130bc05d3f..5c3b8ff26b 100644 --- a/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict +++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict index 8157d01648..bd33b4022c 100644 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict index f16611ca13..686a860b44 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict @@ -13,7 +13,6 @@ FoamFile object snappyHexMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; // Which of the steps to run castellatedMesh true; diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/blockMeshDict.1 b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/blockMeshDict.1 index 73c279f2f6..f9719e1a0d 100644 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/blockMeshDict.1 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/blockMeshDict.1 @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/blockMeshDict.2 b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/blockMeshDict.2 index c977348e23..deff2c17a8 100644 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/blockMeshDict.2 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/blockMeshDict.2 @@ -13,7 +13,6 @@ FoamFile object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#inputSyntax slash; backgroundMesh { diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/blockMeshDict index ace260411f..3a7872dfca 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/blockMeshDict @@ -28,20 +28,20 @@ convertToMeters 1; vertices ( ( 0 0 -1) - ($:backgroundMesh.length 0 -1) - ( 0 $:backgroundMesh.rA -1) - ($:backgroundMesh.length $:backgroundMesh.rA -1) + ($!backgroundMesh/length 0 -1) + ( 0 $!backgroundMesh/rA -1) + ($!backgroundMesh/length $!backgroundMesh/rA -1) ( 0 0 0) - ($:backgroundMesh.length 0 0) - ( 0 $:backgroundMesh.rA 0) - ($:backgroundMesh.length $:backgroundMesh.rA 0) + ($!backgroundMesh/length 0 0) + ( 0 $!backgroundMesh/rA 0) + ($!backgroundMesh/length $!backgroundMesh/rA 0) ); blocks ( hex (0 1 3 2 4 5 7 6) - ($:backgroundMesh.lengthCells $:backgroundMesh.rAcells 1) + ($!backgroundMesh/lengthCells $!backgroundMesh/rAcells 1) simpleGrading (1 0.5 1) ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/blockMeshDict index 87424a1885..5e0a92af2d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/blockMeshDict @@ -27,20 +27,20 @@ convertToMeters 1; vertices ( ( 0 0 -1) - ($:backgroundMesh.length 0 -1) - ( 0 $:backgroundMesh.rA -1) - ($:backgroundMesh.length $:backgroundMesh.rA -1) + ($!backgroundMesh/length 0 -1) + ( 0 $!backgroundMesh/rA -1) + ($!backgroundMesh/length $!backgroundMesh/rA -1) ( 0 0 0) - ($:backgroundMesh.length 0 0) - ( 0 $:backgroundMesh.rA 0) - ($:backgroundMesh.length $:backgroundMesh.rA 0) + ($!backgroundMesh/length 0 0) + ( 0 $!backgroundMesh/rA 0) + ($!backgroundMesh/length $!backgroundMesh/rA 0) ); blocks ( hex (0 1 3 2 4 5 7 6) - ($:backgroundMesh.lengthCells $:backgroundMesh.rAcells 1) + ($!backgroundMesh/lengthCells $!backgroundMesh/rAcells 1) simpleGrading (1 0.5 1) ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict index 87424a1885..5e0a92af2d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict @@ -27,20 +27,20 @@ convertToMeters 1; vertices ( ( 0 0 -1) - ($:backgroundMesh.length 0 -1) - ( 0 $:backgroundMesh.rA -1) - ($:backgroundMesh.length $:backgroundMesh.rA -1) + ($!backgroundMesh/length 0 -1) + ( 0 $!backgroundMesh/rA -1) + ($!backgroundMesh/length $!backgroundMesh/rA -1) ( 0 0 0) - ($:backgroundMesh.length 0 0) - ( 0 $:backgroundMesh.rA 0) - ($:backgroundMesh.length $:backgroundMesh.rA 0) + ($!backgroundMesh/length 0 0) + ( 0 $!backgroundMesh/rA 0) + ($!backgroundMesh/length $!backgroundMesh/rA 0) ); blocks ( hex (0 1 3 2 4 5 7 6) - ($:backgroundMesh.lengthCells $:backgroundMesh.rAcells 1) + ($!backgroundMesh/lengthCells $!backgroundMesh/rAcells 1) simpleGrading (1 0.5 1) ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/blockMeshDict index 87424a1885..5e0a92af2d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/blockMeshDict @@ -27,20 +27,20 @@ convertToMeters 1; vertices ( ( 0 0 -1) - ($:backgroundMesh.length 0 -1) - ( 0 $:backgroundMesh.rA -1) - ($:backgroundMesh.length $:backgroundMesh.rA -1) + ($!backgroundMesh/length 0 -1) + ( 0 $!backgroundMesh/rA -1) + ($!backgroundMesh/length $!backgroundMesh/rA -1) ( 0 0 0) - ($:backgroundMesh.length 0 0) - ( 0 $:backgroundMesh.rA 0) - ($:backgroundMesh.length $:backgroundMesh.rA 0) + ($!backgroundMesh/length 0 0) + ( 0 $!backgroundMesh/rA 0) + ($!backgroundMesh/length $!backgroundMesh/rA 0) ); blocks ( hex (0 1 3 2 4 5 7 6) - ($:backgroundMesh.lengthCells $:backgroundMesh.rAcells 1) + ($!backgroundMesh/lengthCells $!backgroundMesh/rAcells 1) simpleGrading (1 0.5 1) ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/blockMeshDict index 87424a1885..5e0a92af2d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/blockMeshDict @@ -27,20 +27,20 @@ convertToMeters 1; vertices ( ( 0 0 -1) - ($:backgroundMesh.length 0 -1) - ( 0 $:backgroundMesh.rA -1) - ($:backgroundMesh.length $:backgroundMesh.rA -1) + ($!backgroundMesh/length 0 -1) + ( 0 $!backgroundMesh/rA -1) + ($!backgroundMesh/length $!backgroundMesh/rA -1) ( 0 0 0) - ($:backgroundMesh.length 0 0) - ( 0 $:backgroundMesh.rA 0) - ($:backgroundMesh.length $:backgroundMesh.rA 0) + ($!backgroundMesh/length 0 0) + ( 0 $!backgroundMesh/rA 0) + ($!backgroundMesh/length $!backgroundMesh/rA 0) ); blocks ( hex (0 1 3 2 4 5 7 6) - ($:backgroundMesh.lengthCells $:backgroundMesh.rAcells 1) + ($!backgroundMesh/lengthCells $!backgroundMesh/rAcells 1) simpleGrading (1 0.5 1) );