Changeset 7700

Timestamp:

2017-02-20T10:43:59+01:00 (8 years ago)

Author:

mathiot

Message:

update makenemo to run ISOMIP correctly with sette.sh

Location:

branches/2017/dev_r7663_ISOMIP_TEST_CASE/NEMOGCM

Files:

• CONFIG/makenemo (modified) (1 diff)
• SETTE/sette.sh (modified) (19 diffs)

branches/2017/dev_r7663_ISOMIP_TEST_CASE/NEMOGCM/CONFIG/makenemo

@@ -250 +250 @@
 REF_CONF=${x_r}
 USP_CONF=${x_u}
-NEMO_TDIR=${x_t:-$NEMO_TDIR}
+NEMO_TDIR=${x_t}
 export NEMO_TDIR=${NEMO_TDIR:-$CONFIG_DIR}
 export NEMO_DIR=${MAIN_DIR}/${x_s}

branches/2017/dev_r7663_ISOMIP_TEST_CASE/NEMOGCM/SETTE/sette.sh

@@ -151 +151 @@
 if [ ${config} -eq 1 ] ;  then
     ## Restartability tests for GYRE
-    unset NEMO_TDIR
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
@@ -223 +222 @@
 if [ ${config} -eq 2 ] ;  then
     ## Reproducibility tests for GYRE
-    unset NEMO_TDIR
     export TEST_NAME="REPRO_4_8"
     cd ${CONFIG_DIR0}
@@ -289 +287 @@
 if [ ${config} -eq 3 ] ;  then
     ## Restartability tests for ORCA2_LIM3
-    unset NEMO_TDIR
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
@@ -361 +358 @@
 if [ ${config} -eq 4 ] ;  then
     ## Reproducibility tests for ORCA2_LIM3
-    unset NEMO_TDIR
     export TEST_NAME="REPRO_8_4"
     cd ${CONFIG_DIR0}
@@ -427 +423 @@
 if [ ${config} -eq 5 ] ;  then
     ## Restartability tests for ORCA2_LIM3_PISCES
-    unset NEMO_TDIR
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
@@ -525 +520 @@
 if [ ${config} -eq 6 ] ;  then
     ## Reproducibility tests for ORCA2_LIM3_PISCES
-    unset NEMO_TDIR
     export TEST_NAME="REPRO_4_8"
     cd ${CONFIG_DIR0}
@@ -615 +609 @@
 if [ ${config} -eq 7 ] ;  then
     ## Restartability tests for ORCA2_OFF_PISCES
-    unset NEMO_TDIR
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
@@ -707 +700 @@
 if [ ${config} -eq 8 ] ;  then
     ## Reproducibility tests for ORCA2_OFF_PISCES
-    unset NEMO_TDIR
     export TEST_NAME="REPRO_4_8"
     cd ${CONFIG_DIR0}
@@ -796 +788 @@
 if [ ${config} -eq 9 ] ;  then
     ## Restartability tests for AMM12
-    unset NEMO_TDIR
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
@@ -863 +854 @@
 if [ ${config} -eq 10 ] ;  then
 ## Reproducibility tests for AMM12
-    unset NEMO_TDIR
     export TEST_NAME="REPRO_8_4"
     cd ${CONFIG_DIR0}
@@ -926 +916 @@
 if [ ${config} -eq 11 ] ;  then
     ## Restartability tests for SAS
-    unset NEMO_TDIR
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
@@ -995 +984 @@
 if [ ${config} -eq 12 ] ;  then
     ## Restartability tests for ISOMIP
-    # to avoid unwanted ISOMIP_?? repository in CONFIG dir, unset NEMO_TDIR is needed
-    unset NEMO_TDIR            
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
@@ -1063 +1050 @@
 if [ ${config} -eq 13 ] ;  then
     ## Reproducibility tests for ISOMIP
-    # to avoid unwanted ISOMIP_?? repository in CONFIG dir, unset NEMO_TDIR is needed
-    unset NEMO_TDIR            
     export TEST_NAME="REPRO_4_8"
     cd ${CONFIG_DIR0}
@@ -1127 +1112 @@
 if [ ${config} -eq 14 ] ; then
    ## Reproducibility tests for ORCA2_LIM_OBS
-    unset NEMO_TDIR
     export TEST_NAME="REPRO_4_8"
     cd ${CONFIG_DIR0}
@@ -1213 +1197 @@
 if [ ${config} -eq 15 ] ;  then
     ## ORCA2_LIM with Agulhas AGRIF zoom in MPI
-    unset NEMO_TDIR
     export TEST_NAME="SHORT"
     cd ${CONFIG_DIR0}
@@ -1260 +1243 @@
 if [ ${config} -eq 16 ] ;  then
     # First run same as 15 but without zoom
-    unset NEMO_TDIR
     export TEST_NAME="SHORT_NOZOOM"
     cd ${CONFIG_DIR0}
@@ -1298 +1280 @@
     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG}
 
-    unset NEMO_TDIR
     export TEST_NAME="SHORT_NOAGRIF"
     cd ${CONFIG_DIR0}
@@ -1337 +1318 @@
 ## Restartability tests for ORCA2_LIM_AGRIF 
 if [ ${config} -eq 17 ] ;  then
-    unset NEMO_TDIR
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
@@ -1438 +1418 @@
 ## Reproducibility tests for ORCA2_LIM_AGRIF
 if [ ${config} -eq 18 ] ;  then
-    unset NEMO_TDIR
     export TEST_NAME="REPRO_4_4"
     cd ${CONFIG_DIR0}