diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials index c4d7c85acb57ce46cade063b40d4a69eb5c8d81f..210b1bcc60605ba4a112f87700d77456968f2aee 100755 --- a/bin/foamRunTutorials +++ b/bin/foamRunTutorials @@ -50,7 +50,7 @@ elif [ -d "./system" ] then # Normal case. parentDir=`dirname $PWD` - application=`basename $parentDir` + application=`getApplication` runApplication blockMesh runApplication $application else diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index 5afb39a9503a8a100cc50933f037f88284f53ee9..6907b291ef337fd5fc37e84de55dde366bc0ef52 100644 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -29,6 +29,11 @@ # #------------------------------------------------------------------------------ +getApplication () +{ + grep application system/controlDict | sed "s/application *\([a-zA-Z]*\);/\1/" +} + runApplication () { APP_RUN=$1; shift diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun index b78ade21c1ae3a0afc4344db04c190e60b56012b..e005157d0978ecea54d006422f647e4522373801 100755 --- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun +++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="dnsFoam" +# Get application name +application=`getApplication` runApplication blockMesh runApplication boxTurb diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun index 497eed73f83ef1065ecb5f01f75f107fff090ffa..d6a968af469224bda3eb2dd2578f50577cfdb76f 100755 --- a/tutorials/basic/laplacianFoam/flange/Allrun +++ b/tutorials/basic/laplacianFoam/flange/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application directory -application="laplacianFoam" +# Get application name +application=`getApplication` runAnsysToFoam() { diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun index b4a0869ee59e91d37d4384ff14c3641950911c5a..36e2229aa640c4cb8e0eb6466cebf264ba1a5cb3 100755 --- a/tutorials/basic/potentialFoam/cylinder/Allrun +++ b/tutorials/basic/potentialFoam/cylinder/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="potentialFoam" +application=`getApplication` runApplication blockMesh runApplication $application diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun index 601903288195a35bc1aef4fc1e7c5243bc9e5d3e..cadfe86d27327f23094cd02d4eb7224cdcbd8877 100755 --- a/tutorials/basic/potentialFoam/pitzDaily/Allrun +++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="potentialFoam" +application=`getApplication` runApplication blockMesh runApplication $application diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun index a48aed068dcb8117a2bbd0d5ac465d875fb32f46..0c311946f1dfca601f372ab539d30cbf123f6316 100755 --- a/tutorials/combustion/XiFoam/ras/Allrun +++ b/tutorials/combustion/XiFoam/ras/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory +# Set application name application="XiFoam" setControlDict () { diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun index 0912af15e2ffe12b0381f599b96f577b7fa864ed..e8de444229f0ea65b9e4a2e033f78890b395602f 100755 --- a/tutorials/combustion/engineFoam/kivaTest/Allrun +++ b/tutorials/combustion/engineFoam/kivaTest/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="engineFoam" +# Get application name +application=`getApplication` runKivaToFoam () { diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun index dbd8b7758fa6264d533d75ffd5a1758a8484ba72..d20d46fdd9b1cca90fae300cf18cf3192ce5ae79 100755 --- a/tutorials/compressible/rhoCentralFoam/Allrun +++ b/tutorials/compressible/rhoCentralFoam/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application=${PWD##*/} +# Get application name +application="rhoCentralFoam" cases=" \ shockTube \ diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun index 6ce183dba87274008dc2920bfaaeb0721c53aff2..4f0a80edd84fab2c5980f3cd4000ff185d31acb0 100755 --- a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun +++ b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun @@ -1,9 +1,10 @@ #!/bin/sh + # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="rhoSonicFoam" +# Get application name +application=`getApplication` runApplication blockMesh runApplication setFields diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun index 6415109243edeb9e7cfcd4c2bd86eada31beb496..eede9049d770e4829fb2d746ebb736aab8cb5fb1 100755 --- a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun +++ b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="rhopSonicFoam" +application=`getApplication` runApplication blockMesh runApplication setFields diff --git a/tutorials/compressible/sonicFoam/Allrun b/tutorials/compressible/sonicFoam/Allrun deleted file mode 100755 index 4f1a1e464a13287c4b685a7fdc8fc94ae46230b9..0000000000000000000000000000000000000000 --- a/tutorials/compressible/sonicFoam/Allrun +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -x - -(cd laminar && ./Allrun) -(cd ras && ./Allrun) diff --git a/tutorials/compressible/sonicFoam/laminar/Allrun b/tutorials/compressible/sonicFoam/laminar/Allrun deleted file mode 100755 index 573ff3a12dff2b3e37cb14a13f0d7ed7454b3abf..0000000000000000000000000000000000000000 --- a/tutorials/compressible/sonicFoam/laminar/Allrun +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name from directory -application=sonicFoam - -cases=" \ -forwardStep \ -shockTube \ -" -for case in $cases -do - (cd $case && runApplication blockMesh) -# - if [ "$case" = "shockTube" ] ; then - (cd $case && ./Allrun) - else - (cd $case && runApplication $application) - fi -# -done diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun index 6dc6509c85896b2e97e140677c9db63f6565ce21..bb2d19c9ea6baadf8970df85062797ed5ae43121 100755 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="sonicFoam" +application=`getApplication` runApplication blockMesh runApplication setFields diff --git a/tutorials/compressible/sonicFoam/ras/Allrun b/tutorials/compressible/sonicFoam/ras/Allrun deleted file mode 100755 index 810c6525ebd3dbad0a9f01b21f7edff079bae876..0000000000000000000000000000000000000000 --- a/tutorials/compressible/sonicFoam/ras/Allrun +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name from directory -application=${PWD##*/} - -runStarToFoam () -{ - if [ -f log.starToFoam ] ; then - echo "starToFoam already run on $PWD: remove log file to run" - else - echo "starToFoam: converting mesh $1" - starToFoam $1 > log.starToFoam 2>&1 - fi -} - -# Do prism -(cd prism && foamRunTutorials) - -# Special handling for nacaAirfoil -cd nacaAirfoil - runStarToFoam prostar/nacaAirfoil - mv constant/polyMesh/boundary temp - sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \ - temp > constant/polyMesh/boundary - rm temp - runApplication $application -cd .. diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun new file mode 100755 index 0000000000000000000000000000000000000000..29cc29abd53a0b7cd6506cbaa037e9dc112923fc --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun @@ -0,0 +1,23 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Get application name +application=`getApplication` + +runStarToFoam () +{ + if [ -f log.starToFoam ] ; then + echo "starToFoam already run on $PWD: remove log file to run" + else + echo "starToFoam: converting mesh $1" + starToFoam $1 > log.starToFoam 2>&1 + fi +} + +runStarToFoam prostar/nacaAirfoil +mv constant/polyMesh/boundary temp +sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \ + temp > constant/polyMesh/boundary +rm temp +runApplication $application diff --git a/tutorials/compressible/sonicFoam/ras/Running_Notes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes similarity index 65% rename from tutorials/compressible/sonicFoam/ras/Running_Notes rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes index b6660052800bb1f1521e8fcc4c8333ed4b5df41b..5bfc37a8623eea846dd94fa7412721b385f8f72e 100644 --- a/tutorials/compressible/sonicFoam/ras/Running_Notes +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes @@ -2,11 +2,7 @@ nacaAirfoil ~~~~~~~~~~~ * large domain with airfoil section near centre * extremely non-orthogonal, highly skew mesh refined around the airfoil -* running at Mach 1.78 +* running at Mach 1.78 * limited 0.5 on all laplacianSchemes because the mesh is so poor -* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running -* deltaT can be increased later in the run to 2e-07 - -prism -~~~~~ -* run to t = 0.0014 for convergence +* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running +* deltaT can be increased later in the run to 2e-07 diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun index db8cdfa08aa3785e92d4fdc271670055628eefb0..6d1d356b34507add807d1803fa0fd05ffda30394 100755 --- a/tutorials/compressible/sonicLiquidFoam/Allrun +++ b/tutorials/compressible/sonicLiquidFoam/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application=${PWD##*/} +# Set application name +application="sonicLiquidFoam" setDecompressionTankFine () { diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean deleted file mode 100755 index 7ff7776cb12c793a7bed32339e31b6ded3897549..0000000000000000000000000000000000000000 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cd nanoNozzle - rm -rf constant/polyMesh/sets - rm -rf processor[0-9] - cleanCase -cd .. diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun deleted file mode 100755 index c756b2ca7e7a3d0ac97842edb011c9f6891abc98..0000000000000000000000000000000000000000 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -application="mdFoam" - -cd nanoNozzle - runApplication blockMesh - - runApplication decomposePar - hostname > system/machines - - runParallel mdInitialise 4 system/machines - runParallel $application 4 system/machines - - runApplication reconstructPar -cd .. - diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean new file mode 100755 index 0000000000000000000000000000000000000000..8b3a55f4087fa2579b1626237c574e7bf492877f --- /dev/null +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +rm -rf constant/polyMesh/sets +rm -rf processor[0-9] +cleanCase diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun new file mode 100755 index 0000000000000000000000000000000000000000..defa2cb875bb32b01d29783e1df55645e777523b --- /dev/null +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun @@ -0,0 +1,16 @@ +#!/bin/sh + +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +application=`getApplication` + +runApplication blockMesh + +runApplication decomposePar +hostname > system/machines + +runParallel mdInitialise 4 system/machines +runParallel $application 4 system/machines + +runApplication reconstructPar diff --git a/tutorials/electromagnetics/mhdFoam/Allrun b/tutorials/electromagnetics/mhdFoam/Allrun index aca66b35332378f5c60c899af6ddd07101b6f780..f664a096985eb90c21bed0bb69b4b6327b0a226b 100755 --- a/tutorials/electromagnetics/mhdFoam/Allrun +++ b/tutorials/electromagnetics/mhdFoam/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory +# Set application name application="mhdFoam" (cd hartmann && runApplication blockMesh) diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun index 92490b5b5ea392da192d42ec102f629c87c73e60..c3373651df31b91b556f2173779e63f6448eac26 100755 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun +++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="buoyantBoussinesqPisoFoam" +application=`getApplication` compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom runApplication blockMesh diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun index 628624c70292d70d593effaa1a4e9fc9e2281550..c3373651df31b91b556f2173779e63f6448eac26 100755 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="buoyantBoussinesqSimpleFoam" +application=`getApplication` compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom runApplication blockMesh diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun index 165068eca772f8a03129d90176be7d1ec909031b..e9bbb2d0c0082a1a5588d09aa0410915c31c62de 100755 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun +++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="buoyantPisoFoam" +# Get application name +application=`getApplication` compileApplication setHotRoom runApplication blockMesh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun index 6a98e5715d655d25f6569da8915ed83d6d3cbbb1..c3373651df31b91b556f2173779e63f6448eac26 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="buoyantSimpleFoam" +application=`getApplication` compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom runApplication blockMesh diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun index f0d118b12b93af769804ed06127c9118af6c35d5..836276fe9cea7a027c4726fa021088bf33d0da6e 100755 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun @@ -3,7 +3,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="MRFSimpleFoam" +application=`getApplication` ./makeMesh runApplication $application diff --git a/tutorials/incompressible/channelFoam/channel395/Allrun b/tutorials/incompressible/channelFoam/channel395/Allrun index d4e6877e32feab36c83ad67cfaac4f3e1e5801fe..05cd6dfdf017c560e257fd4136e11938bbeadf02 100755 --- a/tutorials/incompressible/channelFoam/channel395/Allrun +++ b/tutorials/incompressible/channelFoam/channel395/Allrun @@ -3,7 +3,7 @@ . $WM_PROJECT_DIR/bin/tools/RunFunctions # Get application directory -application="channelFoam" +application=`getApplication` runApplication blockMesh runApplication $application diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun index 914e53d07de0af8907cc8a5b56f88778f02a1a76..1a93d4eb327caa21863b16ab13ba1e5e7e0d1af2 100755 --- a/tutorials/incompressible/icoFoam/Allrun +++ b/tutorials/incompressible/icoFoam/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application=${PWD##*/} +# Get application name +application="icoFoam" cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped" diff --git a/tutorials/incompressible/icoFoam/resetFixedWallsScr b/tutorials/incompressible/icoFoam/resetFixedWallsScr new file mode 100644 index 0000000000000000000000000000000000000000..5a8d98ce462da5095632a9ad2cd29867838b55e0 --- /dev/null +++ b/tutorials/incompressible/icoFoam/resetFixedWallsScr @@ -0,0 +1,8 @@ +/fixedWalls/,/}/{ +/fixedWalls/p +/{/p +/type fixedValue;/p +s/value[ \t]*nonuniform[ \t]*List<vector>[ \t]*/value uniform (0 0 0);/p +/}/p +d +} diff --git a/tutorials/incompressible/pisoFoam/Allrun b/tutorials/incompressible/pisoFoam/Allrun deleted file mode 100755 index 7d6114dd5037f136433502b3d3c2e6112249b10e..0000000000000000000000000000000000000000 --- a/tutorials/incompressible/pisoFoam/Allrun +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name from directory -application="pisoFoam" - -rasCases="cavity" -lesCases="pitzDaily pitzDailyDirectMapped" - -computeCase() -{ - if [ -f Allrun ] ; then - ./Allrun - else - runApplication blockMesh - runApplication $application - fi -} - -cd ras -for case in $rasCases -do - cd $case - computeCase - cd .. -done -cd .. - -cd les -for case in $lesCases -do - cd $case - computeCase - cd .. -done -cd .. diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary index 903f3ef57e0b5ca8acaec1fa58531aaa1e354515..313dcceba1abd7b93d57320c4c674f1734692506 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun index d23000a160182734de209f890271050fafedb183..aeb984814c564005dcc12204ed6a005894f2f99f 100755 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="pisoFoam" +# Get application name +application=`getApplication` runApplication blockMesh runApplication changeDictionary diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun index 97fb4bc5910ab159dba94df18b53037f48d22637..411704d7836a4f61312e668b2f93d4ae057a8e22 100755 --- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun +++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun @@ -3,6 +3,6 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="simpleFoam" +application=`getApplication` runApplication $application diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun index 701d55dc28c462b8cc7a2743861adff59feafc64..04eb8794e0cd381b38c3c9f2e77fbe2595364760 100755 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun @@ -3,7 +3,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="porousExplicitSourceReactingParcelFoam" +application=`getApplication` # create mesh runApplication blockMesh diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun index 45b6257d4bfdcf4cbd57f3300b75a38209c053e5..ba35093d07f807e09dc9f47fc296f7154d598835 100755 --- a/tutorials/multiphase/cavitatingFoam/les/Allrun +++ b/tutorials/multiphase/cavitatingFoam/les/Allrun @@ -3,6 +3,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions +# Set application name application="cavitatingFoam" refineMeshByCellSet() diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun index 0a3298e8e84123a662d334ac2603f043cc9a0713..7f095c44f177400ba70afa234433b5a9aae1602f 100755 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun @@ -3,7 +3,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="cavitatingFoam" +application=`getApplication` refineMeshByCellSet() { diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun index f2a0345d68b030bcac62302fb71d10da0a137384..a3d54875d4a261e0a14965700a18eb81bb7a568e 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="compressibleInterFoam" +# Get application name +application=`getApplication` runApplication blockMesh cp 0/alpha1.org 0/alpha1 diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun index 7b9b11445e018536c908fa896212a19c7c92eef3..0f09de5ddcc4f9eaa35c2541bc5417a4c54f1942 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="compressibleInterFoam" +# Get application name +application=`getApplication` runApplication blockMesh cp 0/alpha1.org 0/alpha1 diff --git a/tutorials/multiphase/interFoam/Allrun b/tutorials/multiphase/interFoam/Allrun deleted file mode 100755 index 91f49e0a7fb9296f6c2e86fb695cddf6afed2c9f..0000000000000000000000000000000000000000 --- a/tutorials/multiphase/interFoam/Allrun +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name from directory -application="interFoam" - -laminarCases="damBreak" -rasCases="damBreak" -lesCases="nozzleFlow2D" - -computeCase() -{ - if [ -f Allrun ] ; then - ./Allrun - else - runApplication blockMesh - runApplication changeDictionary - runApplication $application - fi -} - -cd laminar -for case in $laminarCases -do - cd $case - computeCase - cd .. -done -cd .. - -cd ras -for case in $rasCases -do - cd $case - computeCase - cd .. -done -cd .. - -cd les -for case in $lesCases -do - cd $case - computeCase - cd .. -done -cd .. diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun index e8e310bf86a0faa6481cf8e4284b6fbfaf5780ce..836276fe9cea7a027c4726fa021088bf33d0da6e 100755 --- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun +++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun @@ -3,7 +3,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="MRFInterFoam" +application=`getApplication` ./makeMesh runApplication $application diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun index 9f2498ca887fea00a9140b6040c71c3725055240..22d86c6b68687184d7b2b01e816c07d1cdd4d271 100755 --- a/tutorials/multiphase/interFoam/laminar/Allrun +++ b/tutorials/multiphase/interFoam/laminar/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory +# Set application name application="interFoam" setDamBreakFine () diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun index 8f801cc9ce5e42414767aed367a048d7c0c4e6fa..655eb4c8874e3c19195c318867379af30162833f 100755 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="interFoam" +# Get application name +application=`getApplication` runRefineMesh () { diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun index e222cf7e15d05f8a2f8d11bb3e86ba15491bffd2..45bd89d8499fed7270e1be1f097fbc9199de41d5 100755 --- a/tutorials/multiphase/interFoam/ras/Allrun +++ b/tutorials/multiphase/interFoam/ras/Allrun @@ -2,7 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="rasInterFoam" +# Set application name +application="interFoam" setDamBreakFine () { diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun index 599b286f3d8c59b6088fe4f778773443e63bf0ee..90917ec79581d50caa94e093fdaa403d30cc1032 100755 --- a/tutorials/multiphase/interFoam/ras/damBreak/Allrun +++ b/tutorials/multiphase/interFoam/ras/damBreak/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="interFoam" +# Get application name +application=`getApplication` runApplication blockMesh runApplication setFields diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun index 1ce228b8f6ae08528288e869a5d917fbc140c21b..231be442622d847cae8c39a1d8d6d7c849ed59ee 100755 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="settlingFoam" +application=`getApplication` #runApplication blockMesh runApplication $application