Fix from 2digit to 3

NorESMhub · Apr 22, 2021 · 2017f44 · 2017f44
1 parent ee2c1c5
commit 2017f44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Prediction/create_template.sh b/Prediction/create_template.sh
@@ -85,9 +85,9 @@ then
       ./xmlchange -file env_conf.xml -id RUN_STARTDATE -val ${START_YEAR1}-${START_MONTH1}-${START_DAY1}
   fi
 else
-  REST_PATH=$REST_PATH_LOCAL/${REST_PREFIX}${MEMBER1:-01}/${START_YEAR1}-${START_MONTH1}-${START_DAY1}-00000
+  REST_PATH=$REST_PATH_LOCAL/${REST_PREFIX}${MEMBER1:-001}/${START_YEAR1}-${START_MONTH1}-${START_DAY1}-00000
   if [ ! -e "$REST_PATH" ] ; then
-      REST_PATH="$REST_PATH_LOCAL/${REST_PREFIX}${MEMBER1:-01}/rest/${START_YEAR1}-${START_MONTH1}-${START_DAY1}-00000"
+      REST_PATH="$REST_PATH_LOCAL/${REST_PREFIX}${MEMBER1:-001}/rest/${START_YEAR1}-${START_MONTH1}-${START_DAY1}-00000"
   fi
   if [ $CESMVERSION == '2' ]; then
       ##need be check## ./xmlchange --id BRNCH_RETAIN_CASENAME --val TRUE

diff --git a/Prediction/submit_ensemble.sh b/Prediction/submit_ensemble.sh
@@ -71,7 +71,8 @@ if [ $CESMVERSION == '2' ]; then   ## much differences in CESM2
     ## submit case.st_archive of other members
     echo ++ Submit st_archive of other members
     for i in $(seq -w $(($MEM001 +1)) $(($MEM001+$NMEMBER-1))) ; do
-        cd "${CASESROOT}/${ENSEMBLE_PREFIX1}/${ENSEMBLE_PREFIX1}_${MEMBERTAG}${i}"
+        ii=$(printf "%3.3d" ${i})
+        cd "${CASESROOT}/${ENSEMBLE_PREFIX1}/${ENSEMBLE_PREFIX1}_${MEMBERTAG}${ii}"
         ./xmlchange RESUBMIT=0
         ./case.submit --job case.st_archive --prereq ${jobid}
     done

diff --git a/Prediction/use_cases/template_betzy.in b/Prediction/use_cases/template_betzy.in
@@ -29,7 +29,8 @@ WORK=/cluster/work/users/$USER
 CASESROOT=$WORK/norcpm_cases
 EXESROOT=$WORK/noresm/
 ARCHIVESROOT=$WORK/archive
-CCSMROOT=$HOME/NorESM
+## Set CCSMROOT to ../.. of Prediction/
+CCSMROOT=$(readlink -f $(dirname $(readlink -f $0))/../..)
 
 ### Case settings
 PREFIX='Casename'