Commit b3d47f04 authored by Henry Weller's avatar Henry Weller
Browse files

bin/tools/RunFunctions: runParallel now obtains the number of processors from numberOfSubdomains

in decomposeParDict.

This default number of processors may be overridden by the new "-np"
option to runParallel which must be specified before the application
name e.g.:

runParallel -np 4 pisoFoam
parent cd265693
......@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
......@@ -81,6 +81,7 @@ runParallel()
APP_RUN=
LOG_IGNORE=false
LOG_APPEND=false
nProcs=$(getNumberOfProcessors)
# Parse options and executable
while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do
......@@ -93,12 +94,13 @@ runParallel()
-overwrite)
LOG_IGNORE=true
;;
-np)
nProcs="$2"
shift
;;
*)
APP_RUN="$key"
APP_NAME="${key##*/}"
# also read number of processors
nProcs="$2"
shift
;;
esac
shift
......
......@@ -30,7 +30,7 @@ decomposePar -region panelRegion > log.decomposeParPanelRegion 2>&1
decomposePar -fields > log.decomposePar 2>&1
runParallel `getApplication` 6
runParallel `getApplication`
paraFoam -touch
paraFoam -touch -region panelRegion
......
......@@ -12,6 +12,6 @@ runApplication createPatch -overwrite
runApplication decomposePar -force
# Run
runParallel $application 4
runParallel $application
# -----------------------------------------------------------------------------
......@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh
runApplication decomposePar
runParallel dsmcInitialise 4
runParallel `getApplication` 4
runParallel dsmcInitialise
runParallel `getApplication`
runApplication reconstructPar -noLagrangian
# ----------------------------------------------------------------- end-of-file
......@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh
runApplication decomposePar
runParallel dsmcInitialise 4
runParallel `getApplication` 4
runParallel dsmcInitialise
runParallel `getApplication`
runApplication reconstructPar -noLagrangian
......
......@@ -11,8 +11,8 @@ runApplication blockMesh
runApplication decomposePar
runParallel mdInitialise 4
runParallel $application 4
runParallel mdInitialise
runParallel $application
runApplication reconstructPar
......
......@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication decomposePar
runParallel $(getApplication) 4 &
runParallel $(getApplication) &
./externalSolver
......
......@@ -29,7 +29,7 @@ done
runApplication decomposePar -allRegions
# Run
runParallel `getApplication` 4
runParallel `getApplication`
# Reconstruct
runApplication reconstructPar -allRegions
......
......@@ -34,7 +34,7 @@ runApplication `getApplication`
#runApplication decomposePar -allRegions
#
## Run
#runParallel `getApplication` 4
#runParallel `getApplication`
#
## Reconstruct
#runApplication reconstructPar -allRegions
......
......@@ -13,7 +13,7 @@ mv log.decomposePar log.decomposePar.air
runApplication decomposePar -region porous
mv log.decomposePar log.decomposePar.porous
runParallel $(getApplication) 4
runParallel $(getApplication)
runApplication reconstructPar -latestTime -region air
mv log.reconstructPar log.reconstructPar.air
......
......@@ -28,7 +28,7 @@ do
done
# Run
runParallel `getApplication` 4
runParallel `getApplication`
# Reconstruct
runApplication reconstructPar -allRegions
......
......@@ -10,7 +10,7 @@ application=`getApplication`
#runApplication $application
runApplication decomposePar
runParallel $application 4
runParallel $application
runApplication reconstructPar
# ----------------------------------------------------------------- end-of-file
......@@ -8,6 +8,6 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication decomposePar
runParallel $(getApplication) 4
runParallel $(getApplication)
runApplication reconstructPar
......@@ -8,6 +8,6 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication decomposePar
runParallel `getApplication` 4
runParallel `getApplication`
runApplication reconstructPar
......@@ -24,7 +24,7 @@ cp -r 0.org 0
runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
mv 0/pointDisplacement.unmapped 0/pointDisplacement
runApplication decomposePar
runParallel `getApplication` 4
runParallel `getApplication`
runApplication reconstructPar
# ----------------------------------------------------------------- end-of-file
......@@ -14,7 +14,7 @@ runApplication blockMesh
#- Run parallel
runApplication decomposePar -cellDist
runParallel $application 4
runParallel $application
runApplication reconstructPar
runApplication postChannel
......
......@@ -11,7 +11,7 @@ ls -d processor* | xargs -I {} rm -rf ./{}/0 $1
ls -d processor* | xargs -I {} mv ./{}/500 ./{}/0 $1
ls -d processor* | xargs -I {} rm -rf ./{}/0/uniform $1
runParallel pisoFoam 8
runParallel pisoFoam
runApplication reconstructParMesh -constant -mergeTol 1e-6
......
......@@ -15,16 +15,16 @@ cp system/decomposeParDict.hierarchical system/decomposeParDict
runApplication decomposePar
cp system/decomposeParDict.ptscotch system/decomposeParDict
runParallel snappyHexMesh 8 -overwrite -parallel
runParallel snappyHexMesh -overwrite -parallel
find . -type f -iname "*level*" -exec rm {} \;
ls -d processor* | xargs -I {} cp -r 0.org ./{}/0 $1
runParallel renumberMesh 8 -overwrite
runParallel renumberMesh -overwrite
runParallel potentialFoam 8 -initialiseUBCs
runParallel potentialFoam -initialiseUBCs
runParallel `getApplication` 8
runParallel `getApplication`
# ----------------------------------------------------------------- end-of-file
......@@ -11,7 +11,7 @@ runApplication surfaceFeatureExtract
runApplication blockMesh
runApplication decomposePar
runParallel snappyHexMesh 6 -overwrite
runParallel snappyHexMesh -overwrite
#- For non-parallel running
#cp -r 0.org 0 > /dev/null 2>&1
......@@ -20,9 +20,9 @@ runParallel snappyHexMesh 6 -overwrite
ls -d processor* | xargs -I {} rm -rf ./{}/0
ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
runParallel patchSummary 6
runParallel potentialFoam 6
runParallel $(getApplication) 6
runParallel patchSummary
runParallel potentialFoam
runParallel $(getApplication)
runApplication reconstructParMesh -constant
runApplication reconstructPar -latestTime
......
......@@ -14,7 +14,7 @@ cp -r 0.org 0
#runApplication $application
runApplication decomposePar -cellDist
runParallel $application 5
runParallel $application
runApplication reconstructPar
......
Supports Markdown
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