From e461ef53e9d379fd90be1b4136c1fdcd6e078afa Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 10 Jul 2009 12:04:42 +0100
Subject: [PATCH] Removed support for LAM.
---
bin/tools/RunFunctions | 10 ----------
.../discreteMethods/dsmcFoam/supersonicCorner/Allrun | 5 ++---
tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun | 5 ++---
.../molecularDynamics/mdFoam/nanoNozzle/Allrun | 5 ++---
.../chtMultiRegionFoam/multiRegionHeater/Allrun | 3 +--
tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun | 3 +--
tutorials/multiphase/cavitatingFoam/les/Allrun | 3 +--
.../compressibleInterFoam/les/depthCharge3D/Allrun | 3 +--
tutorials/multiphase/interFoam/laminar/Allrun | 3 +--
tutorials/multiphase/interFoam/ras/Allrun | 3 +--
10 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 6907b291ef3..62ce3e27ef3 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 402135df749..b3690811284 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 402135df749..b3690811284 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 defa2cb875b..0e158046d9b 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 c3c4b5e504a..9acc76c4435 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 28b6133b28f..5b96ab937d0 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 ba35093d07f..c6b98bda754 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 0f09de5ddcc..695ef4d671a 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 22d86c6b686..03ffbeecde3 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 45bd89d8499..c01559fc776 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 ..
--
GitLab