Changeset 13382 for utils/CI/sette/sette_test-cases.sh

Timestamp:

2020-08-06T09:48:25+02:00 (4 years ago)

Author:

mathiot

Message:

sette: replace SPITZ12 and ISOMIP by ISOMIP+; Fix minor bug in sync_config() (ie sette -s option) in case MY_SRC directory does not exist.

File:

• utils/CI/sette/sette_test-cases.sh (modified) (11 diffs)

utils/CI/sette/sette_test-cases.sh

@@ -150 +150 @@
 # VORTEX         : 
 # ICE_AGRIF      : 
-# ISOMIP         : 
+# ISOMIP+         : 
 # WAD
 
@@ -706 +706 @@
 
 # ------
-# ISOMIP
+# ISOMIP+
 # ------
-if [ ${config} == "ISOMIP" ] ;  then
+if [ ${config} == "ISOMIP+" ] ;  then
 ## Restartability tests
     export TEST_NAME="LONG"
@@ -716 +716 @@
     . ${SETTE_DIR}/all_functions.sh
     #
-    clean_config ISOMIP ISOMIP_ST 'tests'
-    #
-    sync_config  ISOMIP ISOMIP_ST 'tests'
-    #
-    . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
+    clean_config ISOMIP+ ISOMIP+_ST 'tests'
+    #
+    sync_config  ISOMIP+ ISOMIP+_ST 'tests'
+    #
+    . ./makenemo -m ${CMP_NAM} -n ISOMIP+_ST -a ISOMIP+ -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
     cd ${SETTE_DIR}
     . ./param.cfg
@@ -728 +728 @@
     clean_valid_dir
     JOB_FILE=${EXE_DIR}/run_job.sh
-    NPROC=15
+    NPROC=27
     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi
     cd ${EXE_DIR}
-    set_namelist namelist_cfg cn_exp \"ISOMIP_LONG\"
-    set_namelist namelist_cfg nn_it000 1
-    set_namelist namelist_cfg nn_itend 96
-    set_namelist namelist_cfg nn_stock 48
-    set_namelist namelist_cfg jpni 5
+    set_namelist namelist_cfg cn_exp \"ISOMIP+_LONG\"
+    set_namelist namelist_cfg nn_it000 1
+    set_namelist namelist_cfg nn_itend 1200
+    set_namelist namelist_cfg nn_stock 600
+    set_namelist namelist_cfg jpni 9
     set_namelist namelist_cfg jpnj 3
     set_namelist namelist_cfg sn_cfctl%l_runstat .true.
@@ -744 +744 @@
     fi
     cd ${SETTE_DIR}
-    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID}
+    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID}
 
     cd ${SETTE_DIR}
@@ -752 +752 @@
     clean_valid_dir
     cd ${EXE_DIR}
-    set_namelist namelist_cfg cn_exp \"ISOMIP_SHORT\"
-    set_namelist namelist_cfg nn_it000 49
-    set_namelist namelist_cfg nn_itend 96
-    set_namelist namelist_cfg nn_stock 48
+    set_namelist namelist_cfg cn_exp \"ISOMIP+_SHORT\"
+    set_namelist namelist_cfg nn_it000 601
+    set_namelist namelist_cfg nn_itend 1200
+    set_namelist namelist_cfg nn_stock 600
     set_namelist namelist_cfg ln_rstart .true.
     set_namelist namelist_cfg nn_rstctl 2
-    set_namelist namelist_cfg jpni 5
+    set_namelist namelist_cfg jpni 9
     set_namelist namelist_cfg jpnj 3
     set_namelist namelist_cfg sn_cfctl%l_runstat .true.
-    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP_LONG_00000048_restart\"
+    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP+_LONG_00000600_restart\"
     if [ ${USING_MPMD} == "yes" ] ; then
        set_xio_using_server iodef.xml true
@@ -770 +770 @@
         L_NPROC=$(( $i - 1 ))
         L_NPROC=`printf "%04d\n" ${L_NPROC}`
-        ln -sf ../LONG/ISOMIP_LONG_00000048_restart_${L_NPROC}.nc .
+        ln -sf ../LONG/ISOMIP+_LONG_00000600_restart_${L_NPROC}.nc .
     done
 
     cd ${SETTE_DIR}
-    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID}
+    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID}
     cd ${SETTE_DIR}
     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG}
 
 ## Reproducibility tests
-    export TEST_NAME="REPRO_7_3"
+    export TEST_NAME="REPRO_9_3"
     cd ${MAIN_DIR}
     cd ${SETTE_DIR}
@@ -788 +788 @@
     clean_valid_dir
     JOB_FILE=${EXE_DIR}/run_job.sh
-    NPROC=21
+    NPROC=27
     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi
     cd ${EXE_DIR}
-    set_namelist namelist_cfg cn_exp \"ISOMIP_73\"
-    set_namelist namelist_cfg nn_it000 1
-    set_namelist namelist_cfg nn_itend 48
-    set_namelist namelist_cfg jpni 7
+    set_namelist namelist_cfg cn_exp \"ISOMIP+_93\"
+    set_namelist namelist_cfg nn_it000 1
+    set_namelist namelist_cfg nn_itend 600
+    set_namelist namelist_cfg jpni 9
     set_namelist namelist_cfg jpnj 3
     set_namelist namelist_cfg sn_cfctl%l_runstat .true.
@@ -803 +803 @@
     fi
     cd ${SETTE_DIR}
-    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID}
+    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID}
     cd ${SETTE_DIR}
     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG}
@@ -816 +816 @@
     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi
     cd ${EXE_DIR}
-    set_namelist namelist_cfg cn_exp \"ISOMIP_84\"
-    set_namelist namelist_cfg nn_it000 1
-    set_namelist namelist_cfg nn_itend 48
+    set_namelist namelist_cfg cn_exp \"ISOMIP+_84\"
+    set_namelist namelist_cfg nn_it000 1
+    set_namelist namelist_cfg nn_itend 600
     set_namelist namelist_cfg jpni 8
     set_namelist namelist_cfg jpnj 4
@@ -828 +828 @@
     fi
     cd ${SETTE_DIR}
-    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID}
+    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID}
     cd ${SETTE_DIR}
     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG}