Skip to content
Snippets Groups Projects
Commit e461ef53 authored by henry's avatar henry
Browse files

Removed support for LAM.

parent 5f246c45
Branches
Tags
No related merge requests found
...@@ -53,18 +53,8 @@ runParallel () ...@@ -53,18 +53,8 @@ runParallel ()
if [ -f $log.$APP_RUN ] ; then if [ -f $log.$APP_RUN ] ; then
echo "$APP_RUN already run on $PWD: remove log file to run" echo "$APP_RUN already run on $PWD: remove log file to run"
else 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" echo "Running $APP_RUN in parallel on $PWD using $1 processes"
( mpirun -np $1 $APP_RUN -parallel < /dev/null > log.$APP_RUN 2>&1 ) ( mpirun -np $1 $APP_RUN -parallel < /dev/null > log.$APP_RUN 2>&1 )
if [ "$WM_MPLIB" = LAM ]
then
echo "Stopping LAM"
lamclean
fi
fi fi
} }
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
runApplication blockMesh runApplication blockMesh
runApplication decomposePar runApplication decomposePar
runParallel dsmcInitialise 4 system/machines runParallel dsmcInitialise 4
hostname > system/machines runParallel dsmcFoam 4
runParallel dsmcFoam 4 system/machines
runApplication reconstructPar -noLagrangian runApplication reconstructPar -noLagrangian
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
runApplication blockMesh runApplication blockMesh
runApplication decomposePar runApplication decomposePar
runParallel dsmcInitialise 4 system/machines runParallel dsmcInitialise 4
hostname > system/machines runParallel dsmcFoam 4
runParallel dsmcFoam 4 system/machines
runApplication reconstructPar -noLagrangian runApplication reconstructPar -noLagrangian
...@@ -8,9 +8,8 @@ application=`getApplication` ...@@ -8,9 +8,8 @@ application=`getApplication`
runApplication blockMesh runApplication blockMesh
runApplication decomposePar runApplication decomposePar
hostname > system/machines
runParallel mdInitialise 4 system/machines runParallel mdInitialise 4
runParallel $application 4 system/machines runParallel $application 4
runApplication reconstructPar runApplication reconstructPar
...@@ -41,8 +41,7 @@ do ...@@ -41,8 +41,7 @@ do
done done
# Run # Run
hostname > system/machines runParallel chtMultiRegionFoam 4
runParallel chtMultiRegionFoam 4 system/machines
# Reconstruct # Reconstruct
for i in bottomAir topAir heater leftSolid rightSolid for i in bottomAir topAir heater leftSolid rightSolid
......
...@@ -38,8 +38,7 @@ runApplication chtMultiRegionFoam ...@@ -38,8 +38,7 @@ runApplication chtMultiRegionFoam
#done #done
# #
## Run ## Run
#hostname > system/machines #runParallel chtMultiRegionFoam 4
#runParallel chtMultiRegionFoam 4 system/machines
# #
## Reconstruct ## Reconstruct
#for i in bottomAir topAir heater leftSolid rightSolid #for i in bottomAir topAir heater leftSolid rightSolid
......
...@@ -36,8 +36,7 @@ cd throttle3D ...@@ -36,8 +36,7 @@ cd throttle3D
mapFields ../throttle -sourceTime latestTime >& log.mapFields mapFields ../throttle -sourceTime latestTime >& log.mapFields
runApplication decomposePar runApplication decomposePar
hostname > system/machines runParallel $application 4
runParallel $application 4 system/machines
runApplication reconstructPar runApplication reconstructPar
cd .. cd ..
...@@ -10,6 +10,5 @@ cp 0/alpha1.org 0/alpha1 ...@@ -10,6 +10,5 @@ cp 0/alpha1.org 0/alpha1
cp 0/p.org 0/p cp 0/p.org 0/p
runApplication setFields runApplication setFields
runApplication decomposePar runApplication decomposePar
hostname > system/machines runParallel $application 4
runParallel $application 4 system/machines
runApplication reconstructPar runApplication reconstructPar
...@@ -42,7 +42,6 @@ cd damBreakFine ...@@ -42,7 +42,6 @@ cd damBreakFine
runApplication blockMesh runApplication blockMesh
runApplication setFields runApplication setFields
runApplication decomposePar runApplication decomposePar
hostname > system/machines runParallel $application 4
runParallel $application 4 system/machines
runApplication reconstructPar runApplication reconstructPar
cd .. cd ..
...@@ -38,7 +38,6 @@ cd damBreakFine ...@@ -38,7 +38,6 @@ cd damBreakFine
runApplication blockMesh runApplication blockMesh
runApplication setFields runApplication setFields
runApplication decomposePar runApplication decomposePar
hostname > system/machines runParallel $application 4
runParallel $application 4 system/machines
runApplication reconstructPar runApplication reconstructPar
cd .. cd ..
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment