Changeset 8979 for branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/SETTE/prepare_job.sh

Timestamp:

2017-12-11T17:45:55+01:00 (6 years ago)

Author:

acc

Message:

Branch 2017/dev_r8126_ROBUST08_no_ghost. Merge in trunk changes up to rev 8864 in preparation for the merge. Sette tests OK except for AGRIF restartability but uncertain about the trunks status for this?

File:

• branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/SETTE/prepare_job.sh (modified) (2 diffs)

branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/SETTE/prepare_job.sh

@@ -151 +151 @@
 fi
 ################################################################
-
-##########################################################################
-# COPY RESTART FILES (if needed; i.e. only for SHORT job in RESTART TESTS)
-# get the input tarfile if needed
-# SF : not ok for the moment because at this point is needed cn_exp variable,
-# SF : here it it not known.
-#\cd ${EXE_DIR}
-#if [ "$(echo ${TEST_NAME} | grep -c "SHORT" )" -ne 0 ] ; then
-#    for (( i=1; i<=${NB_PROC}; ${NB_PROC}++)) ; do
-#        L_NPROC=`printf "%04d\n" $i`
-#        ln -sf ../LONG/${NEW_CONF}_00000060_restart_${L_NPROC-1}.nc .
-#    done
-#fi
-## SF : other way
-##      for file in ../LONG/${NEW_CONF}_*restart_0*.nc ; do
-##              ncpu=`echo $file | awk -F '_' '{print $NF}' | cut -f 1 -d '.'`
-##              ln -sf ${file}  .
-##      done
-##fi
-##########################################################################
 
 ################################################################
@@ -309 +289 @@
              -e"s:DEF_EXE_DIR:${EXE_DIR}:" \
              -e"s:DEF_CONFIG_DIR:${CONFIG_DIR}:" \
+             -e"s:DEF_TOOLS_DIR:${TOOLS_DIR}:" \
              -e"s:MPI_FLAG:${MPI_FLAG}:" \
              -e"s:DEF_NEMO_VALIDATION:${NEMO_VALIDATION_DIR}:" -e"s:DEF_NEW_CONF:${NEW_CONF}:" \