Changeset 9572 for branches/2017/dev_merge_2017/NEMOGCM/CONFIG/makenemo

Timestamp:

2018-05-11T13:16:06+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Global renaming for reference configurations and test cases (./CONFIG): 2 steps for removing symbolic links

• Folders
  • ORCA2_LIM3_PISCES -> ORCA2_SI3_PISCES
  • ORCA2_SAS_LIM3 -> ORCA2_SAS_SI3
• CPP keys: key_lim3 -> key_si3
• Namelists and XML
  • namelist_ice_lim3_ref -> namelist_ice_si3_ref
  • file_def_nemo-opa.xml -> file_def_nemo-oce.xml, file_def_nemo-lim.xml -> file_def_nemo-ice.xml
  • field_def_nemo-opa.xml -> field_def_nemo-oce.xml, field_def_nemo-lim.xml -> field_def_nemo-ice.xml
  • namp.zlim -> namp.zice
• Cleaning of configurations list in cfg.txt

File:

• branches/2017/dev_merge_2017/NEMOGCM/CONFIG/makenemo (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/CONFIG/makenemo

@@ -146 +146 @@
    echo "";
    echo "Example to install a new configuration MY_CONFIG";
-   echo "with OPA_SRC and LIM_SRC_2 ";
-   echo "makenemo -n MY_CONFIG -d \"OPA_SRC LIM_SRC_2\"";
+   echo "with OCE_SRC and ICE_SRC ";
+   echo "makenemo -n MY_CONFIG -d \"OCE_SRC ICE_SRC\"";
    echo "";
    echo "Available configurations :"; cat ${CONFIG_DIR}/cfg.txt;
@@ -274 +274 @@
    echo "You are installing a new default (ORCA2_LIM3_PISCES) configuration"
    ind=0
-   . ${COMPIL_DIR}/Fread_dir.sh OPA_SRC    YES
-   . ${COMPIL_DIR}/Fread_dir.sh LIM_SRC_2   YES
-   . ${COMPIL_DIR}/Fread_dir.sh LIM_SRC_3   NO
+   . ${COMPIL_DIR}/Fread_dir.sh OCE_SRC    YES
+   . ${COMPIL_DIR}/Fread_dir.sh ICE_SRC     NO
    . ${COMPIL_DIR}/Fread_dir.sh TOP_SRC    NO
    . ${COMPIL_DIR}/Fread_dir.sh NST_SRC    YES
@@ -321 +320 @@
 #- Create the WORK ---
 #- Clean links and librairies ---
-#- Creating the good links, at first on OPA_SRC ---
+#- Creating the good links, at first on OCE_SRC ---
 . ${COMPIL_DIR}/Fmake_WORK.sh ${x_e} ${NEW_CONF} ${TAB[*]} || exit 3
 
@@ -394 +393 @@
     fi
     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
+    [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/nemo
 
 #add remove for clean option
     if  [ ${#x_c} -ne 0 ]; then
-        rm -rf ${NEMO_TDIR}/${NEW_CONF}/OPAFILES
+        rm -rf ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES
         rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK
         rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD
-        rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/opa
+        rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/nemo
         rm -f ${COMPIL_DIR}/*history ${COMPIL_DIR}/*fcm ${COMPIL_DIR}/*txt
         echo "cleaning ${NEW_CONF} WORK, BLD"