zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemDict: Added support for system as the default directory for the -dict option

Browse Source 
With this change both

    blockMesh -dict fineBlockMeshDict
    blockMesh -dict system/fineBlockMeshDict

are supported, if the system/ path is not specified it is assumed
This commit is contained in:
Henry Weller
2021-07-02 21:05:47 +01:00
parent 677defdc5c
commit 78977d3259
18 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C
View File

@ -55,6 +55,10 @@ Foam::IOobject Foam::systemDictIO
{
dictPath = dictPath/dictName;
}
else if (dictPath.isName())
{
dictPath = ob.time().system()/dictPath;
}
}
if (dictPath.size())

14
src/OpenFOAM/primitives/strings/fileName/fileName.C
View File

@ -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) == '/';

10
src/OpenFOAM/primitives/strings/fileName/fileName.H
View File

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

2
tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allmesh
View File

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

2
tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/Allrun
View File

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

4
tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun
View File

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

8
tutorials/mesh/refineMesh/refineFieldDirs/Allrun
View File

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

2
tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
View File

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

2
tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
View File

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

2
tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun
View File

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

4
tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun
View File

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

2
tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh
View File

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

2
tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh
View File

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

2
tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh
View File

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

2
tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh
View File

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

8
tutorials/multiphase/interFoam/laminar/wave/Allrun
View File

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

2
tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/AllrunFine
View File

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

2
tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allrun
View File

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