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.

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

v12: Updates and fixes for SCM #662

Draft
wants to merge 3 commits into
base: feature/sdrabenh/gcm_v12
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions scm_run.j
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ cd $EXPDIR

$GEOSBIN/construct_extdata_yaml_list.py GEOS_ChemGridComp.rc

cp fvcore_layout.rc input.nml

$RUN_CMD 1 ./GEOSgcm.x --logging_config 'logging.yaml'
16 changes: 11 additions & 5 deletions scm_setup
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ usage ()
echo " --account: account under which to run the job"
echo
echo " Optional argument: "
echo " --num_levels: number of levels (72, 71, 91, 132, 137, and 181 allowed)."
echo " --num_levels: number of levels (default: 181; 72, 71, 91, 132, 137, and 181 allowed)."
echo
echo
}
Expand All @@ -104,7 +104,7 @@ usage ()
selected_case=NULL
expdir=NULL
account=NULL
nlev=72
nlev=181

while [ "${1+defined}" ]
do
Expand Down Expand Up @@ -233,9 +233,13 @@ then
SED="$(command -v sed) "
ISED="$SED -i.macbak "
fi
PRELOAD_COMMAND='DYLD_INSERT_LIBRARIES'
LD_LIBRARY_PATH_CMD='DYLD_LIBRARY_PATH'
else
SED="$(command -v sed) "
ISED="$SED -i "
PRELOAD_COMMAND='LD_PRELOAD'
LD_LIBRARY_PATH_CMD='LD_LIBRARY_PATH'
fi

case $selected_case in
Expand Down Expand Up @@ -372,17 +376,17 @@ BCSTAG="Icarus_Reynolds"

case $SITE in
NCCS)
SCMDIR="/discover/swdev/gmao_SIteam/scm/scminfiles/git-v11.1/"
SCMDIR="/discover/swdev/gmao_SIteam/scm/scminfiles/git-v12.0/"
BCSDIR="/discover/nobackup/projects/gmao/share/gmao_ops/fvInput/g5gcm/bcs/Icarus/$BCSTAG"
CHMDIR="/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_nc3"
;;
NAS)
SCMDIR="/nobackup/gmao_SIteam/ModelData/scminfiles/git-v11.1/"
SCMDIR="/nobackup/gmao_SIteam/ModelData/scminfiles/git-v12.0/"
BCSDIR="/nobackup/gmao_SIteam/ModelData/bcs/Icarus/$BCSTAG"
CHMDIR="/nobackup/gmao_SIteam/ModelData/fvInput_nc3"
;;
GMAO*)
SCMDIR="/ford1/share/gmao_SIteam/ModelData/scminfiles/git-v11.1/"
SCMDIR="/ford1/share/gmao_SIteam/ModelData/scminfiles/git-v12.0/"
BCSDIR="/ford1/share/gmao_SIteam/ModelData/bcs/Icarus/$BCSTAG"
CHMDIR="/ford1/share/gmao_SIteam/ModelData/fvInput_nc3"
;;
Expand Down Expand Up @@ -513,6 +517,8 @@ s?@BATCH_TASKS?$BATCH_TASKS?g
s?@BATCH_TIME?$BATCH_TIME?g
s?@BATCH_GROUP?$BATCH_GROUP?g
s?@BATCH_JOBNAME?$BATCH_JOBNAME?g
s?@PRELOAD_COMMAND?$PRELOAD_COMMAND?g
s?@LD_LIBRARY_PATH_CMD?$LD_LIBRARY_PATH_CMD?g
EOF

$ISED -f $expdir/sedfile $expdir/scm_run.j
Expand Down
Loading