diff --git a/applications/solvers/DNS/dnsFoam/Allwmake b/applications/solvers/DNS/dnsFoam/Allwmake index 605293b5b6..a066af9554 100755 --- a/applications/solvers/DNS/dnsFoam/Allwmake +++ b/applications/solvers/DNS/dnsFoam/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -. $WM_PROJECT_DIR/wmake/scripts/have_fftw +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_fftw #------------------------------------------------------------------------------ diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake index 58648ff044..ff1edbfa0d 100755 --- a/applications/solvers/compressible/rhoCentralFoam/Allwmake +++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments (wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam) diff --git a/applications/solvers/lagrangian/DPMFoam/Allwmake b/applications/solvers/lagrangian/DPMFoam/Allwmake index 29e2940cd9..e6a558c972 100755 --- a/applications/solvers/lagrangian/DPMFoam/Allwmake +++ b/applications/solvers/lagrangian/DPMFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/MPPICInterFoam/Allwmake b/applications/solvers/multiphase/MPPICInterFoam/Allwmake index 0becbda84c..67940b9dc1 100755 --- a/applications/solvers/multiphase/MPPICInterFoam/Allwmake +++ b/applications/solvers/multiphase/MPPICInterFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake index 7a7a4e7180..b2a2c0e861 100755 --- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake +++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake index 0d361f9554..c9a0de59a7 100755 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwmake b/applications/solvers/multiphase/driftFluxFoam/Allwmake index 7571b50608..0d6973139b 100755 --- a/applications/solvers/multiphase/driftFluxFoam/Allwmake +++ b/applications/solvers/multiphase/driftFluxFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake index 114a214393..9abfd44e60 100755 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake index bb5db1b94f..55d43c1741 100755 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake index 6f577cedd6..aa30427505 100755 --- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake +++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake index e22e137bcb..68d39777ad 100755 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake index 98754d5700..e10d6d5823 100755 --- a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake +++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake index 7aa883fed9..3dbd571f89 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake +++ b/applications/solvers/multiphase/reactingEulerFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake index ecb7039b93..7bf70226d0 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake index ecb7039b93..7bf70226d0 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake index 73f0733ef1..8fbb391066 100755 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/test/fieldMapping/pipe1D/Allrun b/applications/test/fieldMapping/pipe1D/Allrun index 130ff26742..8c29e97d11 100755 --- a/applications/test/fieldMapping/pipe1D/Allrun +++ b/applications/test/fieldMapping/pipe1D/Allrun @@ -1,10 +1,8 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name application=Test-fieldMapping # Compile diff --git a/applications/test/hexRef8/block/Allrun b/applications/test/hexRef8/block/Allrun index 59757f310a..01cc28c1bb 100755 --- a/applications/test/hexRef8/block/Allrun +++ b/applications/test/hexRef8/block/Allrun @@ -1,13 +1,10 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name application=Test-hexRef8 -# Compile runApplication wmake .. runApplication blockMesh diff --git a/applications/test/mapDistributePolyMesh/cavity/Allclean b/applications/test/mapDistributePolyMesh/cavity/Allclean index 1ddaee91ff..ca64f313b3 100755 --- a/applications/test/mapDistributePolyMesh/cavity/Allclean +++ b/applications/test/mapDistributePolyMesh/cavity/Allclean @@ -1,8 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/applications/test/mapDistributePolyMesh/cavity/Allrun b/applications/test/mapDistributePolyMesh/cavity/Allrun index 9afaa5243d..75b48fcd5e 100755 --- a/applications/test/mapDistributePolyMesh/cavity/Allrun +++ b/applications/test/mapDistributePolyMesh/cavity/Allrun @@ -1,8 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/applications/test/parallelOverset/heatTransfer/Allclean b/applications/test/parallelOverset/heatTransfer/Allclean index bd7671dd1e..becc3c757e 100755 --- a/applications/test/parallelOverset/heatTransfer/Allclean +++ b/applications/test/parallelOverset/heatTransfer/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -f constant/polyMesh/boundary diff --git a/applications/test/parallelOverset/heatTransfer/Allrun.pre b/applications/test/parallelOverset/heatTransfer/Allrun.pre index 16135b7062..2b7d44cffa 100755 --- a/applications/test/parallelOverset/heatTransfer/Allrun.pre +++ b/applications/test/parallelOverset/heatTransfer/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/applications/test/volField/cavity/Allrun b/applications/test/volField/cavity/Allrun index 03255c4d13..619315f70c 100755 --- a/applications/test/volField/cavity/Allrun +++ b/applications/test/volField/cavity/Allrun @@ -1,13 +1,9 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name application=Test-volField -# Compile runApplication wmake .. runApplication blockMesh diff --git a/applications/utilities/mesh/conversion/ccm/Allwmake b/applications/utilities/mesh/conversion/ccm/Allwmake index 1fc0eea707..b64deac424 100755 --- a/applications/utilities/mesh/conversion/ccm/Allwmake +++ b/applications/utilities/mesh/conversion/ccm/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # (error catching) +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake index 83876d367d..fa8da9d1ff 100755 --- a/applications/utilities/mesh/generation/Allwmake +++ b/applications/utilities/mesh/generation/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # (error catching) #------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake index 2b58cd08e1..20f331844e 100755 --- a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake +++ b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwmake b/applications/utilities/mesh/generation/foamyMesh/Allwmake index beef89b54a..f1022241de 100755 --- a/applications/utilities/mesh/generation/foamyMesh/Allwmake +++ b/applications/utilities/mesh/generation/foamyMesh/Allwmake @@ -1,10 +1,10 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -export WM_CONTINUE_ON_ERROR=true # Optional unit -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) -. $WM_PROJECT_DIR/wmake/scripts/have_cgal - +cd ${0%/*} || exit 1 # Run from this directory +export WM_CONTINUE_ON_ERROR=true # Optional unit +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # (error catching) +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_cgal #------------------------------------------------------------------------------ + # Optional # - CGAL not installed, or installed but gives CMake problems diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake index 1607b672aa..3b99eb9e29 100755 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake index f89bab6e20..5546fd33c7 100755 --- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake +++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake @@ -1,8 +1,8 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions -. $WM_PROJECT_DIR/wmake/scripts/have_zoltan +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # (error catching) +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_zoltan #------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/manipulation/setSet/Allwmake b/applications/utilities/mesh/manipulation/setSet/Allwmake index dfee8bee52..6a42c136ad 100755 --- a/applications/utilities/mesh/manipulation/setSet/Allwmake +++ b/applications/utilities/mesh/manipulation/setSet/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) -. $WM_PROJECT_DIR/wmake/scripts/have_readline +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # (error catching) +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_readline #------------------------------------------------------------------------------ unset COMP_FLAGS LINK_FLAGS diff --git a/applications/utilities/miscellaneous/OSspecific/Allwmake b/applications/utilities/miscellaneous/OSspecific/Allwmake index cf32b145ce..17badb9402 100755 --- a/applications/utilities/miscellaneous/OSspecific/Allwmake +++ b/applications/utilities/miscellaneous/OSspecific/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions #------------------------------------------------------------------------------ diff --git a/applications/utilities/miscellaneous/foamHelp/Allwmake b/applications/utilities/miscellaneous/foamHelp/Allwmake index 78dc109fec..807d0c7ca9 100755 --- a/applications/utilities/miscellaneous/foamHelp/Allwmake +++ b/applications/utilities/miscellaneous/foamHelp/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean index 5b27d1316b..df49bb9d24 100755 --- a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean +++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions # Source wmake functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions # Require wmake functions +#------------------------------------------------------------------------------ # Cleanup libraries wclean libso foamPv diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake index 656c1e6d2f..e7c25a1049 100755 --- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake +++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake @@ -1,9 +1,8 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -export WM_CONTINUE_ON_ERROR=true # Optional unit -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -. $WM_PROJECT_DIR/wmake/scripts/paraviewFunctions # CMake and PV functions - +cd ${0%/*} || exit 1 # Run from this directory +export WM_CONTINUE_ON_ERROR=true # Optional unit +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +. ${WM_PROJECT_DIR:?}/wmake/scripts/paraviewFunctions # CMake, PV functions # ----------------------------------------------------------------------------- warnIncomplete() diff --git a/applications/utilities/postProcessing/noise/Allwmake b/applications/utilities/postProcessing/noise/Allwmake index 2c9d265a5d..9cb77fb635 100755 --- a/applications/utilities/postProcessing/noise/Allwmake +++ b/applications/utilities/postProcessing/noise/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) -. $WM_PROJECT_DIR/wmake/scripts/have_fftw +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # (error catching) +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_fftw #------------------------------------------------------------------------------ diff --git a/applications/utilities/preProcessing/boxTurb/Allwmake b/applications/utilities/preProcessing/boxTurb/Allwmake index 820f2da552..906de00edf 100755 --- a/applications/utilities/preProcessing/boxTurb/Allwmake +++ b/applications/utilities/preProcessing/boxTurb/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) -. $WM_PROJECT_DIR/wmake/scripts/have_fftw +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # (error catching) +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_fftw #------------------------------------------------------------------------------ diff --git a/applications/utilities/preProcessing/wallFunctionTable/Allwmake b/applications/utilities/preProcessing/wallFunctionTable/Allwmake index 27ff0f0215..06dd573391 100755 --- a/applications/utilities/preProcessing/wallFunctionTable/Allwmake +++ b/applications/utilities/preProcessing/wallFunctionTable/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Allwmake b/applications/utilities/surface/surfaceBooleanFeatures/Allwmake index ba466eaf25..e6e1bfa134 100755 --- a/applications/utilities/surface/surfaceBooleanFeatures/Allwmake +++ b/applications/utilities/surface/surfaceBooleanFeatures/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching) -. $WM_PROJECT_DIR/wmake/scripts/have_cgal +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # (error catching) +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_cgal #------------------------------------------------------------------------------ unset COMP_FLAGS LINK_FLAGS diff --git a/applications/utilities/surface/surfaceFeatureExtract/Allwmake b/applications/utilities/surface/surfaceFeatureExtract/Allwmake index ed3666a3da..c5c5ccb2be 100755 --- a/applications/utilities/surface/surfaceFeatureExtract/Allwmake +++ b/applications/utilities/surface/surfaceFeatureExtract/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments (wmake $targetType extractionMethod && wmake $targetType) diff --git a/src/OSspecific/MSwindows/Allwmake b/src/OSspecific/MSwindows/Allwmake index 24fb418826..1c652edd72 100755 --- a/src/OSspecific/MSwindows/Allwmake +++ b/src/OSspecific/MSwindows/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -targetType=libo # Preferred library type -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments $* +cd ${0%/*} || exit 1 # Run from this directory +targetType=libo # Preferred library type +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments $* #------------------------------------------------------------------------------ unset COMP_FLAGS LINK_FLAGS diff --git a/src/OSspecific/POSIX/Allwmake b/src/OSspecific/POSIX/Allwmake index ef725400a6..c765b061e5 100755 --- a/src/OSspecific/POSIX/Allwmake +++ b/src/OSspecific/POSIX/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -targetType=libo # Preferred library type -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments $* +cd ${0%/*} || exit 1 # Run from this directory +targetType=libo # Preferred library type +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments $* #------------------------------------------------------------------------------ unset COMP_FLAGS LINK_FLAGS diff --git a/src/OpenFOAM/primitives/strings/stringOps/toScalar/createCode b/src/OpenFOAM/primitives/strings/stringOps/toScalar/createCode index f90246730b..520298b420 100755 --- a/src/OpenFOAM/primitives/strings/stringOps/toScalar/createCode +++ b/src/OpenFOAM/primitives/strings/stringOps/toScalar/createCode @@ -1,10 +1,10 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory +cd ${0%/*} || exit 1 # Run from this directory # Manually create ragel scanner and lemon parser header prefix=evalStringToScalar -"$WM_PROJECT_DIR/wmake/scripts/makeParser" \ +"${WM_PROJECT_DIR:?}/wmake/scripts/makeParser" \ -prefix="$prefix" \ -scanner=Scanner.rl \ -parser=LemonParser.lyy \ diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake index 77f2c9659b..76400e8d3a 100755 --- a/src/Pstream/Allwmake +++ b/src/Pstream/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/TurbulenceModels/Allwmake b/src/TurbulenceModels/Allwmake index 717ff9f150..b2f1ae7917 100755 --- a/src/TurbulenceModels/Allwmake +++ b/src/TurbulenceModels/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake index e2fd470725..926b65ccc6 100755 --- a/src/conversion/Allwmake +++ b/src/conversion/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -targetType=libso # Preferred library type -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +targetType=libso # Preferred library type +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/conversion/ccm/Allwmake b/src/conversion/ccm/Allwmake index 0c358cc781..d9ac45c153 100755 --- a/src/conversion/ccm/Allwmake +++ b/src/conversion/ccm/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -. $WM_PROJECT_DIR/wmake/scripts/have_ccmio +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_ccmio #------------------------------------------------------------------------------ # Optional diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake index 5a5be522c7..febb89f72d 100755 --- a/src/dummyThirdParty/Allwmake +++ b/src/dummyThirdParty/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/fileFormats/stl/createCode b/src/fileFormats/stl/createCode index aa7b8fd644..23f488cdd2 100755 --- a/src/fileFormats/stl/createCode +++ b/src/fileFormats/stl/createCode @@ -1,8 +1,9 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -# Manually create ragel code +cd ${0%/*} || exit 1 # Run from this directory -"$WM_PROJECT_DIR/wmake/scripts/makeParser" \ +# Manually create ragel scanner + +"${WM_PROJECT_DIR:?}/wmake/scripts/makeParser" \ -scanner=STLAsciiParseRagel.rl \ "$@" diff --git a/src/functionObjects/Allwmake b/src/functionObjects/Allwmake index 4ef262db11..577c090edb 100755 --- a/src/functionObjects/Allwmake +++ b/src/functionObjects/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/functionObjects/graphics/Allwmake b/src/functionObjects/graphics/Allwmake index 5e531d4629..4d045fd78a 100755 --- a/src/functionObjects/graphics/Allwmake +++ b/src/functionObjects/graphics/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ if [ "$targetType" != "objects" ] diff --git a/src/functionObjects/graphics/runTimePostProcessing/Allwclean b/src/functionObjects/graphics/runTimePostProcessing/Allwclean index 140edc4bd1..f442961aab 100755 --- a/src/functionObjects/graphics/runTimePostProcessing/Allwclean +++ b/src/functionObjects/graphics/runTimePostProcessing/Allwclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions # Source wmake functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions # Require wmake functions +#------------------------------------------------------------------------------ # This cleanup handles both cmake runTimePostProcessing and the dummy version diff --git a/src/functionObjects/graphics/runTimePostProcessing/Allwmake b/src/functionObjects/graphics/runTimePostProcessing/Allwmake index 94766cb758..fecb668614 100755 --- a/src/functionObjects/graphics/runTimePostProcessing/Allwmake +++ b/src/functionObjects/graphics/runTimePostProcessing/Allwmake @@ -1,7 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions # The CMake functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/cmakeFunctions # Require cmake functions # ----------------------------------------------------------------------------- echo "======================================================================" diff --git a/src/functionObjects/randomProcesses/Allwmake b/src/functionObjects/randomProcesses/Allwmake index c81ffedf78..eedf18476b 100755 --- a/src/functionObjects/randomProcesses/Allwmake +++ b/src/functionObjects/randomProcesses/Allwmake @@ -1,8 +1,8 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -targetType=libso # Preferred library type -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -. $WM_PROJECT_DIR/wmake/scripts/have_fftw +cd ${0%/*} || exit 1 # Run from this directory +targetType=libso # Preferred library type +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_fftw #------------------------------------------------------------------------------ diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake index 93a00b9144..e8982f6f9c 100755 --- a/src/fvAgglomerationMethods/Allwmake +++ b/src/fvAgglomerationMethods/Allwmake @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -. $WM_PROJECT_DIR/wmake/scripts/have_mgridgen +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_mgridgen #------------------------------------------------------------------------------ diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake index 0f58db9395..228e5412ab 100755 --- a/src/lagrangian/Allwmake +++ b/src/lagrangian/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake index ce45c96d26..60c5a189e8 100755 --- a/src/lagrangian/molecularDynamics/Allwmake +++ b/src/lagrangian/molecularDynamics/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake index f9d7193a10..41c6219648 100755 --- a/src/mesh/Allwmake +++ b/src/mesh/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake index 15aba58375..6ecb623951 100755 --- a/src/parallel/Allwmake +++ b/src/parallel/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake index 4cf78f005e..3f60c221d9 100755 --- a/src/parallel/decompose/Allwmake +++ b/src/parallel/decompose/Allwmake @@ -1,9 +1,9 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -. $WM_PROJECT_DIR/wmake/scripts/have_kahip -. $WM_PROJECT_DIR/wmake/scripts/have_metis -. $WM_PROJECT_DIR/wmake/scripts/have_scotch +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_kahip +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_metis +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_scotch #------------------------------------------------------------------------------ diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake index d5089a9c46..5b2fbb5af6 100755 --- a/src/parallel/reconstruct/Allwmake +++ b/src/parallel/reconstruct/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/Allwmake b/src/phaseSystemModels/Allwmake index 4ff427d168..759e13662f 100755 --- a/src/phaseSystemModels/Allwmake +++ b/src/phaseSystemModels/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/randomProcesses/Allwmake b/src/randomProcesses/Allwmake index c81ffedf78..eedf18476b 100755 --- a/src/randomProcesses/Allwmake +++ b/src/randomProcesses/Allwmake @@ -1,8 +1,8 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -targetType=libso # Preferred library type -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -. $WM_PROJECT_DIR/wmake/scripts/have_fftw +cd ${0%/*} || exit 1 # Run from this directory +targetType=libso # Preferred library type +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_fftw #------------------------------------------------------------------------------ diff --git a/src/regionModels/Allwmake b/src/regionModels/Allwmake index d29ed140c7..ff97a5899f 100755 --- a/src/regionModels/Allwmake +++ b/src/regionModels/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/renumber/Allwmake b/src/renumber/Allwmake index c8122c5a88..50e04920cf 100755 --- a/src/renumber/Allwmake +++ b/src/renumber/Allwmake @@ -1,9 +1,9 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -targetType=libso # Preferred library type -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -. $WM_PROJECT_DIR/wmake/scripts/have_boost -. $WM_PROJECT_DIR/wmake/scripts/have_zoltan +cd ${0%/*} || exit 1 # Run from this directory +targetType=libso # Preferred library type +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_boost +. ${WM_PROJECT_DIR:?}/wmake/scripts/have_zoltan #------------------------------------------------------------------------------ diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 520a2d0af2..1efcd8e072 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake index 4790540e34..098cfb9b91 100755 --- a/src/transportModels/Allwmake +++ b/src/transportModels/Allwmake @@ -1,6 +1,6 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ diff --git a/tutorials/Allclean b/tutorials/Allclean index 70e761244d..259bbd8395 100755 --- a/tutorials/Allclean +++ b/tutorials/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/LogFunctions # Tutorial log-file functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/LogFunctions # Tutorial log-file functions +#------------------------------------------------------------------------------ echo "--------" diff --git a/tutorials/Allcollect b/tutorials/Allcollect index 37f0bc2986..0595c4fd7f 100755 --- a/tutorials/Allcollect +++ b/tutorials/Allcollect @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/LogFunctions # Tutorial log-file functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/LogFunctions # Tutorial log-file functions +#------------------------------------------------------------------------------ # Collect log files as 'testLoopReport' collectLogs diff --git a/tutorials/Allrun b/tutorials/Allrun index 6cee4969a5..ee970cf335 100755 --- a/tutorials/Allrun +++ b/tutorials/Allrun @@ -7,7 +7,7 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2011-2016 OpenFOAM Foundation -# Copyright (C) 2017 OpenCFD Ltd. +# Copyright (C) 2017-2019 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, licensed under GNU General Public License @@ -67,7 +67,7 @@ do done #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/bin/tools/LogFunctions # Tutorial log-file functions +. ${WM_PROJECT_DIR:?}/bin/LogFunctions # Tutorial log-file functions if [ -z "$optCollect" ] then diff --git a/tutorials/Alltest b/tutorials/Alltest index b43bdc177a..b557405d31 100755 --- a/tutorials/Alltest +++ b/tutorials/Alltest @@ -104,8 +104,8 @@ do shift done -# Set FOAM_TUTORIALS directory location, as required. -. "${WM_PROJECT_DIR:?}/bin/tools/RunFunctions" +# Sets FOAM_TUTORIALS directory location, as required +. "${WM_PROJECT_DIR:?}"/bin/tools/RunFunctions #------------------------------------------------------------------------------ diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allclean b/tutorials/DNS/dnsFoam/boxTurb16/Allclean index 63c2af729c..ba04bf4f4d 100755 --- a/tutorials/DNS/dnsFoam/boxTurb16/Allclean +++ b/tutorials/DNS/dnsFoam/boxTurb16/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -f 0/enstrophy diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun index 73fb0ad1aa..5f632eef2a 100755 --- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun +++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication boxTurb diff --git a/tutorials/IO/dictionary/Allrun b/tutorials/IO/dictionary/Allrun index 2c4c344ab2..369aa6dbcf 100755 --- a/tutorials/IO/dictionary/Allrun +++ b/tutorials/IO/dictionary/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./TestParsing -verbose "$@" diff --git a/tutorials/IO/dictionary/Alltest b/tutorials/IO/dictionary/Alltest index 850ea90ee4..0f8df68908 100755 --- a/tutorials/IO/dictionary/Alltest +++ b/tutorials/IO/dictionary/Alltest @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./TestParsing "$@" diff --git a/tutorials/IO/dictionary/TestParsing b/tutorials/IO/dictionary/TestParsing index 973b887497..7b656c9613 100755 --- a/tutorials/IO/dictionary/TestParsing +++ b/tutorials/IO/dictionary/TestParsing @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ echo "dictionary input tests" diff --git a/tutorials/IO/fileHandler/Allclean b/tutorials/IO/fileHandler/Allclean index b94239990e..43db216ce9 100755 --- a/tutorials/IO/fileHandler/Allclean +++ b/tutorials/IO/fileHandler/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/IO/fileHandler/Allrun b/tutorials/IO/fileHandler/Allrun index ed0952fe54..5692f90ae6 100755 --- a/tutorials/IO/fileHandler/Allrun +++ b/tutorials/IO/fileHandler/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ if isTest $@ then diff --git a/tutorials/IO/systemCall/Allrun b/tutorials/IO/systemCall/Allrun index a42d43db7b..bfa19e1775 100755 --- a/tutorials/IO/systemCall/Allrun +++ b/tutorials/IO/systemCall/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication decomposePar diff --git a/tutorials/basic/laplacianFoam/flange/Allclean b/tutorials/basic/laplacianFoam/flange/Allclean index 1c56b00e18..71c8a0892b 100755 --- a/tutorials/basic/laplacianFoam/flange/Allclean +++ b/tutorials/basic/laplacianFoam/flange/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -rf Fieldview > /dev/null 2>&1 diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun index 53a0f0634a..d046b573f8 100755 --- a/tutorials/basic/laplacianFoam/flange/Allrun +++ b/tutorials/basic/laplacianFoam/flange/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runAnsysToFoam() { diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allclean b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allclean index fad073e143..a580cf3ad4 100755 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allclean +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun index 395446555e..39eb3645d5 100755 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun.pre b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun.pre index baa7887883..2b7d44cffa 100755 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun.pre +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/basic/overPotentialFoam/cylinder/Allclean b/tutorials/basic/overPotentialFoam/cylinder/Allclean index 3f56512f8f..b99a7cdd05 100755 --- a/tutorials/basic/overPotentialFoam/cylinder/Allclean +++ b/tutorials/basic/overPotentialFoam/cylinder/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ # An extruded mesh around cylinder (cd cylinderAndBackground && ./Allclean) diff --git a/tutorials/basic/overPotentialFoam/cylinder/Allrun b/tutorials/basic/overPotentialFoam/cylinder/Allrun index a98fd76068..1f9e19cfa2 100755 --- a/tutorials/basic/overPotentialFoam/cylinder/Allrun +++ b/tutorials/basic/overPotentialFoam/cylinder/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Extrude mesh around cylinder (cd cylinderMesh && ./Allrun.pre) diff --git a/tutorials/basic/overPotentialFoam/cylinder/Allrun.pre b/tutorials/basic/overPotentialFoam/cylinder/Allrun.pre index d87c892a62..a16bf252a5 100755 --- a/tutorials/basic/overPotentialFoam/cylinder/Allrun.pre +++ b/tutorials/basic/overPotentialFoam/cylinder/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Extrude mesh around cylinder (cd cylinderMesh && ./Allrun.pre) diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allclean b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allclean +++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun index 6751923556..b6b22e10a9 100755 --- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun +++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun.pre b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun.pre index fb7e1120bd..82380faff0 100755 --- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun.pre +++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Create background mesh runApplication blockMesh diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/Allrun.pre b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/Allrun.pre index a86d958660..020fb73544 100755 --- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/Allrun.pre +++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Generate mesh from surface (in constant/triSurface) runApplication extrudeMesh diff --git a/tutorials/basic/potentialFoam/cylinder/Allclean b/tutorials/basic/potentialFoam/cylinder/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/basic/potentialFoam/cylinder/Allclean +++ b/tutorials/basic/potentialFoam/cylinder/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun index 754c15e58c..16054a18b3 100755 --- a/tutorials/basic/potentialFoam/cylinder/Allrun +++ b/tutorials/basic/potentialFoam/cylinder/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allclean b/tutorials/basic/potentialFoam/pitzDaily/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/basic/potentialFoam/pitzDaily/Allclean +++ b/tutorials/basic/potentialFoam/pitzDaily/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun index 6ea7923d16..ddf63a27f7 100755 --- a/tutorials/basic/potentialFoam/pitzDaily/Allrun +++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean index b6e861cc69..50f8b81b0e 100755 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun index 509c985052..e76474da80 100755 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean +++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun index 5e6d5291c4..1154d59847 100755 --- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun +++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.mesh diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh index b8e81fb24c..49917c0bdd 100755 --- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh +++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/Allclean b/tutorials/combustion/XiEngineFoam/kivaTest/Allclean index b2a02d4957..9dc18dc049 100755 --- a/tutorials/combustion/XiEngineFoam/kivaTest/Allclean +++ b/tutorials/combustion/XiEngineFoam/kivaTest/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ mv ./-180 temp180 cleanCase diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/Allrun b/tutorials/combustion/XiEngineFoam/kivaTest/Allrun index 9cb48c6cf4..a310dde2f7 100755 --- a/tutorials/combustion/XiEngineFoam/kivaTest/Allrun +++ b/tutorials/combustion/XiEngineFoam/kivaTest/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication kivaToFoam -file otape17 diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/Allrun-parallel b/tutorials/combustion/XiEngineFoam/kivaTest/Allrun-parallel index 2f1caf98b5..82b19b9cdb 100755 --- a/tutorials/combustion/XiEngineFoam/kivaTest/Allrun-parallel +++ b/tutorials/combustion/XiEngineFoam/kivaTest/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication kivaToFoam -file otape17 diff --git a/tutorials/combustion/XiFoam/RAS/Allclean b/tutorials/combustion/XiFoam/RAS/Allclean index 39e9b455bf..06c12fc9a5 100755 --- a/tutorials/combustion/XiFoam/RAS/Allclean +++ b/tutorials/combustion/XiFoam/RAS/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ keepCases="moriyoshiHomogeneous" loseCases="moriyoshiHomogeneousPart2 moriyoshiHomogeneousHydrogen" diff --git a/tutorials/combustion/XiFoam/RAS/Allrun b/tutorials/combustion/XiFoam/RAS/Allrun index a2adc5e862..8a43d2f16d 100755 --- a/tutorials/combustion/XiFoam/RAS/Allrun +++ b/tutorials/combustion/XiFoam/RAS/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ setControlDict() { diff --git a/tutorials/combustion/chemFoam/gri/Allclean b/tutorials/combustion/chemFoam/gri/Allclean index 9bc42acc50..9f09e9930d 100755 --- a/tutorials/combustion/chemFoam/gri/Allclean +++ b/tutorials/combustion/chemFoam/gri/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/chemFoam/gri/Allrun b/tutorials/combustion/chemFoam/gri/Allrun index ef926b994c..8a86732907 100755 --- a/tutorials/combustion/chemFoam/gri/Allrun +++ b/tutorials/combustion/chemFoam/gri/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication chemkinToFoam \ chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \ diff --git a/tutorials/combustion/chemFoam/h2/Allclean b/tutorials/combustion/chemFoam/h2/Allclean index e01a93433e..493b6b3b01 100755 --- a/tutorials/combustion/chemFoam/h2/Allclean +++ b/tutorials/combustion/chemFoam/h2/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/chemFoam/h2/Allrun b/tutorials/combustion/chemFoam/h2/Allrun index 5afa0c541e..de77cb7d56 100755 --- a/tutorials/combustion/chemFoam/h2/Allrun +++ b/tutorials/combustion/chemFoam/h2/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication $(getApplication) diff --git a/tutorials/combustion/chemFoam/ic8h18/Allclean b/tutorials/combustion/chemFoam/ic8h18/Allclean index e01a93433e..493b6b3b01 100755 --- a/tutorials/combustion/chemFoam/ic8h18/Allclean +++ b/tutorials/combustion/chemFoam/ic8h18/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/chemFoam/ic8h18/Allrun b/tutorials/combustion/chemFoam/ic8h18/Allrun index 5afa0c541e..de77cb7d56 100755 --- a/tutorials/combustion/chemFoam/ic8h18/Allrun +++ b/tutorials/combustion/chemFoam/ic8h18/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication $(getApplication) diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean index e01a93433e..493b6b3b01 100755 --- a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean +++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun index 5afa0c541e..de77cb7d56 100755 --- a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun +++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication $(getApplication) diff --git a/tutorials/combustion/chemFoam/nc7h16/Allclean b/tutorials/combustion/chemFoam/nc7h16/Allclean index e01a93433e..493b6b3b01 100755 --- a/tutorials/combustion/chemFoam/nc7h16/Allclean +++ b/tutorials/combustion/chemFoam/nc7h16/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/chemFoam/nc7h16/Allrun b/tutorials/combustion/chemFoam/nc7h16/Allrun index 5afa0c541e..de77cb7d56 100755 --- a/tutorials/combustion/chemFoam/nc7h16/Allrun +++ b/tutorials/combustion/chemFoam/nc7h16/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication $(getApplication) diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean index 9ead8681de..ae1a8004e7 100755 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean @@ -1,9 +1,12 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase + rm -rf constant/panelRegion/polyMesh rm -f constant/polyMesh/boundary rm -f validation/*.eps + #------------------------------------------------------------------------------ diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun index b8fad2b17f..b72d1f3424 100755 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # create the blockMesh file with the parametric one m4 system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allclean b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allclean index b38edacb89..3dab827afb 100755 --- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allclean +++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun index e99924ab9d..e078e04b72 100755 --- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun +++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # create the underlying block mesh runApplication blockMesh diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean index fcfdc32577..d26961787e 100755 --- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean +++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun index 259ca145a6..409b6d85e4 100755 --- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun +++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean index 2e8de5d05f..f627b3aadb 100755 --- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean +++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -rf constant/panelRegion/polyMesh diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun index dcd2bad0e5..51d8f67927 100755 --- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun +++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allclean b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allclean index b75804a65b..08eea3e9c3 100755 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allclean +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun index 39af3c029d..c228888491 100755 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allclean b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allclean index b75804a65b..08eea3e9c3 100755 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allclean +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun index de0f52b40b..c2edaf682d 100755 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allclean b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allclean index c81ffab9ed..3c2c8bd235 100755 --- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allclean +++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allrun b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allrun index 1476376f44..4634f7856b 100755 --- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allrun +++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Application name application=$(getApplication) diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allclean b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allclean +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun index a6a6eafa12..95da925a16 100755 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Application name application=$(getApplication) diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/Allclean b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/Allclean +++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/Allrun b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/Allrun index e7546150c9..8501663548 100755 --- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/Allrun +++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication decomposePar diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/Allclean b/tutorials/combustion/reactingFoam/RAS/membrane/Allclean index 4b318da219..2660b062e1 100755 --- a/tutorials/combustion/reactingFoam/RAS/membrane/Allclean +++ b/tutorials/combustion/reactingFoam/RAS/membrane/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/Allrun b/tutorials/combustion/reactingFoam/RAS/membrane/Allrun index 5b60d5c00f..53ed8ae3ce 100755 --- a/tutorials/combustion/reactingFoam/RAS/membrane/Allrun +++ b/tutorials/combustion/reactingFoam/RAS/membrane/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ cp \ $FOAM_TUTORIALS/resources/geometry/membrane-boundaries.stl.gz \ diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allclean b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allclean +++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allrun b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allrun index cd2da7c142..68d65d6908 100755 --- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allrun +++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allrun.pre b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allrun.pre index abccd3163c..308bbee9fd 100755 --- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allrun.pre +++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun index a98fd76068..1f9e19cfa2 100755 --- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun +++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Extrude mesh around cylinder (cd cylinderMesh && ./Allrun.pre) diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun.pre b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun.pre index d87c892a62..a16bf252a5 100755 --- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun.pre +++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Extrude mesh around cylinder (cd cylinderMesh && ./Allrun.pre) diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allclean b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allclean +++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun index 6751923556..b6b22e10a9 100755 --- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun +++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun.pre b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun.pre index fb7e1120bd..82380faff0 100755 --- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun.pre +++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Create background mesh runApplication blockMesh diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/Allrun.pre b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/Allrun.pre index a86d958660..020fb73544 100755 --- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/Allrun.pre +++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Generate mesh from surface (in constant/triSurface) runApplication extrudeMesh diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean index f2d7cca665..98dd91e627 100755 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cleanSamples diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun index 544ba54bad..5f74b6dd2a 100755 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean index 69fe9734a9..97d23e4226 100755 --- a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean +++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 cleanSamples diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun index 055484463a..eb149a1d05 100755 --- a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun +++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allclean b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allclean +++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allrun b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allrun index 528f1a0404..31795aa1f8 100755 --- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allrun +++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allclean b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allclean index d547ed8b57..021f9a67b0 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allclean +++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allrun index cb5a812f5e..e8072ad733 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication transformPoints -scale "(1 0 1)" diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun index 54368cee89..1bc5f6f547 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun index 54368cee89..1bc5f6f547 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allclean b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allclean index 794ee1b81e..028cdb25c4 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allclean +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allrun index 2b52d36edd..c71d337979 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication surfaceFeatureExtract diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allclean b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allclean index 1c48979f03..098307960e 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allclean +++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun index d726140ec7..c582601af0 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun.pre b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun.pre index 884b4cc6d5..9afe0cedc2 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun.pre +++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/externalSolver b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/externalSolver index dc5c6bbd21..317fa924f2 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/externalSolver +++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/externalSolver @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Dummy external solver to communicate with OpenFOAM via externalCoupled # functionObject diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun index 5db0a1c8e5..b069c38b3f 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./makeMesh runApplication $(getApplication) diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh index 6f4a3fffe3..57090307eb 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh +++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 < system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean index 2b124ecf38..fa8a8dfc8c 100755 --- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean +++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun index a8473e2070..435dafd769 100755 --- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Run function links the appropriate mesh files and clones the case run() diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean +++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun index e0f9af4df8..088ddcd325 100755 --- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean index 0686c27498..27a68f18bd 100755 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun index 1331199845..8348af0b8b 100755 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ echo "Use common files for 0/, constant/ and blockMeshDict" \rm -rf 0 constant diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean index 0686c27498..27a68f18bd 100755 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun index 1331199845..8348af0b8b 100755 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ echo "Use common files for 0/, constant/ and blockMeshDict" \rm -rf 0 constant diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allclean b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allclean index d547ed8b57..021f9a67b0 100755 --- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allclean +++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allrun b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allrun index cb5a812f5e..e8072ad733 100755 --- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allrun +++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication transformPoints -scale "(1 0 1)" diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun index 54368cee89..1bc5f6f547 100755 --- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun +++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean index 6eb1457dbc..b81308ff63 100755 --- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean +++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun index 32e8da429d..08d4a2aaf2 100755 --- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun +++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.mesh diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun.mesh b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun.mesh index d72a7aecf6..433eabf62d 100755 --- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun.mesh +++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun.mesh @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication surfaceFeatureExtract diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean index e681fce19f..56711ccc18 100755 --- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean +++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun index 8c157c9225..d5fb62d689 100755 --- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun +++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Convert mesh from resources directory runApplication star4ToFoam -scale 1 \ diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean index 69fe9734a9..97d23e4226 100755 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 cleanSamples diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun index b000d60c0f..b9d4cf52b4 100755 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/compressible/sonicLiquidFoam/Allclean b/tutorials/compressible/sonicLiquidFoam/Allclean index 2067a879ff..c29550da8c 100755 --- a/tutorials/compressible/sonicLiquidFoam/Allclean +++ b/tutorials/compressible/sonicLiquidFoam/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ removeCase decompressionTankFine foamCleanTutorials -self diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun index 539103fadd..5783f10592 100755 --- a/tutorials/compressible/sonicLiquidFoam/Allrun +++ b/tutorials/compressible/sonicLiquidFoam/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ setDecompressionTankFine() { diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean index 40d55b2780..0ea0fe80e8 100755 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun index ffa109248b..19bf00a902 100755 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication dsmcInitialise diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean index 40d55b2780..0ea0fe80e8 100755 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun index ffa109248b..19bf00a902 100755 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication dsmcInitialise diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean index 40d55b2780..0ea0fe80e8 100755 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun index 0c110250f6..81fa228b7c 100755 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication decomposePar diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean index 40d55b2780..0ea0fe80e8 100755 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun index 0c110250f6..81fa228b7c 100755 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication decomposePar diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean index 2b07ff650e..d339fd915d 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun index 2ec6f7b077..f429da9ee6 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication mdInitialise diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean index ca2f48ed94..de4a6f9529 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun index 2ec6f7b077..f429da9ee6 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication mdInitialise diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean index bc26045cbd..94302fe36d 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -rf processor[0-9] diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun index cd4b14a1f9..ce8fbd4a6e 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication decomposePar diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/Allclean b/tutorials/electromagnetics/mhdFoam/hartmann/Allclean index f2d7cca665..98dd91e627 100755 --- a/tutorials/electromagnetics/mhdFoam/hartmann/Allclean +++ b/tutorials/electromagnetics/mhdFoam/hartmann/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cleanSamples diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun index 23a6711db4..c9f32b5033 100755 --- a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun +++ b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allclean b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allclean index e852bce316..d7d93d437a 100755 --- a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allclean +++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cleanFaMesh diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun index f1511c6a4c..f207549b26 100755 --- a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun +++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean index b1673ba4c1..2bc5ca855b 100755 --- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean +++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanTimeDirectories diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun index c7b66d2c6e..f85e00b1df 100755 --- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun +++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication makeFaMesh diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel index 178280c9f9..8729c38a33 100755 --- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel +++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication makeFaMesh diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/Allclean b/tutorials/finiteArea/surfactantFoam/planeTransport/Allclean index e852bce316..d7d93d437a 100755 --- a/tutorials/finiteArea/surfactantFoam/planeTransport/Allclean +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cleanFaMesh diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun b/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun index f1511c6a4c..f207549b26 100755 --- a/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean index 01dae1a898..09f79e4c44 100755 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean +++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -f 0/T diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun index f8719a73da..702f175a27 100755 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun +++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh \cp 0/T.orig 0/T diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean index 01dae1a898..09f79e4c44 100755 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -f 0/T diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun index f8719a73da..702f175a27 100755 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh \cp 0/T.orig 0/T diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun index d0102481da..d30df690ac 100755 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun index 1e6177fd59..869182a7b5 100755 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allclean +++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun index e0f9af4df8..088ddcd325 100755 --- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun +++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean index 8ad093a08c..e719ed465c 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -f validation/*.eps diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun index 4c6c679c3f..5b605dd467 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean index 0e33c8258d..2907d2d9f7 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun index 357dac9b56..d6999403aa 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun index e0f9af4df8..088ddcd325 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun index e0f9af4df8..088ddcd325 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/Allclean index 342040ed73..f429ffa518 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/Allclean +++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 rm -rf constant/extendedFeatureEdgeMesh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/Allrun index 6a6927542d..584ebb4d51 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/Allrun +++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allclean index 9016f2cd4f..3c2e6a7a1b 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun index 25b14f2bb7..57031d0b17 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun.pre index d48a059e42..4c7b942d3c 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/externalSolver b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/externalSolver index 559fdd1ae3..0fc3f12b3f 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/externalSolver +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/externalSolver @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Dummy external solver to communicate with OpenFOAM via externalCoupled # functionObject # diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean index 66932422e0..1b62f31e6c 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 \rm allVisibleFaces.obj 2>/dev/null diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun index afb775bd7e..f1b440f686 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Setup case ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun-parallel index 3415a23574..a979447d86 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun-parallel +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Setup case ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre index e47b160200..9c696a8f4c 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean index 711e9348ef..2e76195c16 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index efa35f3218..dbf94315cd 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun.pre index fed7344328..d447fa5ec0 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allclean index 53071c9ab4..949547bf10 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allrun index 69d93eb543..68b6e13260 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean index 73ee293a5c..2fb31b75ec 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun-parallel index 5e3d452275..c74e82429e 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun-parallel +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ rm -rf constant/polyMesh/sets diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun-serial b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun-serial index df169f31dd..cd20166ef6 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun-serial +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun-serial @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ rm -rf constant/polyMesh/sets diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean index 001719f751..cd6acf86f4 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun index 51e2df24b4..79dabc1bea 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # create the underlying block mesh runApplication blockMesh diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun-parallel index d306f7901f..5fda76fc87 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun-parallel +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # create the underlying block mesh runApplication blockMesh diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean index 001719f751..cd6acf86f4 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun index 4a206678cd..2a91080485 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel index fcee42a202..6e6ce7c873 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre index 69ef3caa41..ef9eb777a1 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # create the underlying block mesh runApplication blockMesh diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allclean index 8421c96559..458716d072 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun index 25b14f2bb7..57031d0b17 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun.pre index d48a059e42..4c7b942d3c 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/externalSolver b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/externalSolver index 6123b21c00..8f6b9f5a29 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/externalSolver +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/externalSolver @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Dummy external solver to communicate with OpenFOAM via externalCoupled # functionObject # diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean index 2d12f3a3ee..1ae8682984 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun index 4a206678cd..2a91080485 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel index 2527a2edf5..daa14943ff 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre index 5e972ad1d5..4b8043f2c1 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Create meshes runApplication -s air blockMesh -region air diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allclean index 6d4b7f5c83..e61516f8d0 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun index b7d6fe2a4d..87973b2e38 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun-parallel index 26499f2115..ec19770665 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun-parallel +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun.pre index 4197c7f941..07b11abc0b 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Create meshe runApplication -s solid blockMesh -region solid diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean index 84fbcbcc3f..7c649775f2 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun index eecc8c8ce3..5015d6719a 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Setup case ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel index 0ea963af1d..dcb0d0c9ad 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Setup case ./Allrun.pre diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre index 85223fb20a..08a3576bd6 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allclean b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allclean index 0aed8a2281..0fc41d934f 100755 --- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allrun b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allrun index 3f3d938956..2a91080485 100755 --- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allrun @@ -1,13 +1,10 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -application=$(getApplication) +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre -runApplication $application +runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allrun.pre index bed1272eb3..b22cf80d33 100755 --- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allrun.pre +++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allclean b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allclean +++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allrun b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allrun index ad941f4ac5..6451e7454e 100755 --- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allrun +++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allrun.pre b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allrun.pre index abccd3163c..308bbee9fd 100755 --- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allrun.pre +++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun index 5db0a1c8e5..b069c38b3f 100755 --- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun +++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./makeMesh runApplication $(getApplication) diff --git a/tutorials/incompressible/adjointOptimisationFoam/Allrun b/tutorials/incompressible/adjointOptimisationFoam/Allrun index 0912ec72bb..e83f1fe8b5 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ if notTest $@ then diff --git a/tutorials/incompressible/adjointOptimisationFoam/motorBike/Allclean b/tutorials/incompressible/adjointOptimisationFoam/motorBike/Allclean index a0bb1b4d39..3a7ec0e9ca 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/motorBike/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/motorBike/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/adjointOptimisationFoam/motorBike/Allrun b/tutorials/incompressible/adjointOptimisationFoam/motorBike/Allrun index 03610ff0df..b1ce817b95 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/motorBike/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/motorBike/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Alternative decomposeParDict name: decompDict="-decomposeParDict system/decomposeParDict.20" diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/drag/Allclean b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/drag/Allclean index 289939fbe9..e8557c2554 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/drag/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/drag/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/drag/Allrun b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/drag/Allrun index ce49e97d66..0b2935e1a6 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/drag/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/drag/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/lift/Allclean b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/lift/Allclean index 289939fbe9..e8557c2554 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/lift/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/lift/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/lift/Allrun b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/lift/Allrun index ce49e97d66..0b2935e1a6 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/lift/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/lift/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/moment/Allclean b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/moment/Allclean index 289939fbe9..e8557c2554 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/moment/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/moment/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/moment/Allrun b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/moment/Allrun index ce49e97d66..0b2935e1a6 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/moment/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/laminar/moment/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftFullSetup/Allclean b/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftFullSetup/Allclean index 289939fbe9..e8557c2554 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftFullSetup/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftFullSetup/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftFullSetup/Allrun b/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftFullSetup/Allrun index ce49e97d66..0b2935e1a6 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftFullSetup/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftFullSetup/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftMinimumSetup/Allclean b/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftMinimumSetup/Allclean index 289939fbe9..e8557c2554 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftMinimumSetup/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftMinimumSetup/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftMinimumSetup/Allrun b/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftMinimumSetup/Allrun index ce49e97d66..0b2935e1a6 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftMinimumSetup/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/naca0012/turbulent/liftMinimumSetup/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/adjointOptimisationFoam/sbend/laminar/Allclean b/tutorials/incompressible/adjointOptimisationFoam/sbend/laminar/Allclean index 289939fbe9..e8557c2554 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/sbend/laminar/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/sbend/laminar/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/adjointOptimisationFoam/sbend/laminar/Allrun b/tutorials/incompressible/adjointOptimisationFoam/sbend/laminar/Allrun index 8a7f639223..709d51de20 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/sbend/laminar/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/sbend/laminar/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/highRe/Allclean b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/highRe/Allclean index 289939fbe9..e8557c2554 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/highRe/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/highRe/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/highRe/Allrun b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/highRe/Allrun index 805648768f..0e54d2da9d 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/highRe/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/highRe/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/multiPoint/Allrun b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/multiPoint/Allrun index 805648768f..0e54d2da9d 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/multiPoint/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/multiPoint/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/singlePoint/Allclean b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/singlePoint/Allclean index 289939fbe9..e8557c2554 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/singlePoint/Allclean +++ b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/singlePoint/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/singlePoint/Allrun b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/singlePoint/Allrun index 805648768f..0e54d2da9d 100755 --- a/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/singlePoint/Allrun +++ b/tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/singlePoint/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ resourcesDir=$FOAM_TUTORIALS/incompressible/adjointOptimisationFoam/resources diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean index 53c93d35b8..e83c3d283f 100755 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun index 4f1949fd46..0c3635d7b0 100755 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/icoFoam/cavity/Allclean b/tutorials/incompressible/icoFoam/cavity/Allclean index 4431913e3b..ccade01d5c 100755 --- a/tutorials/incompressible/icoFoam/cavity/Allclean +++ b/tutorials/incompressible/icoFoam/cavity/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ keepCases="cavity cavityGrade cavityClipped" loseCases="cavityFine cavityHighRe" diff --git a/tutorials/incompressible/icoFoam/cavity/Allrun b/tutorials/incompressible/icoFoam/cavity/Allrun index c1454a2861..322be8f1e3 100755 --- a/tutorials/incompressible/icoFoam/cavity/Allrun +++ b/tutorials/incompressible/icoFoam/cavity/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped" diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean b/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean index 63145a3803..314c10a431 100755 --- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean +++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -rf constant/coarseMesh diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun index 7d2e323843..bcc22fee98 100755 --- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun +++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication -s coarseMesh blockMesh -dict system/blockMeshDict.coarse diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel index 524002c6ec..89785ed735 100755 --- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel +++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication -s coarseMesh blockMesh -dict system/blockMeshDict.coarse diff --git a/tutorials/incompressible/icoFoam/elbow/Allclean b/tutorials/incompressible/icoFoam/elbow/Allclean index 7238840f83..a3d2f17cbf 100755 --- a/tutorials/incompressible/icoFoam/elbow/Allclean +++ b/tutorials/incompressible/icoFoam/elbow/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -rf fluentInterface diff --git a/tutorials/incompressible/icoFoam/elbow/Allrun b/tutorials/incompressible/icoFoam/elbow/Allrun index a42f83926b..3c3bc90645 100755 --- a/tutorials/incompressible/icoFoam/elbow/Allrun +++ b/tutorials/incompressible/icoFoam/elbow/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication fluentMeshToFoam elbow.msh runApplication $(getApplication) diff --git a/tutorials/incompressible/lumpedPointMotion/building/Allrun b/tutorials/incompressible/lumpedPointMotion/building/Allrun index a4568e0b0c..c28467b386 100755 --- a/tutorials/incompressible/lumpedPointMotion/building/Allrun +++ b/tutorials/incompressible/lumpedPointMotion/building/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # 1) First run steady-state to establish a good initial field. # 2) Copy the latest state-state results for the transient case, diff --git a/tutorials/incompressible/lumpedPointMotion/building/Allrun.move b/tutorials/incompressible/lumpedPointMotion/building/Allrun.move index 3f539c8c7e..a11a98bb9c 100755 --- a/tutorials/incompressible/lumpedPointMotion/building/Allrun.move +++ b/tutorials/incompressible/lumpedPointMotion/building/Allrun.move @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # 1) Run meshing # 2) Reconstruct diff --git a/tutorials/incompressible/lumpedPointMotion/building/files/Allrun.movement b/tutorials/incompressible/lumpedPointMotion/building/files/Allrun.movement index 82baeb53be..95d097375d 100755 --- a/tutorials/incompressible/lumpedPointMotion/building/files/Allrun.movement +++ b/tutorials/incompressible/lumpedPointMotion/building/files/Allrun.movement @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # The 0/ field only # runApplication reconstructPar -withZero -time 0 diff --git a/tutorials/incompressible/lumpedPointMotion/building/files/Allrun.transient b/tutorials/incompressible/lumpedPointMotion/building/files/Allrun.transient index 951dd76adb..294dd49556 100755 --- a/tutorials/incompressible/lumpedPointMotion/building/files/Allrun.transient +++ b/tutorials/incompressible/lumpedPointMotion/building/files/Allrun.transient @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Cleanup old junk that may prevent things from starting \rm -f comms/OpenFOAM.lock diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/Allclean b/tutorials/incompressible/lumpedPointMotion/building/steady/Allclean index a682e661d1..75a9307f3a 100755 --- a/tutorials/incompressible/lumpedPointMotion/building/steady/Allclean +++ b/tutorials/incompressible/lumpedPointMotion/building/steady/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/Allrun b/tutorials/incompressible/lumpedPointMotion/building/steady/Allrun index fd9ff050c4..20d8cfd609 100755 --- a/tutorials/incompressible/lumpedPointMotion/building/steady/Allrun +++ b/tutorials/incompressible/lumpedPointMotion/building/steady/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/Allrun.pre b/tutorials/incompressible/lumpedPointMotion/building/steady/Allrun.pre index fb357cee78..608b06635a 100755 --- a/tutorials/incompressible/lumpedPointMotion/building/steady/Allrun.pre +++ b/tutorials/incompressible/lumpedPointMotion/building/steady/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Copy building from resources directory mkdir -p constant/triSurface/ diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun b/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun index 2d31897a48..b33335d4ae 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun +++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # An extruded mesh around cylinder (cd cylinderMesh && ./Allrun.pre) diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun.pre b/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun.pre index d87c892a62..a16bf252a5 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun.pre +++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Extrude mesh around cylinder (cd cylinderMesh && ./Allrun.pre) diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allclean b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allclean +++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allrun b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allrun index 6751923556..b6b22e10a9 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allrun +++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allrun.pre b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allrun.pre index fb7e1120bd..82380faff0 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allrun.pre +++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Create background mesh runApplication blockMesh diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/Allrun.pre b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/Allrun.pre index a86d958660..020fb73544 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/Allrun.pre +++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Generate mesh from surface (in constant/triSurface) runApplication extrudeMesh diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allclean b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allclean +++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allrun b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allrun index 2ac685b863..9b2c7c33de 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allrun +++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allrun.pre b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allrun.pre index 97b99ad7c6..59fa20329f 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allrun.pre +++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allclean b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allclean +++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allrun b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allrun index cd2da7c142..68d65d6908 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allrun +++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allrun.pre b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allrun.pre index abccd3163c..308bbee9fd 100755 --- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allrun.pre +++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/Allclean b/tutorials/incompressible/overSimpleFoam/aeroFoil/Allclean index b7522e086b..acf84fc3f6 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/Allclean +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ for caseName in aeroFoil_snappyHexMesh background_snappyHexMesh do diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/Allrun b/tutorials/incompressible/overSimpleFoam/aeroFoil/Allrun index 96bbd15dee..c8900e50a4 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/Allrun +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre ( cd background_overset && ./Allrun ) diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/Allrun.pre b/tutorials/incompressible/overSimpleFoam/aeroFoil/Allrun.pre index e3784e5ab6..51d489ce75 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/Allrun.pre +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Create aeroFoil mesh using snappyHexMesh ( cd aeroFoil_snappyHexMesh && ./Allrun.pre ) diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/Allrun.pre b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/Allrun.pre index 66379c68c1..4138f49508 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/Allrun.pre +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Make a 2D mesh by extruding a patch and solve to steady state. runApplication extrudeMesh diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/Allrun.pre b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/Allrun.pre index 7525ed4239..a12136770e 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/Allrun.pre +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Make 3D mesh in slab of cells. runApplication blockMesh diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allclean b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allclean +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allrun b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allrun index c290d0dd5e..baf931cdc5 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allrun +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Serial #runApplication $(getApplication) diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allrun.pre b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allrun.pre index 4ce424d93f..e19a2507e7 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allrun.pre +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication extrudeMesh runApplication createPatch -overwrite diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/Allrun.pre b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/Allrun.pre index c221f0abd3..7a00d4bdf4 100755 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/Allrun.pre +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Make 3D mesh in slab of cells. runApplication blockMesh diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun b/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun index 08e91994a5..b5069031bd 100755 --- a/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/Allrun b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/Allrun index d6690e27ed..7bd764e893 100755 --- a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/Allclean b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/Allclean index 55b9f196c9..f65bd29f74 100755 --- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/Allclean +++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/Allrun b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/Allrun index c72455aaad..c72c26537c 100755 --- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun index cc19a5cc50..a6c04207fd 100755 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ (cd steadyState && ./Allrun) diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/Allrun index 76bc1a0088..a5100b8e88 100755 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allrun index e9f619eed0..3d10834d21 100755 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ echo "Linking processor*/ directory" for proc in $(\ls -d ../steadyState/processor*) diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allclean b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allclean index 68b0e3cddd..9d014285a5 100755 --- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allclean +++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase \rm -rf constant/boundaryData *.png diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allrun b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allrun index eeae06e87c..7c710b144a 100755 --- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ channelCase=../initChannel channelDataDir=$channelCase/postProcessing/surfaces/inlet diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/Allclean b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/Allclean index 6f39374d14..20570952aa 100755 --- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/Allclean +++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/Allrun b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/Allrun index 89269cb7eb..562a8539d6 100755 --- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allclean b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allclean +++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun index 5f0721f590..6a84799376 100755 --- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ rm -f system/blockMeshDict m4 system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allclean b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun index 7a41c21568..9f024cb1a8 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allclean b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allclean index 08f9ce2fad..0b9f2bbd48 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allclean @@ -1,10 +1,10 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 rm -f ppGeometry.vtp 2>/dev/null - #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun index f54b7a529e..56d5f6988b 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./Allrun.pre diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun-parallel b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun-parallel index e23148eef9..fcd03d4c7e 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun-parallel +++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./Allrun.pre diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun.pre index e56b451b78..7aa84ed482 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun.pre +++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication transformPoints -scale '(1.6666 1 1)' diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allclean b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun index 4a206678cd..2a91080485 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel index c9e323cdb7..a3e09fdcc4 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre index 3d4d5ecf6f..ee206e0a7e 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean index 88ad2ecc84..2c68b22b70 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun index c9e323cdb7..a3e09fdcc4 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre index 78478afc1e..73f3089c1e 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy propeller surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/ diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allclean b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allclean index a9ed62923e..d6a9c54b76 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allrun b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allrun index c9e323cdb7..a3e09fdcc4 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allrun.pre index 747230604c..14cfb9ef36 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allrun.pre +++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # - meshing runApplication surfaceFeatureExtract diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean index 0e00deb36c..38f1b6d21e 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean @@ -1,11 +1,10 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ ( cd wingMotion_snappyHexMesh && cleanCase ) - ( cd wingMotion2D_simpleFoam && cleanCase0 ) - ( cd wingMotion2D_pimpleFoam && cleanCase0 ) #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun index 9b8c732884..c7a4482b86 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Make 3D mesh in slab of cells. ( diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun index 9450e8b3f6..74684c8ffc 100755 --- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun +++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./makeMesh diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh index fc56e7be3c..6e03b018ca 100755 --- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh +++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 < system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean index bb826d2457..d6f99365fb 100755 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -rf *.dat validation/*.eps diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun index 784b7fab75..0135c39b37 100755 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/Allclean b/tutorials/incompressible/pisoFoam/LES/motorBike/Allclean index 507327c90a..873b751367 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/Allclean +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ (cd motorBike && ./Allclean) diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun index cb72a01227..8285c7ece8 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Do the Spalart-Allmaras steady-state case (cd motorBike && foamRunTutorials) diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun index 5bd3017bd2..20b46894d6 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Set-up the LES case \cp ../lesFiles/fvS* ../lesFiles/controlDict system/ diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean index d4886e9227..d2b49b164f 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun index 895be49887..a08ca47dd7 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy motorbike surface from resources directory \cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/ diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun index f88fe7fd92..4496910459 100755 --- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun +++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean index 0686c27498..27a68f18bd 100755 --- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun index 1331199845..8348af0b8b 100755 --- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ echo "Use common files for 0/, constant/ and blockMeshDict" \rm -rf 0 constant diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean index 0686c27498..27a68f18bd 100755 --- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun index 1331199845..8348af0b8b 100755 --- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ echo "Use common files for 0/, constant/ and blockMeshDict" \rm -rf 0 constant diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean index d6454c597f..0fda2348a4 100755 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun index 4a206678cd..2a91080485 100755 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre index d8dd070214..f29680eca4 100755 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication surfaceFeatureExtract diff --git a/tutorials/incompressible/simpleFoam/T3A/Allclean b/tutorials/incompressible/simpleFoam/T3A/Allclean index 8ad093a08c..e719ed465c 100755 --- a/tutorials/incompressible/simpleFoam/T3A/Allclean +++ b/tutorials/incompressible/simpleFoam/T3A/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -f validation/*.eps diff --git a/tutorials/incompressible/simpleFoam/T3A/Allrun b/tutorials/incompressible/simpleFoam/T3A/Allrun index c43f998573..f3fd335e40 100755 --- a/tutorials/incompressible/simpleFoam/T3A/Allrun +++ b/tutorials/incompressible/simpleFoam/T3A/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun index 16a6a8651d..136dcbed91 100755 --- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun +++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication $(getApplication) diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allclean b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allclean index d839638c59..a2837014bc 100755 --- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allclean +++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allrun b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allrun index fcf73728f7..611bccf948 100755 --- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allrun +++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication simpleFoam diff --git a/tutorials/incompressible/simpleFoam/bump2D/Allclean b/tutorials/incompressible/simpleFoam/bump2D/Allclean index 9960709f40..6fdd3e5800 100755 --- a/tutorials/incompressible/simpleFoam/bump2D/Allclean +++ b/tutorials/incompressible/simpleFoam/bump2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase \rm -f *.png diff --git a/tutorials/incompressible/simpleFoam/bump2D/Allrun b/tutorials/incompressible/simpleFoam/bump2D/Allrun index 7013a485b1..1233420b53 100755 --- a/tutorials/incompressible/simpleFoam/bump2D/Allrun +++ b/tutorials/incompressible/simpleFoam/bump2D/Allrun @@ -1,7 +1,8 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/incompressible/simpleFoam/bump2D/plot b/tutorials/incompressible/simpleFoam/bump2D/plot index a30f46d332..3d0444c869 100755 --- a/tutorials/incompressible/simpleFoam/bump2D/plot +++ b/tutorials/incompressible/simpleFoam/bump2D/plot @@ -1,13 +1,14 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + # Note: CFL3D data available from: # https://turbmodels.larc.nasa.gov/bump_sa.html # The CFL3D-SpalartAllmaras datasets of Cf and Cp: # Cf = https://turbmodels.larc.nasa.gov/Bump/SA/cf_bump.dat # Cp = https://turbmodels.larc.nasa.gov/Bump/SA/cp_bump.dat -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - plotCf() { declare -a resultSet=("${!1}") diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun index 5db0a1c8e5..b069c38b3f 100755 --- a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun +++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./makeMesh runApplication $(getApplication) diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh index 0caafbabf9..8512eff976 100755 --- a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh +++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 < system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allclean b/tutorials/incompressible/simpleFoam/motorBike/Allclean index a0bb1b4d39..3a7ec0e9ca 100755 --- a/tutorials/incompressible/simpleFoam/motorBike/Allclean +++ b/tutorials/incompressible/simpleFoam/motorBike/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun index 4654c95afe..db24cb629a 100755 --- a/tutorials/incompressible/simpleFoam/motorBike/Allrun +++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Alternative decomposeParDict name: decompDict="-decomposeParDict system/decomposeParDict.6" diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean b/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean +++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun index 9b8ed30d97..7a1859f5b2 100755 --- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun +++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean index 09925d447d..d01deab706 100755 --- a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean +++ b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/Allrun b/tutorials/incompressible/simpleFoam/rotorDisk/Allrun index 12d9aa38bf..59e951d3db 100755 --- a/tutorials/incompressible/simpleFoam/rotorDisk/Allrun +++ b/tutorials/incompressible/simpleFoam/rotorDisk/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Meshing runApplication blockMesh diff --git a/tutorials/incompressible/simpleFoam/simpleCar/Allrun b/tutorials/incompressible/simpleFoam/simpleCar/Allrun index 2a7ff56032..f09a124beb 100755 --- a/tutorials/incompressible/simpleFoam/simpleCar/Allrun +++ b/tutorials/incompressible/simpleFoam/simpleCar/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean index c357ba7bfe..233729ef41 100755 --- a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean +++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun index ef45fe0dd5..fbb23d79fc 100755 --- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun +++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Make dummy 0 directory mkdir 0 diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean index 447b72d0f3..a3fc7adfde 100755 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean @@ -1,11 +1,11 @@ -#!/bin/bash -#set -x - -cd ${0%/*} || exit 1 - -. $WM_PROJECT_DIR/bin/tools/CleanFunctions +#!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase \rm -rf 0 postProcessing-* \rm -f *.dat *.png constant/turbulenceProperties + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun index 0e22182d9e..c7734d84ec 100755 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ if notTest $@ then diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean index 98ff9b6209..da26f385ba 100755 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun index 30cbfe82f6..cae90c8fbd 100755 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./Allrun.pre diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel index 87dec4ec71..717b8a882e 100755 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./Allrun.pre diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre index 1a27e138e4..549e727361 100755 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication surfaceFeatureExtract diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean index d4f2a95a0e..470bd39c79 100755 --- a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean +++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun index 680e22fbc3..e278452263 100755 --- a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun +++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ cp $FOAM_TUTORIALS/resources/geometry/cyclone.stl.gz constant/triSurface diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun index 61c2efb007..91f8ced907 100755 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun-parallel b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun-parallel index da47afd7a0..4b2b6c2a17 100755 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun-parallel +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun index 413155fdb0..4dc771c494 100755 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 < system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean index d837e1f760..bef51e89ce 100755 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ ( cd hopperInitialState && cleanCase ) diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun index 94d4202af0..b493b007af 100755 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ( cd hopperInitialState || exit 1 diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allclean b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allclean index 51e9ee16ca..107833d305 100755 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun index 4a206678cd..2a91080485 100755 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre index 1f5781ea73..f384c7ed4b 100755 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun index 683c4a31e0..7145df146e 100755 --- a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun-parallel b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun-parallel index 268bd680fb..160b6cfc33 100755 --- a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun-parallel +++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allclean b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allclean index 9b60dae89e..167cd9815f 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun index 4a206678cd..2a91080485 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel index 7598bf2539..034abb394c 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre index 4a6913188f..3379bd6551 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allclean b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allclean index 51e9ee16ca..107833d305 100755 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun index 4a206678cd..2a91080485 100755 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre index 4002157fcf..21f044d531 100755 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allclean b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allclean index 51e9ee16ca..107833d305 100755 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun index 4a206678cd..2a91080485 100755 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun.pre index 1722219969..57c00ce1fa 100755 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun index 9edda44dd8..bc51bb39ce 100755 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # create mesh runApplication blockMesh diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun index 9edda44dd8..bc51bb39ce 100755 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # create mesh runApplication blockMesh diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun index c2c258a824..49678d0039 100755 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun-parallel b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun-parallel index b97529d442..81abdd4443 100755 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun-parallel +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/mesh/PDRblockMesh/box0/Allrun b/tutorials/mesh/PDRblockMesh/box0/Allrun index dc4cece02f..b5185c4818 100755 --- a/tutorials/mesh/PDRblockMesh/box0/Allrun +++ b/tutorials/mesh/PDRblockMesh/box0/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication PDRblockMesh runApplication checkMesh diff --git a/tutorials/mesh/blockMesh/pipe/Allrun b/tutorials/mesh/blockMesh/pipe/Allrun index a33126fcfd..71433f95e1 100755 --- a/tutorials/mesh/blockMesh/pipe/Allrun +++ b/tutorials/mesh/blockMesh/pipe/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/blockMesh/sphere/Allrun b/tutorials/mesh/blockMesh/sphere/Allrun index a33126fcfd..71433f95e1 100755 --- a/tutorials/mesh/blockMesh/sphere/Allrun +++ b/tutorials/mesh/blockMesh/sphere/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/blockMesh/sphere7/Allrun b/tutorials/mesh/blockMesh/sphere7/Allrun index a33126fcfd..71433f95e1 100755 --- a/tutorials/mesh/blockMesh/sphere7/Allrun +++ b/tutorials/mesh/blockMesh/sphere7/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/Allrun b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/Allrun index a33126fcfd..71433f95e1 100755 --- a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/Allrun +++ b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/foamyHexMesh/Allrun b/tutorials/mesh/foamyHexMesh/Allrun index dd1c7d2c41..fda07445f3 100755 --- a/tutorials/mesh/foamyHexMesh/Allrun +++ b/tutorials/mesh/foamyHexMesh/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Any cases that are links to solver test cases and are run when the Allrun # scripts of those solvers are run. This script avoids meshing these cases diff --git a/tutorials/mesh/foamyHexMesh/blob/Allclean b/tutorials/mesh/foamyHexMesh/blob/Allclean index 1b3fad50fc..42832f4221 100755 --- a/tutorials/mesh/foamyHexMesh/blob/Allclean +++ b/tutorials/mesh/foamyHexMesh/blob/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun b/tutorials/mesh/foamyHexMesh/blob/Allrun index b4c8454ee3..e529d75222 100755 --- a/tutorials/mesh/foamyHexMesh/blob/Allrun +++ b/tutorials/mesh/foamyHexMesh/blob/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy flange surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/ diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel index 32429bd239..ab8ae66f81 100755 --- a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel +++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy flange surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/ diff --git a/tutorials/mesh/foamyHexMesh/flange/Allclean b/tutorials/mesh/foamyHexMesh/flange/Allclean index c4e27e7164..25e1670d97 100755 --- a/tutorials/mesh/foamyHexMesh/flange/Allclean +++ b/tutorials/mesh/foamyHexMesh/flange/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun b/tutorials/mesh/foamyHexMesh/flange/Allrun index 5487824ca4..232e706eb6 100755 --- a/tutorials/mesh/foamyHexMesh/flange/Allrun +++ b/tutorials/mesh/foamyHexMesh/flange/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy flange surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/ diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel index c9e154a60c..d30107e142 100755 --- a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel +++ b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy flange surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/ diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean index 7a64d7a6b5..e90832f2f3 100755 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun index 5aabd4c3ee..21ded794f3 100755 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Generate mesh ./Allrun-pre diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre index fa89b7f6c3..703e2a3efd 100755 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ intersectSurfaces() { diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation index a7922952e6..2ffb97dbd5 100755 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ cp system/controlDict.flow system/controlDict diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean index 42523e30e7..88f6dd2594 100755 --- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean +++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun index 482564c8b5..5446cfebfe 100755 --- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun +++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication -s cone \ surfaceOrient constant/triSurface/cone.stl \ diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean index 26eaea4667..f3b6e87834 100755 --- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean +++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun index f22a5824bb..0f1cc9fd8d 100755 --- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun +++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Make sure surface is oriented properly. Since the letters # contain disconnected regions use diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam index c4060eedef..5f82d66ef3 100755 --- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam +++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ \cp system/controlDict.rhoCentralFoam system/controlDict restore0Dir diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean index 429017895d..5806b40605 100755 --- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean +++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun index f559f8204e..f7e44fd471 100755 --- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun +++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication surfaceFeatureExtract runApplication foamyQuadMesh -overwrite diff --git a/tutorials/mesh/foamyQuadMesh/square/Allclean b/tutorials/mesh/foamyQuadMesh/square/Allclean index dc764a614a..347cb05b9b 100755 --- a/tutorials/mesh/foamyQuadMesh/square/Allclean +++ b/tutorials/mesh/foamyQuadMesh/square/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/mesh/foamyQuadMesh/square/Allrun b/tutorials/mesh/foamyQuadMesh/square/Allrun index f72c275f01..67b82efa9b 100755 --- a/tutorials/mesh/foamyQuadMesh/square/Allrun +++ b/tutorials/mesh/foamyQuadMesh/square/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication surfaceFeatureExtract runApplication foamyQuadMesh -overwrite diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allclean b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allclean index 57317ddb1f..7ed1bddaac 100755 --- a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allclean +++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ ( cd box_snappyHexMesh && cleanCase ) diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun index 785ab59cd0..d2ec3805d5 100755 --- a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun +++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Make 3D mesh in slab of cells. ( diff --git a/tutorials/mesh/parallel/cavity/Allclean b/tutorials/mesh/parallel/cavity/Allclean index 3bd36a4b03..9a688e1654 100755 --- a/tutorials/mesh/parallel/cavity/Allclean +++ b/tutorials/mesh/parallel/cavity/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/mesh/parallel/cavity/Allrun b/tutorials/mesh/parallel/cavity/Allrun index fdb4a734ca..af6461fc94 100755 --- a/tutorials/mesh/parallel/cavity/Allrun +++ b/tutorials/mesh/parallel/cavity/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/parallel/filter/Allclean b/tutorials/mesh/parallel/filter/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/mesh/parallel/filter/Allclean +++ b/tutorials/mesh/parallel/filter/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/parallel/filter/Allrun b/tutorials/mesh/parallel/filter/Allrun index 5ac013e09f..1fec245a4e 100755 --- a/tutorials/mesh/parallel/filter/Allrun +++ b/tutorials/mesh/parallel/filter/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ application=$(getApplication) diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/Allclean b/tutorials/mesh/refineMesh/refineFieldDirs/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/mesh/refineMesh/refineFieldDirs/Allclean +++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/Allrun b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun index 5093f553b3..1e65454375 100755 --- a/tutorials/mesh/refineMesh/refineFieldDirs/Allrun +++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ wmake calcRadiusField wclean calcRadiusField diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean +++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allrun b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allrun index 0ee02ee226..d201cf0433 100755 --- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allrun +++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allrun @@ -1,7 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions - +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/Allrun b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/Allrun index 3921a01604..1768a89306 100755 --- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/Allrun +++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication snappyHexMesh diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/Allclean b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/Allclean index a13b9c2ab8..3a1b7027d4 100755 --- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/Allclean +++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/Allrun b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/Allrun index f3be65de24..e13f3648e5 100755 --- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/Allrun +++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/snappyHexMesh/flange/Allclean b/tutorials/mesh/snappyHexMesh/flange/Allclean index 69d183efe5..3d53d6fc63 100755 --- a/tutorials/mesh/snappyHexMesh/flange/Allclean +++ b/tutorials/mesh/snappyHexMesh/flange/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/snappyHexMesh/flange/Allrun b/tutorials/mesh/snappyHexMesh/flange/Allrun index 8e2c10e1ed..9476bfeaf7 100755 --- a/tutorials/mesh/snappyHexMesh/flange/Allrun +++ b/tutorials/mesh/snappyHexMesh/flange/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy flange surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/ diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/Allclean b/tutorials/mesh/snappyHexMesh/gap_detection/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/mesh/snappyHexMesh/gap_detection/Allclean +++ b/tutorials/mesh/snappyHexMesh/gap_detection/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/Allrun b/tutorials/mesh/snappyHexMesh/gap_detection/Allrun index afb0ddb734..1322aa4ec4 100755 --- a/tutorials/mesh/snappyHexMesh/gap_detection/Allrun +++ b/tutorials/mesh/snappyHexMesh/gap_detection/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/Allrun b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/Allrun index 4ae5f0cec8..42bb8606cc 100755 --- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/Allrun +++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/Allclean b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/Allclean index 663d8a70a9..fdeb115346 100755 --- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/Allclean +++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/Allrun b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/Allrun index 9b1a0bde55..149095e62c 100755 --- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/Allrun +++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Alternative decomposeParDict name: decompDict="-decomposeParDict system/decomposeParDict.6" diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/Allclean b/tutorials/mesh/snappyHexMesh/opposite_walls/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/mesh/snappyHexMesh/opposite_walls/Allclean +++ b/tutorials/mesh/snappyHexMesh/opposite_walls/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/Allrun b/tutorials/mesh/snappyHexMesh/opposite_walls/Allrun index b97b2ffde1..9b412fc068 100755 --- a/tutorials/mesh/snappyHexMesh/opposite_walls/Allrun +++ b/tutorials/mesh/snappyHexMesh/opposite_walls/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/mesh/stitchMesh/simple-cube1/Allclean b/tutorials/mesh/stitchMesh/simple-cube1/Allclean index d6d329b5ff..cf7138f2d2 100755 --- a/tutorials/mesh/stitchMesh/simple-cube1/Allclean +++ b/tutorials/mesh/stitchMesh/simple-cube1/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 rmdir constant 2> /dev/null diff --git a/tutorials/mesh/stitchMesh/simple-cube1/Allmesh b/tutorials/mesh/stitchMesh/simple-cube1/Allmesh index 3f973d4f6b..33f1381770 100755 --- a/tutorials/mesh/stitchMesh/simple-cube1/Allmesh +++ b/tutorials/mesh/stitchMesh/simple-cube1/Allmesh @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/mesh/stitchMesh/simple-cube1/Allrun b/tutorials/mesh/stitchMesh/simple-cube1/Allrun index 9957423e6e..121755665e 100755 --- a/tutorials/mesh/stitchMesh/simple-cube1/Allrun +++ b/tutorials/mesh/stitchMesh/simple-cube1/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./Allmesh diff --git a/tutorials/mesh/stitchMesh/simple-cube1/Allrun-args b/tutorials/mesh/stitchMesh/simple-cube1/Allrun-args index b5397f82d3..aa4eaab99c 100755 --- a/tutorials/mesh/stitchMesh/simple-cube1/Allrun-args +++ b/tutorials/mesh/stitchMesh/simple-cube1/Allrun-args @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./Allmesh diff --git a/tutorials/mesh/stitchMesh/simple-cube1/scripts/stitch b/tutorials/mesh/stitchMesh/simple-cube1/scripts/stitch index fd63d6d682..8865ad9e10 100755 --- a/tutorials/mesh/stitchMesh/simple-cube1/scripts/stitch +++ b/tutorials/mesh/stitchMesh/simple-cube1/scripts/stitch @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ [ "$#" -gt 0 ] || { echo "provide x, y, z or -all directions" diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean index 8b16e2858e..3ed4c04a2c 100755 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun index b2023e2d8f..ad9fd18f01 100755 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # create the underlying block mesh m4 system/pachuka.m4 > system/blockMeshDict diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean index 7e94847a48..49b95f0bb3 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun index 1b1d5e80a0..190ea57a74 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ refineMeshByCellSet() { diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean index d695acbf07..8817e7ab4b 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun index 15a39575b7..aa4b900b54 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ refineMeshByCellSet() { diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean index 7e94847a48..49b95f0bb3 100755 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun index 1b1d5e80a0..190ea57a74 100755 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ refineMeshByCellSet() { diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun index c63280a960..75b0b625cf 100755 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allclean b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allclean +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun index 55bb318bf3..59cc4d8d97 100755 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun-parallel b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun-parallel index e66ceb6b8f..d91fc580cd 100755 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun-parallel +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun index 8f11c77e3f..ed2e7082b0 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication extrudeMesh diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun index 423e9ec833..e8157d67f2 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh restore0Dir diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean index 3b8c6e8e2f..54c07563fa 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 rm -rf processor* diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun index bdb96428fa..675a6c956e 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh restore0Dir diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun index efced0038e..fce061485e 100755 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun index 6aeae15553..190a9840fd 100755 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./makeMesh runApplication $(getApplication) diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun index 16a6a8651d..136dcbed91 100755 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication $(getApplication) diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allclean b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allclean +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun index efced0038e..fce061485e 100755 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allclean b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allclean +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun index efced0038e..fce061485e 100755 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allclean b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allclean +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun index 5aace967ac..b17300cb71 100755 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ application=$(getApplication) diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allclean b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allclean index 20ea2353bb..34c27ce61d 100755 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allclean +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm system/topoSetDict > /dev/null 2>&1 diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun index dc59cb1831..cfa8a8c924 100755 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean index 9c855955a4..218cfbeef1 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun index 2bd2c19a2f..ac333f9ecc 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy DTC hull surface from resources folder \cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean index 6149df2bfa..f6e7bddddd 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun index 975e30d65e..199fc81ac4 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy DTC hull surface from resources folder cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/ diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun b/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun index 54368cee89..1bc5f6f547 100755 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/Allclean b/tutorials/multiphase/interFoam/RAS/damBreak/Allclean index a818e3ba0e..7608832fc4 100755 --- a/tutorials/multiphase/interFoam/RAS/damBreak/Allclean +++ b/tutorials/multiphase/interFoam/RAS/damBreak/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ keepCases="damBreak" loseCases="damBreakFine" diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun index 156eceb207..2ba44b6776 100755 --- a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun +++ b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ setDamBreakFine () { diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allclean index f578727b2f..f844732f6a 100755 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allclean +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase \cp 0/alpha.water.orig 0/alpha.water diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun index 5bd0f99f30..edff8a339d 100755 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication setFields diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allclean b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allclean index f578727b2f..f844732f6a 100755 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allclean +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase \cp 0/alpha.water.orig 0/alpha.water diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun index 7d16543244..a78d851364 100755 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication setFields diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/Allclean b/tutorials/multiphase/interFoam/RAS/floatingObject/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/Allclean +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun b/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun index 7aede960f7..cd227b5d5e 100755 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean index 9f8dfd7808..11ce459dad 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun index 62fbd9b214..4a4de7794e 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre index 684bc56996..38e3dcf5e2 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ \rm -rf 0 diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/Allclean b/tutorials/multiphase/interFoam/RAS/motorBike/Allclean index a8a5c30fc0..13ecb95a64 100755 --- a/tutorials/multiphase/interFoam/RAS/motorBike/Allclean +++ b/tutorials/multiphase/interFoam/RAS/motorBike/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/Allrun b/tutorials/multiphase/interFoam/RAS/motorBike/Allrun index e2641b8934..b8d4678f28 100755 --- a/tutorials/multiphase/interFoam/RAS/motorBike/Allrun +++ b/tutorials/multiphase/interFoam/RAS/motorBike/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre b/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre index 030f1f8113..49bcd93f9d 100755 --- a/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre +++ b/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy motorbike surface from resources directory \cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/ diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean b/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean index b5e3d9ce88..7d44818d3f 100755 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh index d0b3f75378..b72b34c84e 100755 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun b/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun index 072b6d2b19..133515ae79 100755 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allmesh diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun index c710725926..0818d6f789 100755 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun index 42050e1779..12a2ede0d1 100755 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh \cp 0/alpha.water.orig 0/alpha.water diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean index a818e3ba0e..7608832fc4 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreak/Allclean +++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ keepCases="damBreak" loseCases="damBreakFine" diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun index 7380914b2a..2de83a9405 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun +++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ setDamBreakFine () { diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean index f578727b2f..f844732f6a 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase \cp 0/alpha.water.orig 0/alpha.water diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun index 5bd0f99f30..edff8a339d 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication setFields diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allclean b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allclean index dced1dda72..48516d0f4f 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allclean +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun index 4c6e367d38..9e66b26663 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun index 3aa1e7a9dd..5f6eab94f9 100755 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./makeMesh \cp 0/alpha.water.orig 0/alpha.water diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun index 9fa872e193..eff0714424 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication snappyHexMesh -overwrite diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun index ae24f74396..c9defa12df 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun index ae24f74396..c9defa12df 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun index ae24f74396..c9defa12df 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun index faada17ac6..00a7c77d2e 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun index c63280a960..75b0b625cf 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allclean b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allclean index e068de2b13..390a5cd309 100755 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allclean +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase rm -rf 0/alpha.water diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun index a96f714b60..9cd6307290 100755 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh cp 0/alpha.water.orig 0/alpha.water diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun index 2d0315eac3..ff423da5a7 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ (cd eulerianInjection && ./Allrun $*) diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allclean b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allclean +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun index bf653b6483..338caa0a51 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication -s createBlockage topoSet -dict system/topoSetDict.createBlockage diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allclean b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allclean +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun index 595da75065..94820b0fe3 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ eulerianCase=../eulerianInjection diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allclean b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allclean +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun index 24fab8cccb..94820b0fe3 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ eulerianCase=../eulerianInjection @@ -56,5 +57,4 @@ runApplication blockMesh runApplication $(getApplication) - #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allclean b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allrun b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allclean b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allrun b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allclean b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allrun b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allrun index 471e2eeb5f..070006d22b 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/Allclean b/tutorials/multiphase/interFoam/laminar/waves/solitary/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/Allrun b/tutorials/multiphase/interFoam/laminar/waves/solitary/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allclean b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allrun b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allclean b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allrun b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allclean b/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allrun b/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allclean b/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allrun b/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allclean b/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allrun b/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allclean b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allrun b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allclean b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allrun b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allclean b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allrun b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allclean b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allclean +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allrun b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allrun +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/damBreak/Allclean b/tutorials/multiphase/interIsoFoam/damBreak/Allclean index 40363dccf7..dd424f984f 100755 --- a/tutorials/multiphase/interIsoFoam/damBreak/Allclean +++ b/tutorials/multiphase/interIsoFoam/damBreak/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 \rm -rf isoFaces diff --git a/tutorials/multiphase/interIsoFoam/damBreak/Allrun b/tutorials/multiphase/interIsoFoam/damBreak/Allrun index afce703847..3345fa8e32 100755 --- a/tutorials/multiphase/interIsoFoam/damBreak/Allrun +++ b/tutorials/multiphase/interIsoFoam/damBreak/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/damBreak/Allrun-parallel b/tutorials/multiphase/interIsoFoam/damBreak/Allrun-parallel index 2a2861b730..34abec3a7e 100755 --- a/tutorials/multiphase/interIsoFoam/damBreak/Allrun-parallel +++ b/tutorials/multiphase/interIsoFoam/damBreak/Allrun-parallel @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allclean b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allclean index dced1dda72..48516d0f4f 100755 --- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allclean +++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allrun b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allrun index 2bc6e3a474..75daae6cfc 100755 --- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allrun +++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/Allclean b/tutorials/multiphase/interIsoFoam/discInConstantFlow/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/Allclean +++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/Allrun b/tutorials/multiphase/interIsoFoam/discInConstantFlow/Allrun index 4abdc78d00..acb7b18f29 100755 --- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/Allrun +++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/Allclean b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/Allclean +++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/Allrun b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/Allrun index 4abdc78d00..acb7b18f29 100755 --- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/Allrun +++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/Allclean b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/Allclean +++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/Allrun b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/Allrun index 7e395e7832..ec2df9a879 100755 --- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/Allrun +++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/iobasin/Allclean b/tutorials/multiphase/interIsoFoam/iobasin/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/iobasin/Allclean +++ b/tutorials/multiphase/interIsoFoam/iobasin/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/iobasin/Allrun b/tutorials/multiphase/interIsoFoam/iobasin/Allrun index c29ba12168..e773647e42 100755 --- a/tutorials/multiphase/interIsoFoam/iobasin/Allrun +++ b/tutorials/multiphase/interIsoFoam/iobasin/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir runApplication blockMesh diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/Allclean b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/Allclean +++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/Allrun b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/Allrun index a919ed91c4..1552217297 100755 --- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/Allrun +++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ application=$(getApplication) diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/Allrun b/tutorials/multiphase/interIsoFoam/sloshingTank2D/Allrun index ae24f74396..c9defa12df 100755 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/Allrun +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/Allclean b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/Allclean +++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/Allrun b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/Allrun index 1767cd6b1b..37a8187c0f 100755 --- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/Allrun +++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/standingWave/Allclean b/tutorials/multiphase/interIsoFoam/standingWave/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/standingWave/Allclean +++ b/tutorials/multiphase/interIsoFoam/standingWave/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/standingWave/Allrun b/tutorials/multiphase/interIsoFoam/standingWave/Allrun index d00d2326e7..f798264bae 100755 --- a/tutorials/multiphase/interIsoFoam/standingWave/Allrun +++ b/tutorials/multiphase/interIsoFoam/standingWave/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/Allclean b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/Allclean +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/Allrun b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/Allrun index 28bf991e62..76989b6f17 100755 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/Allrun +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/Allclean b/tutorials/multiphase/interIsoFoam/weirOverflow/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/interIsoFoam/weirOverflow/Allclean +++ b/tutorials/multiphase/interIsoFoam/weirOverflow/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/Allrun b/tutorials/multiphase/interIsoFoam/weirOverflow/Allrun index c710725926..0818d6f789 100755 --- a/tutorials/multiphase/interIsoFoam/weirOverflow/Allrun +++ b/tutorials/multiphase/interIsoFoam/weirOverflow/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun index 48c2856ca1..6910950a2a 100755 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh cp 0/alpha.air.orig 0/alpha.air diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean index d31f20c24d..f8c7875f6a 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun index b44aaf01a3..bda6c4a76c 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre index b39d40fad9..3489d116c4 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy propeller surface from resources directory \cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/ diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean index 24df93fd3d..db74977981 100755 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun index dd1ff0aa95..063511fb2c 100755 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Copy bullet surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/bullet.stl.gz constant/triSurface/ diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun index efced0038e..fce061485e 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun index 125f3e96ba..a2c1d8661f 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun index 6aeae15553..190a9840fd 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./makeMesh runApplication $(getApplication) diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun index 3d69efdb3a..688586b18f 100755 --- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun +++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./makeMesh diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh index fc56e7be3c..6e03b018ca 100755 --- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh +++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ m4 < system/blockMeshDict.m4 > system/blockMeshDict diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun index efced0038e..fce061485e 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun index 125f3e96ba..a2c1d8661f 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun index 69a4d43b49..df665b2da0 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./makeMesh restore0Dir diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun index e4ccbb9c32..50bfcac894 100755 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre index 5190fe6b9c..a5847cd765 100755 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean index 1d69dc999c..97c7554280 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -##. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +#. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ (cd background && ./Allclean) (cd floatingBody && ./Allclean) diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun index 6699724457..9863c44e48 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre (cd background && runApplication $(getApplication)) diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun.pre index ef286ecbfa..9ee4a8f61e 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # mesh floating body (cd floatingBody && ./Allrun.pre) diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun.pre index 9a44881018..6d6ebda91e 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Create background mesh runApplication blockMesh diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/Allrun.pre index 8142d7c389..7f29eaf2f2 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean index 1d69dc999c..97c7554280 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -##. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +#. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ (cd background && ./Allclean) (cd floatingBody && ./Allclean) diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun index 6699724457..9863c44e48 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre (cd background && runApplication $(getApplication)) diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun.pre index ef286ecbfa..9ee4a8f61e 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # mesh floating body (cd floatingBody && ./Allrun.pre) diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/Allrun.pre index 9a44881018..6d6ebda91e 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # Create background mesh runApplication blockMesh diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre index 8142d7c389..7f29eaf2f2 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allclean b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allclean index aab71fa2ca..7a3d92a9d3 100755 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun index 10707b2f2c..fa234b3f30 100755 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ ./Allrun.pre diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun.pre index abccd3163c..308bbee9fd 100755 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun.pre @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean index 496dfec3c1..d989e2132d 100755 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 rm -rf poolHeight poolHeight_vs_time diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun index 40555d56e1..6cf23587d9 100755 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean index 496dfec3c1..d989e2132d 100755 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 rm -rf poolHeight poolHeight_vs_time diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun index 897dccd0bb..f1d525aa64 100755 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allclean b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allclean index 8409457977..6634746c67 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allclean +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cp system/controlDict.org system/controlDict diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun index e2b33f6cea..5f673d892c 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun @@ -1,15 +1,14 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ application=$(getApplication) runApplication blockMesh runApplication $application -if ! isTest $@ +if notTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allclean b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allclean index 8409457977..6634746c67 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allclean +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cp system/controlDict.org system/controlDict diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun index e2b33f6cea..5f673d892c 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun @@ -1,15 +1,14 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ application=$(getApplication) runApplication blockMesh runApplication $application -if ! isTest $@ +if notTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun index 6aeae15553..190a9840fd 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./makeMesh runApplication $(getApplication) diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/Allrun index 955b551760..5922d2615b 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/Allrun @@ -1,15 +1,11 @@ #!/bin/sh -cd ${0%/*} || exit 1 # run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Set application name -application=$(getApplication) +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication topoSet runApplication setFields -runApplication $application +runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allclean b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allclean index ba5873a4ae..cea650d5a4 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allclean +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cp ./system/controlDict.org ./system/controlDict diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun index 58bff92e2d..411fec5102 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allclean b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allclean index 8409457977..6634746c67 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allclean +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cp system/controlDict.org system/controlDict diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun index e2b33f6cea..5f673d892c 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun @@ -1,15 +1,14 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ application=$(getApplication) runApplication blockMesh runApplication $application -if ! isTest $@ +if notTest $@ then foamDictionary system/controlDict -entry endTime -set 4 foamDictionary system/controlDict -entry startTime -set 0.5 diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allclean b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allclean index ba5873a4ae..cea650d5a4 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allclean +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase cp ./system/controlDict.org ./system/controlDict diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun index 63508b91f8..7117b0060d 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/Allrun index ed61ac5435..edff8a339d 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/Allrun @@ -1,8 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication setFields diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun index 6aeae15553..190a9840fd 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./makeMesh runApplication $(getApplication) diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun index efced0038e..fce061485e 100755 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ restore0Dir diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun index 6aeae15553..190a9840fd 100755 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication ./makeMesh runApplication $(getApplication) diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/Allclean b/tutorials/preProcessing/createZeroDirectory/cavity/Allclean index e2f275d9fd..9d457171af 100755 --- a/tutorials/preProcessing/createZeroDirectory/cavity/Allclean +++ b/tutorials/preProcessing/createZeroDirectory/cavity/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/Allrun b/tutorials/preProcessing/createZeroDirectory/cavity/Allrun index 51286c4dbd..f9ff928bea 100755 --- a/tutorials/preProcessing/createZeroDirectory/cavity/Allrun +++ b/tutorials/preProcessing/createZeroDirectory/cavity/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication createZeroDirectory diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean b/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean index b52876b699..e6ad168f9c 100755 --- a/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean +++ b/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun b/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun index 9dce39c173..15e9c628a8 100755 --- a/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun +++ b/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ # copy motorbike surface from resources folder cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/ diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean index b8032f8f34..e887347334 100755 --- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean +++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun index 15fab73b65..f5b3299714 100755 --- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun +++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ rm -rf constant/polyMesh/sets diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/Allclean b/tutorials/preProcessing/decompositionConstraints/geometric/Allclean index 214bd9a5ec..77ddfb20c0 100755 --- a/tutorials/preProcessing/decompositionConstraints/geometric/Allclean +++ b/tutorials/preProcessing/decompositionConstraints/geometric/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ \rm -f constant/triSurface/blob.obj diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/Allrun b/tutorials/preProcessing/decompositionConstraints/geometric/Allrun index 9cb85f6136..e403886b8e 100755 --- a/tutorials/preProcessing/decompositionConstraints/geometric/Allrun +++ b/tutorials/preProcessing/decompositionConstraints/geometric/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ mkdir -p constant/triSurface diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allclean b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allclean index be7ddb0688..e8557c2554 100755 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allclean +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun index e59dad068e..985ede6c4b 100755 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun b/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun index 89bd04a003..647966b2c0 100755 --- a/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun +++ b/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ params=$@ diff --git a/tutorials/verificationAndValidation/turbulentInflow/Allclean b/tutorials/verificationAndValidation/turbulentInflow/Allclean index 8f13d677ae..67eab912aa 100755 --- a/tutorials/verificationAndValidation/turbulentInflow/Allclean +++ b/tutorials/verificationAndValidation/turbulentInflow/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase0 \rm -rf constant/boundaryData/inlet 2>/dev/null diff --git a/tutorials/verificationAndValidation/turbulentInflow/Allrun b/tutorials/verificationAndValidation/turbulentInflow/Allrun index 5ee1231e57..867d2e922e 100755 --- a/tutorials/verificationAndValidation/turbulentInflow/Allrun +++ b/tutorials/verificationAndValidation/turbulentInflow/Allrun @@ -1,7 +1,8 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ # Test with different synthetic inflow models modelTypes="reducedDigitalFilter digitalFilter DFSEM" diff --git a/tutorials/verificationAndValidation/turbulentInflow/Allrun-parallel b/tutorials/verificationAndValidation/turbulentInflow/Allrun-parallel index a90dd69688..26bc6ac809 100755 --- a/tutorials/verificationAndValidation/turbulentInflow/Allrun-parallel +++ b/tutorials/verificationAndValidation/turbulentInflow/Allrun-parallel @@ -1,7 +1,8 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ # Test with different synthetic inflow models modelTypes="reducedDigitalFilter digitalFilter DFSEM" diff --git a/wmake/scripts/AllwmakeParseArguments b/wmake/scripts/AllwmakeParseArguments index 27454e04ca..80da8a5b75 100644 --- a/wmake/scripts/AllwmakeParseArguments +++ b/wmake/scripts/AllwmakeParseArguments @@ -20,7 +20,7 @@ # # Usage # # Parse the arguments by sourcing this script -# . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments +# . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments # #------------------------------------------------------------------------------ diff --git a/wmake/scripts/cmakeFunctions b/wmake/scripts/cmakeFunctions index 8ad6034386..b67dce2d5b 100644 --- a/wmake/scripts/cmakeFunctions +++ b/wmake/scripts/cmakeFunctions @@ -17,7 +17,7 @@ # Description # Helper functions for CMake #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions # Require some wmake functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions # Require wmake functions # Export compiler information for cmake export CC="$(wmake -show-c)" diff --git a/wmake/scripts/have_adios2 b/wmake/scripts/have_adios2 index 1e904d715f..4397cd8b41 100644 --- a/wmake/scripts/have_adios2 +++ b/wmake/scripts/have_adios2 @@ -30,7 +30,7 @@ # ADIOS2_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_boost b/wmake/scripts/have_boost index 528b46bd1f..aca69a63ed 100644 --- a/wmake/scripts/have_boost +++ b/wmake/scripts/have_boost @@ -30,7 +30,7 @@ # BOOST_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_ccmio b/wmake/scripts/have_ccmio index 991e314f88..68e2b2f718 100644 --- a/wmake/scripts/have_ccmio +++ b/wmake/scripts/have_ccmio @@ -30,7 +30,7 @@ # CCMIO_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_cgal b/wmake/scripts/have_cgal index f56341555a..b0a90e7ed2 100644 --- a/wmake/scripts/have_cgal +++ b/wmake/scripts/have_cgal @@ -30,7 +30,7 @@ # CGAL_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_fftw b/wmake/scripts/have_fftw index 85eb9f229d..cfafa54c1e 100644 --- a/wmake/scripts/have_fftw +++ b/wmake/scripts/have_fftw @@ -30,7 +30,7 @@ # FFTW_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_hypre b/wmake/scripts/have_hypre index 7e02ebe6e8..db9f77bbdd 100644 --- a/wmake/scripts/have_hypre +++ b/wmake/scripts/have_hypre @@ -30,7 +30,7 @@ # HYPRE_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_kahip b/wmake/scripts/have_kahip index 47092d4c01..e528d5c100 100644 --- a/wmake/scripts/have_kahip +++ b/wmake/scripts/have_kahip @@ -30,7 +30,7 @@ # KAHIP_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ @@ -60,7 +60,7 @@ have_kahip() local prefix header library incName libName settings warn warn="==> skip kahip" - # Setup + # Setup if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/kahip) then . "$settings" diff --git a/wmake/scripts/have_metis b/wmake/scripts/have_metis index 5987eb1aef..373f810793 100644 --- a/wmake/scripts/have_metis +++ b/wmake/scripts/have_metis @@ -30,7 +30,7 @@ # METIS_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_mgridgen b/wmake/scripts/have_mgridgen index ebe66e9f31..4f016c72d2 100644 --- a/wmake/scripts/have_mgridgen +++ b/wmake/scripts/have_mgridgen @@ -30,7 +30,7 @@ # MGRIDGEN_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_petsc b/wmake/scripts/have_petsc index a002d9c6c5..603584011f 100644 --- a/wmake/scripts/have_petsc +++ b/wmake/scripts/have_petsc @@ -30,7 +30,7 @@ # PETSC_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_readline b/wmake/scripts/have_readline index 207d4fc7e3..21a258bc04 100644 --- a/wmake/scripts/have_readline +++ b/wmake/scripts/have_readline @@ -29,7 +29,7 @@ # READLINE_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_scotch b/wmake/scripts/have_scotch index c7043e9e06..78460c8096 100644 --- a/wmake/scripts/have_scotch +++ b/wmake/scripts/have_scotch @@ -30,7 +30,7 @@ # SCOTCH_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/have_zoltan b/wmake/scripts/have_zoltan index 213d249e28..681abd2bea 100644 --- a/wmake/scripts/have_zoltan +++ b/wmake/scripts/have_zoltan @@ -30,7 +30,7 @@ # ZOLTAN_LIB_DIR # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions #------------------------------------------------------------------------------ diff --git a/wmake/scripts/makeParser b/wmake/scripts/makeParser index 4d15957280..0f3ac573b8 100755 --- a/wmake/scripts/makeParser +++ b/wmake/scripts/makeParser @@ -120,10 +120,10 @@ case "$parser" in elif [ "$optCode" = true ] then echo "Generating lemon parser code ($extCode)$message" - "$WM_PROJECT_DIR/wmake/scripts/wrap-lemon" $optDebug -e"$extCode" -s "$input" + "${WM_PROJECT_DIR:?}/wmake/scripts/wrap-lemon" $optDebug -e"$extCode" -s "$input" else echo "Generating lemon parser header$message" - "$WM_PROJECT_DIR/wmake/scripts/wrap-lemon" $optDebug -header -s "$input" + "${WM_PROJECT_DIR:?}/wmake/scripts/wrap-lemon" $optDebug -header -s "$input" fi echo ;; diff --git a/wmake/scripts/paraviewFunctions b/wmake/scripts/paraviewFunctions index 7a2fc55f83..dffa776102 100644 --- a/wmake/scripts/paraviewFunctions +++ b/wmake/scripts/paraviewFunctions @@ -5,7 +5,7 @@ # \\ / A nd | www.openfoam.com # \\/ M anipulation | #------------------------------------------------------------------------------ -# Copyright (C) 2018 OpenCFD Ltd. +# Copyright (C) 2018-2019 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, licensed under GNU General Public License @@ -37,8 +37,8 @@ # paraview-major.minor encoded in its name. # #------------------------------------------------------------------------------ -. $WM_PROJECT_DIR/wmake/scripts/sysFunctions # General system functions -. $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions # Require cmake functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions +. ${WM_PROJECT_DIR:?}/wmake/scripts/cmakeFunctions # Require cmake functions #------------------------------------------------------------------------------ @@ -63,22 +63,28 @@ echo_paraview() # CMake into objectsDir with VTK_DIR dependency +# 1 - sourceDir +# 2.. optional cmake defines cmakeVtk() { - cmakeVersioned "VTK_DIR=$VTK_DIR" "$1" + cmakeVersioned "VTK_DIR=$VTK_DIR" "$@" } # CMake into objectsDir with ParaView_DIR dependency +# 1 - sourceDir +# 2.. optional cmake defines cmakePv() { - cmakeVersioned "ParaView_DIR=$ParaView_DIR" "$1" + cmakeVersioned "ParaView_DIR=$ParaView_DIR" "$@" } # CMake into objectsDir with ParaView_DIR dependency +# 1 - sourceDir +# 2.. optional cmake defines cmakePvInstall() { - cmakeVersionedInstall "ParaView_DIR=$ParaView_DIR" "$1" + cmakeVersionedInstall "ParaView_DIR=$ParaView_DIR" "$@" } # diff --git a/wmake/src/createCode b/wmake/src/createCode index f98126a673..622d5cdd32 100755 --- a/wmake/src/createCode +++ b/wmake/src/createCode @@ -1,8 +1,9 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -# Manually create ragel code +cd ${0%/*} || exit 1 # Run from this directory -"$WM_PROJECT_DIR/wmake/scripts/makeParser" \ +# Manually create ragel scanner + +"${WM_PROJECT_DIR:?}/wmake/scripts/makeParser" \ -scanner=wmkdepend.rl \ "$@"