TUT: consistent calling of m4

This commit is contained in:
Mark Olesen
2019-11-06 11:50:42 +01:00
committed by Andrew Heather
parent e6dfb39c66
commit 46d7db79aa
31 changed files with 56 additions and 31 deletions

View File

@ -3,13 +3,12 @@ cd ${0%/*} || exit 1 # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# create the blockMesh file with the parametric one
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication topoSet runApplication topoSet
runApplication snappyHexMesh -overwrite runApplication snappyHexMesh -overwrite
runApplication extrudeToRegionMesh -overwrite runApplication extrudeToRegionMesh -overwrite

View File

@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -9,8 +9,8 @@ rm -rf 0 constant
\cp -r ../common/constant constant \cp -r ../common/constant constant
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -9,8 +9,8 @@ rm -rf 0 constant
\cp -r ../common/constant constant \cp -r ../common/constant constant
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
blockMesh > log.blockMesh 2>&1 blockMesh > log.blockMesh 2>&1
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -3,9 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
rm -f system/blockMeshDict
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
restore0Dir restore0Dir

View File

@ -3,8 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication topoSet runApplication topoSet

View File

@ -9,8 +9,8 @@ rm -rf 0 constant
\cp -r ../common/constant constant \cp -r ../common/constant constant
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -9,8 +9,8 @@ rm -rf 0 constant
\cp -r ../common/constant constant \cp -r ../common/constant constant
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -3,8 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -3,8 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)

View File

@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# create the underlying block mesh # create the underlying block mesh
m4 system/pachuka.m4 > system/blockMeshDict m4 system/pachuka.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
\cp 0/alpha.water.orig 0/alpha.water \cp 0/alpha.water.orig 0/alpha.water

View File

@ -5,7 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water cp 0/alpha.water.orig 0/alpha.water
runApplication setFields runApplication setFields
runApplication $(getApplication) runApplication $(getApplication)

View File

@ -1,7 +1,10 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
blockMesh blockMesh
topoSet topoSet
setsToZones -noFlipMap setsToZones -noFlipMap

View File

@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -1,7 +1,10 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
blockMesh blockMesh
topoSet topoSet
setsToZones -noFlipMap setsToZones -noFlipMap

View File

@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water cp 0/alpha.water.orig 0/alpha.water
runApplication setFields runApplication setFields

View File

@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water cp 0/alpha.water.orig 0/alpha.water
runApplication setFields runApplication setFields

View File

@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water cp 0/alpha.water.orig 0/alpha.water
runApplication setFields runApplication setFields

View File

@ -7,6 +7,7 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water cp 0/alpha.water.orig 0/alpha.water
runApplication setFields runApplication setFields
runApplication $(getApplication) runApplication $(getApplication)

View File

@ -5,7 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water cp 0/alpha.water.orig 0/alpha.water
runApplication setFields runApplication setFields
runApplication $(getApplication) runApplication $(getApplication)

View File

@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water cp 0/alpha.water.orig 0/alpha.water
runApplication setFields runApplication setFields

View File

@ -1,7 +1,10 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
blockMesh blockMesh
topoSet topoSet
setsToZones -noFlipMap setsToZones -noFlipMap

View File

@ -3,8 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication topoSet runApplication topoSet

View File

@ -1,6 +1,11 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
blockMesh blockMesh
topoSet topoSet
setsToZones -noFlipMap setsToZones -noFlipMap
#------------------------------------------------------------------------------

View File

@ -1,7 +1,10 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
blockMesh blockMesh
topoSet topoSet
setsToZones -noFlipMap setsToZones -noFlipMap

View File

@ -1,7 +1,10 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
blockMesh blockMesh
topoSet topoSet
setsToZones -noFlipMap setsToZones -noFlipMap

View File

@ -1,7 +1,10 @@
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
m4 < system/blockMeshDict.m4 > system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict
blockMesh blockMesh
topoSet topoSet
setsToZones -noFlipMap setsToZones -noFlipMap