From 9e8031f285c025d0378fa7c8fe79ac78498e77c3 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Fri, 3 Feb 2017 12:27:50 +0000 Subject: [PATCH] BUG: RunFunctions - updated retrieval of nProcs to suppress warning when no system/deomposeParDict --- bin/tools/RunFunctions | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index c3c6be8948..59e1d66194 100755 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -148,8 +148,9 @@ runParallel() # Store any parsed additional arguments e.g. decomposeParDict APP_PARARGS= - # Check the default decomposeParDict if available - nProcs=$(getNumberOfProcessors system/decomposeParDict) + + # Initialise number of procs to unset value + nProcs=-1 # Parse options and executable while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do @@ -185,6 +186,8 @@ runParallel() shift done + [ "$nProcs" -eq -1 ] && nProcs=$(getNumberOfProcessors system/decomposeParDict) + if [ -f log.$LOG_SUFFIX ] && [ "$LOG_IGNORE" = "false" ] then echo "$APP_NAME already run on $PWD:" \ @@ -213,7 +216,7 @@ cloneCase() else echo "Cloning $2 case from $1" mkdir $2 - cpfiles="0 system constant" + cpfiles="0.orig 0 system constant" for f in $cpfiles do \cp -r $1/$f $2