Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

requested mods to ensemble.sh #1761

Merged
merged 2 commits into from
Jul 26, 2017
Merged

requested mods to ensemble.sh #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaed023
fixed line 244 typo
allibco Jul 25, 2017
da23b12
No longer require an account number
allibco Jul 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tools/statistical_ensemble_test/ensemble.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions tools/statistical_ensemble_test/single_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down