blockMesh: Change default location of blockMeshDict from constant/polyMesh to system

For multi-region cases the default location of blockMeshDict is now system/<region name>

If the blockMeshDict is not found in system then the constant directory
is also checked providing backward-compatibility
This commit is contained in:
Henry
2015-04-24 22:29:57 +01:00
parent 55e72f6384
commit 3a3c29b284
199 changed files with 331 additions and 65 deletions

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields

View File

@ -1,6 +1,6 @@
#!/bin/sh
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields

View File

@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
setDamBreakFine ()
{
blockMeshDict="constant/polyMesh/blockMeshDict"
blockMeshDict="system/blockMeshDict"
controlDict="system/controlDict"
sed \
-e s/"23 8"/"46 10"/g \

View File

@ -1,6 +1,6 @@
#!/bin/sh
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap

View File

@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
setDamBreakFine ()
{
blockMeshDict="constant/polyMesh/blockMeshDict"
blockMeshDict="system/blockMeshDict"
controlDict="system/controlDict"
sed \
-e s/"23 8"/"46 10"/g \

View File

@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions

View File

@ -1,6 +1,6 @@
#!/bin/sh
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 < system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh

View File

@ -1,6 +1,6 @@
#!/bin/sh
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap

View File

@ -1,6 +1,6 @@
#!/bin/sh
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap