Changeset 6035 for CONFIG/UNIFORM/v6/IPSLCM5A2CHT.2/GENERAL/DRIVER/opa9.driver

Timestamp:

01/07/22 11:35:28 (2 years ago)

Author:

acosce

Message:

in IPSLCM5A2CHT configuration :

• add parameters files need by paleo Experiment
• Add Addnoise functionality in configuration (see rev[5106] on IPSLCM5A2 configuration)
• remove .resol file not need
• add modification in driver for paleo experiment
• add iom.F90 to allow flexible handling of calendar (see rev[4930] in IPSLCM5A2CHT configuration)

File:

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

CONFIG/UNIFORM/v6/IPSLCM5A2CHT.2/GENERAL/DRIVER/opa9.driver

@@ -26 +26 @@
     supergrep () { grep "^ *$1 *=" $2 | sed -e "s% *\!.*%%" -e "s%^ *$1 *=%%" ; }
     ##--Variables used by OPA --
-    NAMELIST_OPA_CFG=${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg
+    ISPALEO=${config_UserChoices_ExpType##*/}
+    if [ "${ISPALEO}" = "paleo" ] ; then
+        NAMELIST_OPA_CFG=${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg_paleo
+    else
+        NAMELIST_OPA_CFG=${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg
+    fi
     IGCM_debug_Print 1 "namelist_cfg : ${NAMELIST_OPA_CFG}"
     if [ ! -r ${NAMELIST_OPA_CFG} ] ; then
@@ -38 +43 @@
     # OPA_NN_FSBC=$(   supergrep nn_fsbc       namelist_cfg )
     (( OPA_NPDT_DAY   =  86400 / OPA_RDT        ))
-    (( OPA_NPDT_YEAR  =  OPA_NPDT_DAY * 365     ))
     (( OPA_RDT_SBC    =  OPA_RDT * OPA_NN_FSBC ))
+    # nleapy configuration + OPA_NPDT_YEAR
+    case ${config_UserChoices_CalendarType} in
+        ( leap|gregorian) OPA_NLEAPY=1
+                          (( OPA_NPDT_YEAR  =  OPA_NPDT_DAY * 365     )) ;;
+        ( noleap        ) OPA_NLEAPY=0
+                          (( OPA_NPDT_YEAR  =  OPA_NPDT_DAY * 365     )) ;;
+        ( 360d          ) OPA_NLEAPY=30
+                          (( OPA_NPDT_YEAR  =  OPA_NPDT_DAY * 360     )) ;;
+        ( *             ) OPA_NLEAPY=30
+                          (( OPA_NPDT_YEAR  =  OPA_NPDT_DAY * 360     )) ;;
+    esac
  
     # Period Length In Days between DateBegin and first day of calendar 0001 01 01
@@ -145 +160 @@
     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
 
     if ( [ "${opa9_UserChoices_Reproducibility_after_restart}" = "y" ] ) ; then