diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index 6907b291ef337fd5fc37e84de55dde366bc0ef52..62ce3e27ef30ee05ae73e189e72190af63dcea35 100644 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -53,18 +53,8 @@ runParallel () if [ -f $log.$APP_RUN ] ; then echo "$APP_RUN already run on $PWD: remove log file to run" else - if [ "$WM_MPLIB" = LAM ] - then - echo "Starting LAM using $2 machines file" - lamboot -v $2 - fi echo "Running $APP_RUN in parallel on $PWD using $1 processes" ( mpirun -np $1 $APP_RUN -parallel < /dev/null > log.$APP_RUN 2>&1 ) - if [ "$WM_MPLIB" = LAM ] - then - echo "Stopping LAM" - lamclean - fi fi } diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun index 402135df749b6f380b1c870897e27c053918afb4..b36908112841487e6dd4b3e2f62b06cfb8d0167f 100755 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun @@ -4,8 +4,7 @@ runApplication blockMesh runApplication decomposePar -runParallel dsmcInitialise 4 system/machines -hostname > system/machines -runParallel dsmcFoam 4 system/machines +runParallel dsmcInitialise 4 +runParallel dsmcFoam 4 runApplication reconstructPar -noLagrangian diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun index 402135df749b6f380b1c870897e27c053918afb4..b36908112841487e6dd4b3e2f62b06cfb8d0167f 100755 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun @@ -4,8 +4,7 @@ runApplication blockMesh runApplication decomposePar -runParallel dsmcInitialise 4 system/machines -hostname > system/machines -runParallel dsmcFoam 4 system/machines +runParallel dsmcInitialise 4 +runParallel dsmcFoam 4 runApplication reconstructPar -noLagrangian diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun index defa2cb875bb32b01d29783e1df55645e777523b..0e158046d9b3c2bd66712da3e68f9eb29df1282a 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun @@ -8,9 +8,8 @@ application=`getApplication` runApplication blockMesh runApplication decomposePar -hostname > system/machines -runParallel mdInitialise 4 system/machines -runParallel $application 4 system/machines +runParallel mdInitialise 4 +runParallel $application 4 runApplication reconstructPar diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index c3c4b5e504a38eb0b761783bd9d0dd0dd4c396eb..9acc76c4435899d0ad892702d7932540dc8174b4 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -41,8 +41,7 @@ do done # Run -hostname > system/machines -runParallel chtMultiRegionFoam 4 system/machines +runParallel chtMultiRegionFoam 4 # Reconstruct for i in bottomAir topAir heater leftSolid rightSolid diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun b/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun index 28b6133b28f996692f991e859675bbbb2212dcd1..5b96ab937d0d0d3fb41119ba514d65ad38a2bc35 100755 --- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun +++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun @@ -38,8 +38,7 @@ runApplication chtMultiRegionFoam #done # ## Run -#hostname > system/machines -#runParallel chtMultiRegionFoam 4 system/machines +#runParallel chtMultiRegionFoam 4 # ## Reconstruct #for i in bottomAir topAir heater leftSolid rightSolid diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun index ba35093d07f807e09dc9f47fc296f7154d598835..c6b98bda754e16c0a63cee7214e4ce817626bab1 100755 --- a/tutorials/multiphase/cavitatingFoam/les/Allrun +++ b/tutorials/multiphase/cavitatingFoam/les/Allrun @@ -36,8 +36,7 @@ cd throttle3D mapFields ../throttle -sourceTime latestTime >& log.mapFields runApplication decomposePar - hostname > system/machines - runParallel $application 4 system/machines + runParallel $application 4 runApplication reconstructPar cd .. diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun index 0f09de5ddcc4f9eaa35c2541bc5417a4c54f1942..695ef4d671a213fe27b4b2235133c729c6ccc83a 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun @@ -10,6 +10,5 @@ cp 0/alpha1.org 0/alpha1 cp 0/p.org 0/p runApplication setFields runApplication decomposePar -hostname > system/machines -runParallel $application 4 system/machines +runParallel $application 4 runApplication reconstructPar diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun index 22d86c6b68687184d7b2b01e816c07d1cdd4d271..03ffbeecde3c00d170e416054f8dfb99a544b4cb 100755 --- a/tutorials/multiphase/interFoam/laminar/Allrun +++ b/tutorials/multiphase/interFoam/laminar/Allrun @@ -42,7 +42,6 @@ cd damBreakFine runApplication blockMesh runApplication setFields runApplication decomposePar - hostname > system/machines - runParallel $application 4 system/machines + runParallel $application 4 runApplication reconstructPar cd .. diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun index 45bd89d8499fed7270e1be1f097fbc9199de41d5..c01559fc7760107018a2ad7d0d65f79866915e35 100755 --- a/tutorials/multiphase/interFoam/ras/Allrun +++ b/tutorials/multiphase/interFoam/ras/Allrun @@ -38,7 +38,6 @@ cd damBreakFine runApplication blockMesh runApplication setFields runApplication decomposePar - hostname > system/machines - runParallel $application 4 system/machines + runParallel $application 4 runApplication reconstructPar cd ..