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
This commit is contained in:
parent
cd265693f5
commit
b3d47f0423
@ -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
|
||||
|
||||
|
@ -12,14 +12,14 @@ cp system/decomposeParDict.hierarchical system/decomposeParDict
|
||||
runApplication decomposePar
|
||||
|
||||
cp system/decomposeParDict.ptscotch system/decomposeParDict
|
||||
runParallel snappyHexMesh 4 -overwrite
|
||||
runParallel snappyHexMesh -overwrite
|
||||
|
||||
find . -type f -iname "*level*" -exec rm {} \;
|
||||
|
||||
ls -d processor* | xargs -I {} cp -r 0.org ./{}/0 $1
|
||||
|
||||
runParallel topoSet 4
|
||||
runParallel `getApplication` 4
|
||||
runParallel topoSet
|
||||
runParallel `getApplication`
|
||||
|
||||
runApplication reconstructParMesh -constant
|
||||
runApplication reconstructPar
|
||||
|
@ -1,9 +1,10 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # Run from this directory
|
||||
|
||||
cd ${0%/*} || exit 1
|
||||
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
|
||||
cp $FOAM_TUTORIALS/resources/geometry/cyclone.stl.gz constant/triSurface
|
||||
|
||||
runApplication blockMesh
|
||||
@ -12,4 +13,6 @@ runApplication snappyHexMesh -overwrite
|
||||
|
||||
runApplication decomposePar
|
||||
|
||||
runParallel MPPICFoam $(echo processor* | wc -w)
|
||||
runParallel MPPICFoam
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
cd hopperInitialState
|
||||
runApplication blockMesh
|
||||
runApplication decomposePar
|
||||
runParallel `getApplication` 4
|
||||
runParallel `getApplication`
|
||||
runApplication reconstructPar -latestTime
|
||||
cd ..
|
||||
|
||||
@ -17,7 +17,7 @@ cp -r 0.org 0
|
||||
runApplication blockMesh
|
||||
runApplication mapFields ../hopperInitialState -sourceTime latestTime
|
||||
runApplication decomposePar
|
||||
runParallel `getApplication` 4
|
||||
runParallel `getApplication`
|
||||
runApplication reconstructPar
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -13,7 +13,7 @@ mv log.decomposePar log.decomposePar.wallFilmRegion
|
||||
runApplication decomposePar
|
||||
mv log.decomposePar log.decomposePar.primaryRegion
|
||||
|
||||
runParallel $application 4
|
||||
runParallel $application
|
||||
|
||||
runApplication reconstructPar -region wallFilmRegion
|
||||
mv log.reconstructPar log.reconstructPar.wallFilmRegion
|
||||
|
@ -4,24 +4,21 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
# Get the number of processors to run on from system/decomposeParDict
|
||||
nProc=$(getNumberOfProcessors)
|
||||
|
||||
# copy flange surface from resources directory
|
||||
cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
|
||||
|
||||
runApplication blockMesh -region backgroundMeshDecomposition
|
||||
runApplication decomposePar -region backgroundMeshDecomposition
|
||||
|
||||
runParallel foamyHexMesh $nProc
|
||||
runParallel foamyHexMesh
|
||||
|
||||
runParallel collapseEdges $nProc -latestTime -collapseFaces
|
||||
runParallel collapseEdges -latestTime -collapseFaces
|
||||
mv log.collapseEdges log.collapseFaces
|
||||
|
||||
runParallel collapseEdges $nProc -latestTime -collapseFaceSet indirectPatchFaces
|
||||
runParallel collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
|
||||
mv log.collapseEdges log.collapseFaceSet
|
||||
|
||||
runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
|
||||
runParallel checkMesh -latestTime -allTopology -allGeometry
|
||||
|
||||
runApplication reconstructParMesh -latestTime
|
||||
|
||||
|
@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
# Get the number of processors to run on from system/decomposeParDict
|
||||
nProc=$(getNumberOfProcessors)
|
||||
|
||||
# copy flange surface from resources directory
|
||||
cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
|
||||
|
||||
@ -14,15 +11,15 @@ cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
|
||||
runApplication blockMesh -region backgroundMeshDecomposition
|
||||
runApplication decomposePar -region backgroundMeshDecomposition
|
||||
|
||||
runParallel foamyHexMesh $nProc
|
||||
runParallel foamyHexMesh
|
||||
|
||||
runParallel collapseEdges $nProc -latestTime -collapseFaces
|
||||
runParallel collapseEdges -latestTime -collapseFaces
|
||||
mv log.collapseEdges log.collapseFaces
|
||||
|
||||
runParallel collapseEdges $nProc -latestTime -collapseFaceSet indirectPatchFaces
|
||||
runParallel collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
|
||||
mv log.collapseEdges log.collapseFaceSet
|
||||
|
||||
runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
|
||||
runParallel checkMesh -latestTime -allTopology -allGeometry
|
||||
|
||||
runApplication reconstructParMesh -latestTime
|
||||
|
||||
|
@ -24,9 +24,6 @@ intersectSurfaces()
|
||||
# Set application name
|
||||
application=$(getApplication)
|
||||
|
||||
# Get number of processors to run on
|
||||
nProcs=$(getNumberOfProcessors)
|
||||
|
||||
\rm -rf 0
|
||||
|
||||
|
||||
@ -88,16 +85,16 @@ runApplication decomposePar -region backgroundMeshDecomposition
|
||||
|
||||
runApplication surfaceFeatureExtract
|
||||
|
||||
runParallel foamyHexMesh $nProcs
|
||||
runParallel foamyHexMesh
|
||||
|
||||
runParallel collapseEdges $nProcs -collapseFaces -latestTime
|
||||
runParallel collapseEdges -collapseFaces -latestTime
|
||||
mv log.collapseEdges log.collapseFaces
|
||||
|
||||
#\cp system/collapseDict.indirectPatchFaces system/collapseDict
|
||||
#runParallel collapseEdges $nProcs -collapseFaceSet indirectPatchFaces -latestTime
|
||||
#runParallel collapseEdges -collapseFaceSet indirectPatchFaces -latestTime
|
||||
#mv log.collapseEdges log.collapseFaceSet
|
||||
|
||||
runParallel checkMesh $nProcs -allTopology -allGeometry -latestTime
|
||||
runParallel checkMesh -allTopology -allGeometry -latestTime
|
||||
|
||||
runApplication reconstructParMesh -latestTime
|
||||
|
||||
|
@ -9,9 +9,6 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
# Set application name
|
||||
application=$(getApplication)
|
||||
|
||||
# Get number of processors to run on
|
||||
nProcs=$(getNumberOfProcessors)
|
||||
|
||||
\rm -rf 0
|
||||
|
||||
runApplication createBaffles -overwrite
|
||||
@ -31,7 +28,7 @@ runApplication setFields
|
||||
runApplication decomposePar -force
|
||||
|
||||
# Run
|
||||
runParallel $application $nProcs
|
||||
runParallel $application
|
||||
|
||||
# Reconstruct
|
||||
runApplication reconstructPar -noFunctionObjects
|
||||
|
@ -4,14 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
# Get the number of processors to run on from system/decomposeParDict
|
||||
nProcs=$(getNumberOfProcessors)
|
||||
|
||||
cp system/controlDict.rhoCentralFoam system/controlDict
|
||||
cp -r 0.org 0
|
||||
|
||||
runApplication decomposePar
|
||||
runParallel rhoCentralFoam $nProcs
|
||||
runParallel rhoCentralFoam
|
||||
runApplication reconstructPar
|
||||
|
||||
|
||||
|
@ -34,7 +34,7 @@ refineMeshByCellSet 1 2 3
|
||||
#runApplication mapFields ../throttle -sourceTime latestTime
|
||||
|
||||
runApplication decomposePar
|
||||
runParallel $application 4
|
||||
runParallel $application
|
||||
runApplication reconstructPar
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -8,7 +8,7 @@ runApplication blockMesh
|
||||
cp -r 0.org 0
|
||||
runApplication setFields
|
||||
runApplication decomposePar
|
||||
runParallel $(getApplication) 4
|
||||
runParallel $(getApplication)
|
||||
runApplication reconstructPar
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -39,9 +39,9 @@ runApplication setFields
|
||||
|
||||
runApplication decomposePar
|
||||
|
||||
runParallel renumberMesh 8 -overwrite
|
||||
runParallel renumberMesh -overwrite
|
||||
|
||||
runParallel $(getApplication) 8
|
||||
runParallel $(getApplication)
|
||||
|
||||
runApplication reconstructPar
|
||||
|
||||
|
@ -13,7 +13,7 @@ application=`getApplication`
|
||||
runApplication decomposePar -force
|
||||
|
||||
# Run
|
||||
runParallel $application 6
|
||||
runParallel $application
|
||||
|
||||
# Reconstruct
|
||||
runApplication reconstructPar -noFunctionObjects
|
||||
|
@ -47,7 +47,7 @@ cloneCase damBreak damBreakFine
|
||||
cp ../damBreak/0/alpha.water.org 0/alpha.water
|
||||
runApplication setFields
|
||||
runApplication decomposePar
|
||||
runParallel `getApplication` 4
|
||||
runParallel `getApplication`
|
||||
runApplication reconstructPar
|
||||
)
|
||||
|
||||
|
@ -39,7 +39,7 @@ cloneCase damBreak damBreakFine
|
||||
runApplication blockMesh
|
||||
runApplication setFields
|
||||
runApplication decomposePar
|
||||
runParallel `getApplication` 4
|
||||
runParallel `getApplication`
|
||||
runApplication reconstructPar
|
||||
)
|
||||
|
||||
|
@ -39,9 +39,9 @@ runApplication setFields
|
||||
|
||||
runApplication decomposePar
|
||||
|
||||
runParallel renumberMesh 8 -overwrite
|
||||
runParallel renumberMesh -overwrite
|
||||
|
||||
runParallel $(getApplication) 8
|
||||
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
|
||||
|
@ -13,7 +13,7 @@ cp -r 0.org 0
|
||||
runApplication blockMesh
|
||||
runApplication setFields
|
||||
runApplication decomposePar
|
||||
runParallel $application 4
|
||||
runParallel $application
|
||||
runApplication reconstructPar
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -14,7 +14,7 @@ runApplication setFields
|
||||
|
||||
#runApplication $application
|
||||
#runApplication decomposePar
|
||||
#runParallel $application 4
|
||||
#runParallel $application
|
||||
#runApplication reconstructPar
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -12,7 +12,7 @@ cp -r 0.org 0
|
||||
runApplication blockMesh
|
||||
runApplication setFields
|
||||
runApplication decomposePar
|
||||
runParallel $application 4
|
||||
runParallel $application
|
||||
runApplication reconstructPar
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
Loading…
Reference in New Issue
Block a user