Changeset 8328 for trunk/NEMOGCM/CONFIG/makenemo

Timestamp:

2017-07-13T13:32:56+02:00 (7 years ago)

Author:

rblod

Message:

Fix default config in makenemo see ticket #1929

File:

• trunk/NEMOGCM/CONFIG/makenemo (modified) (3 diffs)

trunk/NEMOGCM/CONFIG/makenemo

@@ -63 +63 @@
 # ::
 #
-#  $ ./makenemo -m ifort_osx - j3 -n ORCA2_LIM
+#  $ ./makenemo -m ifort_osx - j3 -n ORCA2_LIM3_PISCES
 #
 #
@@ -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}"