Changeset 8979 for branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/CONFIG/makenemo

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/CONFIG/makenemo (modified) (9 diffs)

branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/CONFIG/makenemo

@@ -63 +63 @@
 # ::
 #
-#  $ ./makenemo -m ifort_osx - j3 -n ORCA2_LIM
+#  $ ./makenemo -m ifort_osx - j3 -n ORCA2_LIM3_PISCES
 #
 #
@@ -221 +221 @@
    *)
        echo " \"$1\" BAD OPTION"
-       exit
+       exit 2
        ;;
 
@@ -267 +267 @@
 #-
 #- Choose a default configuration if needed ---
-#- ORCA2_LIM or last one used ---
+#- ORCA2_LIM3_PISCES or last one used ---
 . ${COMPIL_DIR}/Fcheck_config.sh cfg.txt ${NEW_CONF} || exit
 
 if [ ${#NEW_CONF} -eq 0 ] ; then
     if [ ${#NEM_SUBDIR} -eq 0 ] && [ ${#REF_CONF} -eq 0 ] && [ ${#USP_CONF} -eq 0 ] ; then
-   echo "You are installing a new default (ORCA2_LIM) configuration"
+   echo "You are installing a new default (ORCA2_LIM3_PISCES) configuration"
    ind=0
    . ${COMPIL_DIR}/Fread_dir.sh OPA_SRC    YES
@@ -280 +280 @@
    . ${COMPIL_DIR}/Fread_dir.sh NST_SRC    YES
    . ${COMPIL_DIR}/Fread_dir.sh OFF_SRC    NO
-   REF_CONF=ORCA2_LIM
+   . ${COMPIL_DIR}/Fread_dir.sh SAO_SRC    NO
+   . ${COMPIL_DIR}/Fread_dir.sh SAS_SRC    NO
+   REF_CONF=ORCA2_LIM3_PISCES
     elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -eq 0 ] && [ ${#USP_CONF} -eq 0 ] ; then
-   echo "You are  installing a new configuration based on ORCA2_LIM"
+   echo "You are  installing a new configuration based on ORCA2_LIM3_PISCES"
    TAB=( ${NEM_SUBDIR} )
-   REF_CONF=ORCA2_LIM
+   REF_CONF=ORCA2_LIM3_PISCES
     elif [ ${#NEM_SUBDIR} -eq 0 ] && [ ${#REF_CONF} -gt 0 ]; then
    echo "You are  installing a new configuration based on ${REF_CONF}"
@@ -320 +322 @@
 #- Clean links and librairies ---
 #- Creating the good links, at first on OPA_SRC ---
-. ${COMPIL_DIR}/Fmake_WORK.sh ${x_e} ${NEW_CONF} ${TAB[*]} || exit
-
-. ${COMPIL_DIR}/Fmake_bld.sh ${CONFIG_DIR} ${NEW_CONF}  ${NEMO_TDIR} || exit
+. ${COMPIL_DIR}/Fmake_WORK.sh ${x_e} ${NEW_CONF} ${TAB[*]} || exit 3
+
+. ${COMPIL_DIR}/Fmake_bld.sh ${CONFIG_DIR} ${NEW_CONF}  ${NEMO_TDIR} || exit 3
 
 # build the complete list of the cpp keys of this configuration
@@ -360 +362 @@
 #- At this stage cpp keys have been updated. we can check the arch file
 #- When used for the first time, choose a compiler ---
-. ${COMPIL_DIR}/Fcheck_archfile.sh arch_nemo.fcm cpp.fcm ${CMP_NAM} || exit
+. ${COMPIL_DIR}/Fcheck_archfile.sh arch_nemo.fcm cpp.fcm ${CMP_NAM} || exit 3
 
 #- At this stage the configuration has beeen chosen
@@ -368 +370 @@
 #- We look after agrif
 grep key_agrif ${COMPIL_DIR}/cpp.fcm && export AGRIFUSE=1 && export USEBLD=${USEBLD/xag/}
-. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit
+. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit 3
 
 #-
@@ -383 +385 @@
     if [ ${#x_c} -eq 0 ]; then
        if [ "$AGRIFUSE" == 1 ]; then 
-          fcm build --ignore-lock  -j 1 ${COMPIL_DIR}/bld_preproagr.cfg ||{ cd - ; exit ;}
+          fcm build --ignore-lock  -j 1 ${COMPIL_DIR}/bld_preproagr.cfg ||{ cd - ; exit 1 ;}
           echo ""
           echo "---------------------------------"
@@ -391 +393 @@
        fi
     fi
-    fcm build ${x_c} --ignore-lock -v ${x_v} -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd -
+    fcm build ${x_c} --ignore-lock -v ${x_v} -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD ||{ cd - ; exit 1 ;}
     [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/opa