Changeset 5025 for CONFIG/UNIFORM/v6/NEMO_v6.5/GENERAL/DRIVER

Timestamp:

03/23/20 12:42:22 (4 years ago)

Author:

cetlod

Message:

NEMOv6.5 : update config

Location:

CONFIG/UNIFORM/v6/NEMO_v6.5/GENERAL/DRIVER

Files:

• opa9.driver (modified) (1 diff)
• pisces.driver (modified) (1 diff)

CONFIG/UNIFORM/v6/NEMO_v6.5/GENERAL/DRIVER/opa9.driver

@@ -5 +5 @@
     IGCM_debug_PushStack "OCE_Initialize"
 
-    RESOL_OCE=${config_UserChoices_ExpType%%_*}
+    if [ X$ResolOce != X ]; then
+       #ResolOce is set in config.card
+       RESOL_OCE=${ResolOce}
+    else
+       RESOL_OCE=${config_UserChoices_ExpType%%_*}
+    fi
+    ORCAGRID=${opa9_UserChoices_ORCA_version%%.*}
     exptype=${config_UserChoices_ExpType##*/}
 
     IGCM_debug_Print 1 " "
     IGCM_debug_Print 1 "RESOL_OCE        : ${RESOL_OCE}"
+    IGCM_debug_Print 1 "ORCAGRID         : ${ORCAGRID}"
     IGCM_debug_Print 1 "FORCING          : ${exptype}"
     IGCM_debug_Print 1 "EXPERIMENT TYPE  : ${opa9_UserChoices_forcing}"

CONFIG/UNIFORM/v6/NEMO_v6.5/GENERAL/DRIVER/pisces.driver

@@ -12 +12 @@
 
     if [ X"${pisces_UserChoices_Offline_Mode}" = X"y" ] ; then
-       RESOL_OCE=${config_UserChoices_ExpType%%_*}
+
+       if [ X$ResolOce != X ]; then
+          #ResolOce is set in config.card
+          RESOL_OCE=${ResolOce}
+       else
+          RESOL_OCE=${config_UserChoices_ExpType%%_*}
+       fi
+       ORCAGRID=${opa9_UserChoices_ORCA_version%%.*}
        exptype=${config_UserChoices_ExpType##*/}
 
        IGCM_debug_Print 1 " "
        IGCM_debug_Print 1 "RESOL_OCE        : ${RESOL_OCE}"
+       IGCM_debug_Print 1 "ORCAGRID         : ${ORCAGRID}"
        IGCM_debug_Print 1 "EXPERIMENT TYPE  : ${exptype}"
+
 
        OPA_RDT=$( supergrep rn_rdt  ${SUBMIT_DIR}/PARAM/NAMELIST/${RESOL_OCE}/namelist_offline_${exptype}_cfg | sed 's/ *rn_rdt *=//' | sed 's/\. *,//' )