From aaed023e7aab39849fb3e682731cdb38a5210bba Mon Sep 17 00:00:00 2001 From: allibco Date: Tue, 25 Jul 2017 15:12:36 -0600 Subject: [PATCH 1/2] fixed line 244 typo --- tools/statistical_ensemble_test/ensemble.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/statistical_ensemble_test/ensemble.sh b/tools/statistical_ensemble_test/ensemble.sh index 7ede010d643..6158802c24c 100755 --- a/tools/statistical_ensemble_test/ensemble.sh +++ b/tools/statistical_ensemble_test/ensemble.sh @@ -241,7 +241,8 @@ while [ $i -le ${#Args[@]} ]; do --ensemble ) i=$((i+1)) # Set CLONECOUNT and runtype - CLONECOUNT=${Args[$i]}-1 + #CLONECOUNT=${Args[$i]}-1 + CLONECOUNT=$((${Args[$i]}-1)) if [ $CLONECOUNT -gt 999 ]; then echo "ERROR: the number of ensemble member cannot be set to more than 999!" exit 2 From da23b12b352b8141e9b69d1c96fbc276c29d74af Mon Sep 17 00:00:00 2001 From: allibco Date: Wed, 26 Jul 2017 11:06:37 -0600 Subject: [PATCH 2/2] No longer require an account number --- tools/statistical_ensemble_test/single_run.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/statistical_ensemble_test/single_run.sh b/tools/statistical_ensemble_test/single_run.sh index 3bf60428999..6abeb5126f6 100755 --- a/tools/statistical_ensemble_test/single_run.sh +++ b/tools/statistical_ensemble_test/single_run.sh @@ -36,7 +36,7 @@ usage() { echo ' --walltime Amount of walltime requested (default = 4:30)' echo ' --account Account number to use in job scripts (default = machine default)' echo ' --compiler Compiler to use ' - echo ' --compset Compset to use (default = FC5)' + echo ' --compset Compset to use (default = F2000_DEV)' echo ' --res Resolution to run (default = ne30_ne30' echo ' --uf Enable ninth time step runs (ultra-fast mode)' if [ $ThisScript = "ensemble.sh" ]; then @@ -110,7 +110,7 @@ ThisDir=$(cd `dirname $0`; pwd -P ) # Default Values RES="ne30_ne30" -COMPSET="FC5" +COMPSET="F2000_DEV" CHANGE_NP=0 CHANGE_NPICE=0 CHANGE_NPOCN=0 @@ -302,7 +302,13 @@ case $MACH in ;; esac -NewCaseFlags="$NewCaseFlags --res $RES --compset $COMPSET --run-unsupported --project $ACCOUNT" + +if [ ! -z $ACCOUNT ]; then + NewCaseFlags="$NewCaseFlags --res $RES --compset $COMPSET --run-unsupported --project $ACCOUNT" +else + NewCaseFlags="$NewCaseFlags --res $RES --compset $COMPSET --run-unsupported" +fi + cd $SCRIPTS_ROOT echo "Currently in $SCRIPTS_ROOT" echo "Flags for create_newcase are $NewCaseFlags"