GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2016-06-08 13:57:05 +01:00
258 changed files with 2035 additions and 1070 deletions

View File

@ -8,7 +8,7 @@ cd ${0%/*} || exit 1 # Run from this directory
./Allrun.pre
#-- Run on single processor
#runApplication `getApplication` &
#runApplication $(getApplication) &
# Simulated external solver
#runApplication ./externalSolver
@ -16,7 +16,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication decomposePar -allRegions
# Run OpenFOAM
runParallel `getApplication` 4 &
runParallel $(getApplication) &
# Simulated external solver
runApplication ./externalSolver

View File

@ -9,17 +9,14 @@ cd ${0%/*} || exit 1 # Run from this directory
# Set application name
application=$(getApplication)
# Get number of processors to run on
nProcs=4 #$(getNumberOfProcessors)
# decompose
runApplication -log log.decomposePar.cabin decomposePar -region cabin
runApplication -log log.decomposePar.ice decomposePar -region ice
runApplication -log log.decomposePar.exterior decomposePar -region exterior
runApplication -s cabin decomposePar -region cabin
runApplication -s ice decomposePar -region ice
runApplication -s exterior decomposePar -region exterior
runParallel $application $nProcs
runParallel $application
runApplication -log log.reconstructPar.cabin reconstructPar -region cabin
runApplication -log log.reconstructPar.ice reconstructPar -region ice
runApplication -log log.reconstructPar.exterior reconstructPar -region exterior
runApplication -s cabin reconstructPar -region cabin
runApplication -s ice reconstructPar -region ice
runApplication -s exterior reconstructPar -region exterior