Changeset 3124 for CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/DRIVER/opa9.driver

Timestamp:

02/14/17 07:04:10 (7 years ago)

Author:

cetlod

Message:

Update NEMO_v6 configurations

File:

• CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/DRIVER/opa9.driver (modified) (3 diffs)

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

@@ -116 +116 @@
         OPA_LRSTAR=.FALSE.
         OPA_NRSTDT=0
-        #Put OPA_NMSH=0 when OPA runnig in parallel mode 
-        OPA_NMSH=1
-        ( [ X${mpiTasks} != X ] && [ "${mpiTasks}" -gt 1 ] ) && OPA_NMSH=0
-
     elif ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "y" ] ) ; then
 
@@ -125 +121 @@
         OPA_LRSTAR=.TRUE.
         OPA_NRSTDT=0
-        OPA_NMSH=0
-
     else
 
@@ -132 +126 @@
         OPA_LRSTAR=.TRUE.
         OPA_NRSTDT=2
-        OPA_NMSH=0
-
     fi
    
-     ## nleapy configuration
-        case ${config_UserChoices_CalendarType} in
-                leap)
-                OPA_NLEAPY=1;;
-                noleap)
-                OPA_NLEAPY=0;;
-                360d)
-                OPA_NLEAPY=30;;
-        esac
+    OPA_NMSH=0
+    if [ "${opa9_UserChoices_mesh_mask}" = "y" ]; then
+        OPA_NMSH=1
+        IGCM_card_WriteOption ${SUBMIT_DIR}/COMP/opa9.card UserChoices mesh_mask "n"
+    fi
+    ## nleapy configuration
+    case ${config_UserChoices_CalendarType} in
+        ( leap|gregorian) OPA_NLEAPY=1  ;;
+        ( noleap        ) OPA_NLEAPY=0  ;;
+        ( 360d          ) OPA_NLEAPY=30 ;;
+        ( *             ) OPA_NLEAPY=30 ;;
+    esac
 
-
-        typeset -r PRECIS=8
-        NEMO_END=$( echo $( awk "BEGIN { printf \"%0${PRECIS}d\",${OPA_NITEND} }" ) ) 
+   typeset -r PRECIS=8
+   NEMO_END=$( echo $( awk "BEGIN { printf \"%0${PRECIS}d\",${OPA_NITEND} }" ) ) 
 
    IGCM_comp_modifyNamelist blocker    namelist_cfg cn_exp    ${config_UserChoices_JobName}