diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C b/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C index 9ab5942f82..2fe9feb6d2 100644 --- a/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C +++ b/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C @@ -55,6 +55,10 @@ Foam::IOobject Foam::systemDictIO { dictPath = dictPath/dictName; } + else if (dictPath.isName()) + { + dictPath = ob.time().system()/dictPath; + } } if (dictPath.size()) diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C index 30dadfe79b..8340443f0d 100644 --- a/src/OpenFOAM/primitives/strings/fileName/fileName.C +++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,6 +58,18 @@ Foam::fileType Foam::fileName::type } +bool Foam::fileName::isName() const +{ + return find('/') == npos; +} + + +bool Foam::fileName::hasPath() const +{ + return find('/') != npos; +} + + bool Foam::fileName::isAbsolute() const { return !empty() && operator[](0) == '/'; diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.H b/src/OpenFOAM/primitives/strings/fileName/fileName.H index a5fe0cb42c..c49993fb46 100644 --- a/src/OpenFOAM/primitives/strings/fileName/fileName.H +++ b/src/OpenFOAM/primitives/strings/fileName/fileName.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -165,6 +165,14 @@ public: const bool followLink = true ) const; + //- Return true if file name is a name without a path + // i.e. does not contain a '/' + bool isName() const; + + //- Return true if file name has a path + // i.e. contains a '/' + bool hasPath() const; + //- Return true if file name is absolute bool isAbsolute() const; diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allmesh b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allmesh index 1b494b5aa3..e89ae430f1 100755 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allmesh +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allmesh @@ -4,7 +4,7 @@ runApplication blockMesh #runApplication setSet -batch wallFilmRegion.setSet -runApplication topoSet -dict system/wallFilmRegion.topoSet +runApplication topoSet -dict wallFilmRegion.topoSet runApplication extrudeToRegionMesh -overwrite diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/Allrun index cf62438f0d..3842ae9bb2 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/Allrun @@ -10,7 +10,7 @@ runApplication foamSetupCHT runApplication foamDictionary -entry internalField -set "uniform 348" 0/solid/T -runApplication decomposePar -allRegions -dict system/decomposeParDict +runApplication decomposePar -allRegions -dict decomposeParDict printf "\n%s\n" "Creating files for paraview post-processing" paraFoam -touchAll diff --git a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun index 7720d3c015..7d701e7ef2 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun @@ -10,9 +10,9 @@ application=$(getApplication) runApplication blockMesh runApplication transformPoints "scale=(1.6666 1 1)" -runApplication mirrorMesh -dict system/mirrorMeshDict.x -overwrite +runApplication mirrorMesh -dict mirrorMeshDict.x -overwrite rm log.mirrorMesh -runApplication mirrorMesh -dict system/mirrorMeshDict.y -overwrite +runApplication mirrorMesh -dict mirrorMeshDict.y -overwrite runApplication topoSet runApplication createPatch -overwrite diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/Allrun b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun index c3bdd39961..d67e23ba8c 100755 --- a/tutorials/mesh/refineMesh/refineFieldDirs/Allrun +++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun @@ -20,12 +20,12 @@ for index in 1 2 3 4 5 6; do runApplication -s tier$index calcRadiusField runApplication -s tier$index \ - topoSet -dict system/topoSetDict.tier$index + topoSet -dict topoSetDict.tier$index ## foamToVTK -cellSet tier$index runApplication -s tier$index \ - refineMesh -dict system/refineMeshDict.tier$index -overwrite + refineMesh -dict refineMeshDict.tier$index -overwrite rm -r 0/* @@ -37,12 +37,12 @@ for index in 1 2 3; do runApplication -s range$index calcRadiusField -calcDirections runApplication -s range$index \ - topoSet -dict system/topoSetDict.range$index + topoSet -dict topoSetDict.range$index ## foamToVTK -cellSet tier$index runApplication -s range$index \ - refineMesh -dict system/refineMeshDict.range$index -overwrite + refineMesh -dict refineMeshDict.range$index -overwrite rm -r 0/* diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun index 6ed1c6ba9b..6d54a80d79 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun @@ -18,7 +18,7 @@ refineMeshByCellSet() topoSet > log.topoSet.$1 2>&1 echo "Refining primary zone - $1" - refineMesh -dict system/refineMeshDict -overwrite \ + refineMesh -dict refineMeshDict -overwrite \ > log.refineMesh.$1 2>&1 fi shift diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun index 6b5f9ca460..9ab14deb62 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun @@ -18,7 +18,7 @@ refineMeshByCellSet() topoSet > log.topoSet.$1 2>&1 echo "Refining primary zone - $1" - refineMesh -dict system/refineMeshDict -overwrite \ + refineMesh -dict refineMeshDict -overwrite \ > log.refineMesh.$1 2>&1 fi shift diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun index 746320a279..572f2221e5 100755 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun @@ -17,7 +17,7 @@ refineMeshByCellSet() topoSet > log.topoSet.$1 2>&1 echo "Refining primary zone - $1" - refineMesh -dict system/refineMeshDict -overwrite \ + refineMesh -dict refineMeshDict -overwrite \ > log.refineMesh.$1 2>&1 fi shift diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun index f56f378d9f..7495c54e58 100755 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun @@ -12,10 +12,10 @@ runApplication blockMesh for i in 1 2 do runApplication -s $i \ - topoSet -dict system/topoSetDict.${i} + topoSet -dict topoSetDict.${i} runApplication -s $i \ - refineMesh -dict system/refineMeshDict -overwrite + refineMesh -dict refineMeshDict -overwrite done runApplication $application diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh index a5759e568d..9803329175 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh @@ -17,7 +17,7 @@ do runApplication -a topoSet - runApplication -a refineMesh -dict system/refineMeshDict -overwrite + runApplication -a refineMesh -dict refineMeshDict -overwrite done runApplication snappyHexMesh -overwrite diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh index a5759e568d..9803329175 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh @@ -17,7 +17,7 @@ do runApplication -a topoSet - runApplication -a refineMesh -dict system/refineMeshDict -overwrite + runApplication -a refineMesh -dict refineMeshDict -overwrite done runApplication snappyHexMesh -overwrite diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh index a5759e568d..9803329175 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh @@ -17,7 +17,7 @@ do runApplication -a topoSet - runApplication -a refineMesh -dict system/refineMeshDict -overwrite + runApplication -a refineMesh -dict refineMeshDict -overwrite done runApplication snappyHexMesh -overwrite diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh index 26b91b13cc..da05bdf812 100755 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh @@ -10,7 +10,7 @@ echo "Creating channel" i=1 while [ "$i" -lt 3 ] ; do echo "Running extrudeMesh, instance" ${i} - extrudeMesh -dict system/extrudeMeshDict.${i} > log.extrudeMesh.${i} + extrudeMesh -dict extrudeMeshDict.${i} > log.extrudeMesh.${i} i=$((i + 1)) done diff --git a/tutorials/multiphase/interFoam/laminar/wave/Allrun b/tutorials/multiphase/interFoam/laminar/wave/Allrun index 980c487ce4..5ad18f9209 100755 --- a/tutorials/multiphase/interFoam/laminar/wave/Allrun +++ b/tutorials/multiphase/interFoam/laminar/wave/Allrun @@ -10,14 +10,14 @@ runApplication extrudeMesh for i in 1 2 do - runApplication -s $i topoSet -dict system/topoSetDict$i - runApplication -s $i refineMesh -dict system/refineMeshDictX -overwrite + runApplication -s $i topoSet -dict topoSetDict$i + runApplication -s $i refineMesh -dict refineMeshDictX -overwrite done for i in 3 4 5 6 do - runApplication -s $i topoSet -dict system/topoSetDict$i - runApplication -s $i refineMesh -dict system/refineMeshDictY -overwrite + runApplication -s $i topoSet -dict topoSetDict$i + runApplication -s $i refineMesh -dict refineMeshDictY -overwrite done runApplication setWaves diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/AllrunFine b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/AllrunFine index 1993f87d4f..060018a84f 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/AllrunFine +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/AllrunFine @@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=$(getApplication) -runApplication blockMesh -dict system/fineBlockMeshDict +runApplication blockMesh -dict fineBlockMeshDict runApplication setFields runApplication decomposePar runParallel $application diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allrun index 60dfb7c558..9d806d2871 100755 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allrun +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allrun @@ -14,7 +14,7 @@ runApplication -s 1 topoSet runApplication subsetMesh -overwrite c0 -patch floatingObject -noFields runApplication -s selectBottom \ - topoSet -dict system/topoSetDict-selectBottom + topoSet -dict topoSetDict-selectBottom runApplication createPatch -overwrite