Changeset 12568

Timestamp:

2020-03-18T12:01:29+01:00 (3 years ago)

Author:

mathiot

Message:

ticket2304: synchronise branch with lates revision of sette

Location:

utils/CI/sette_ticket2304

Files:

• BATCH_TEMPLATE/batch-XC40_METO (modified) (2 diffs)
• sette_reference-configurations.sh (modified) (2 diffs)

utils/CI/sette_ticket2304/BATCH_TEMPLATE/batch-XC40_METO

@@ -5 +5 @@
 #PBS -j oe
 #PBS -q normal
+#PBS -V
 #PBS -l SELECT
 
@@ -10 +11 @@
   export OMP_NUM_THREADS=1
   cd $PBS_O_WORKDIR
-  export XIO_HOME=/projects/ocean/nemo/xios/xios_1.0_r618_20150619/XIOS
+  export XIO_HOME=$xios_path
 #
   echo " ";

utils/CI/sette_ticket2304/sette_reference-configurations.sh

@@ -392 +392 @@
     set_namelist namelist_top_cfg nn_rsttr 2
     set_namelist namelist_cfg cn_ocerst_in \"O2L3P_LONG_00000496_restart\"
+    set_namelist namelist_cfg cn_icbrst_in \"O2L3P_LONG_00000496_restart_icb\"
     set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_00000496_restart_trc\"
     set_namelist namelist_ice_cfg cn_icerst_in \"O2L3P_LONG_00000496_restart_ice\"
@@ -411 +412 @@
         if [ ${USING_ICEBERGS} == "yes" ]
             then
-             ln -sf ../LONG/O2L3P_LONG_icebergs_00000496_restart_${L_NPROC}.nc O2L3P_LONG_00000496_restart_icebergs_${L_NPROC}.nc
+             ln -sf ../LONG/O2L3P_LONG_00000496_restart_icb_${L_NPROC}.nc O2L3P_LONG_00000496_restart_icb_${L_NPROC}.nc
         fi
     done