Changeset 7756

Timestamp:

2017-03-03T14:32:40+01:00 (8 years ago)

Author:

timgraham

Message:

Modification to makenemo and sette.sh so that ORCA2_LIM3_OBS and AGRIF tests test can be built using ORCA2_LIM3_PISCES as reference config without extracting TOP_SRC code.

Location:

trunk/NEMOGCM

Files:

• CONFIG/makenemo (modified) (1 diff)
• SETTE/sette.sh (modified) (6 diffs)

trunk/NEMOGCM/CONFIG/makenemo

@@ -288 +288 @@
    echo "You are  installing a new configuration based on ${REF_CONF}"
    . ${COMPIL_DIR}/Fcopy_dir.sh ${REF_CONF}
+    elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -gt 0 ]; then
+        echo "You are installing an hydrid configuration based on ${REF_CONF} with components ${NEM_SUBDIR}"
+        . ${COMPIL_DIR}/Fcopy_dir.sh ${REF_CONF}
+        TAB=( ${NEM_SUBDIR} )
     elif [ ${#NEM_SUBDIR} -eq 0 ] && [ ${#USP_CONF} -gt 0 ]; then
    echo "You are  installing a new configuration based on the unsupported (external) ${USP_CONF}"

trunk/NEMOGCM/SETTE/sette.sh

@@ -985 +985 @@
     export TEST_NAME="REPRO_4_8"
     cd ${CONFIG_DIR0}
-    . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS -r ORCA2_LIM3_PISCES -j 8 add_key "key_asminc"
+    . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3"  -j 8 add_key "key_asminc" del_key "key_top"
     cd ${SETTE_DIR}
     . ./param.cfg
@@ -1098 +1098 @@
     export TEST_NAME="SHORT"
     cd ${CONFIG_DIR0}
-    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx"
+    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top"
     cd ${SETTE_DIR}
     . ./param.cfg
@@ -1144 +1144 @@
     export TEST_NAME="SHORT_NOZOOM"
     cd ${CONFIG_DIR0}
-    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx"
+    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top"
     cd ${SETTE_DIR}
     . ./param.cfg
@@ -1181 +1181 @@
     export TEST_NAME="SHORT_NOAGRIF"
     cd ${CONFIG_DIR0}
-    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM3_PISCES -j 8 del_key "key_zdftmx"
+    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 del_key "key_zdftmx key_top"
     cd ${SETTE_DIR}
     . ./param.cfg
@@ -1219 +1219 @@
     export TEST_NAME="LONG"
     cd ${CONFIG_DIR0}
-    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx"
+    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top"
     cd ${SETTE_DIR}
     . ./param.cfg
@@ -1316 +1316 @@
     export TEST_NAME="REPRO_4_4"
     cd ${CONFIG_DIR0}
-    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx"
+    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top"
     cd ${SETTE_DIR}
     . ./param.cfg