Changeset 2861 for CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER

Timestamp:

05/20/16 10:10:59 (8 years ago)

Author:

omamce

Message:

O.M.: add damping in closed seas for PISCES tracers

Location:

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER

Files:

• oasis.driver (modified) (1 diff)
• opa9.driver (modified) (3 diffs)
• pisces.driver (modified) (6 diffs)

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/oasis.driver

@@ -67 +67 @@
     (( LagAtm = 86400 / day_step * iphysiq / nsplit_phys ))
 
-    (( LagOce = 86400 / OPA_NPDT_JOUR ))
+    (( LagOce = 86400 / OPA_NPDT_DAY ))
 
-    IGCM_debug_Print 1 "OPA_NPDT_JOUR : ${OPA_NPDT_JOUR}"
+    IGCM_debug_Print 1 "OPA_NPDT_DAY : ${OPA_NPDT_DAY}"
     IGCM_debug_Print 1 "LagAtm        : ${LagAtm}"
     IGCM_debug_Print 1 "LagOce        : ${LagOce}"

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

@@ -37 +37 @@
     # OPA_RDT=$(       supergrep rn_rdt        namelist_cfg )
     # OPA_NN_FSBC=$(   supergrep nn_fsbc       namelist_cfg )
-    (( OPA_NPDT_JOUR  =  86400 / OPA_RDT        ))
+    (( OPA_NPDT_DAY   =  86400 / OPA_RDT        ))
+    (( OPA_NPDT_YEAR  =  OPA_NPDT_DAY * 365     ))
     (( OPA_RDT_SBC    =  OPA_RDT * OPA_NN_FSBC ))
  
@@ -48 +49 @@
     IGCM_debug_Print 1 "OPA_NN_FSBC    ${OPA_NN_FSBC}"
     IGCM_debug_Print 1 "OPA_RDT_SBC    ${OPA_RDT_SBC}"
-    IGCM_debug_Print 1 "OPA_NPDT_JOUR  ${OPA_NPDT_JOUR}"
+    IGCM_debug_Print 1 "OPA_NPDT_DAY   ${OPA_NPDT_DAY}"
+    IGCM_debug_Print 1 "OPA_NPDT_YEAR  ${OPA_NPDT_YEAR}"
     IGCM_debug_Print 1 "DaysSinceJC    ${DaysSinceJC}"
 
@@ -96 +98 @@
 
     ##-- Number of time steps updated : the first, the last and the number of time steps
-    (( OPA_NIT000 = ( PeriodDaysSinceJC - DaysSinceJC ) * OPA_NPDT_JOUR + 1 ))
-    (( OPA_NPDT   = PeriodLengthInDays * OPA_NPDT_JOUR ))
+    (( OPA_NIT000 = ( PeriodDaysSinceJC - DaysSinceJC ) * OPA_NPDT_DAY + 1 ))
+    (( OPA_NPDT   = PeriodLengthInDays * OPA_NPDT_DAY ))
     (( OPA_NITEND = OPA_NIT000 + OPA_NPDT - 1))
 

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/pisces.driver

@@ -6 +6 @@
     IGCM_debug_PushStack "MBG_Initialize"
 
-# Local function to find namelists parameters
-supergrep () {
-    grep "^ *$1 *=" $2 | sed -e "s% *\!.*%%"
-}
-
-# Local function to find parameters in LMDZ .def files
+    # Local function to find parameters in LMDZ .def files
 
 lmdzgrep2 () {
@@ -17 +12 @@
 }
 
+    ##--Variables used by MBG --
+
+    # ln_rsttr  boolean term for tracer model restart (true or false)
+    # nrsttr    control of the time step (0, 1 or 2)
+    
     IGCM_debug_PopStack "MBG_Initialize"
 }
@@ -29 +29 @@
 
         #echo "NO RESTART FOR TOP"
-        TOP_LRSTTR=.FALSE.
-        TOP_NRSTTR=0
+        TOP_LN_RSSTR=.FALSE.
+        TOP_NN_RSTR=0
 
     elif ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_MBG_Restart}" = "y" ] ) ; then
 
         #echo "RESTART TOP"
-        TOP_LRSTTR=.TRUE.
-        TOP_NRSTTR=0
+        TOP_LN_RSSTR=.TRUE.
+        TOP_NN_RSTR=0
 
         # If we start from IPSLCM5* restart files.
@@ -46 +46 @@
 
         #echo "RESTART TOP"
-        TOP_LRSTTR=.TRUE.
-        TOP_NRSTTR=2
+        TOP_LN_RSSTR=.TRUE.
+        TOP_NN_RSTR=2
 
     fi
@@ -76 +76 @@
         IPCC_PIS_CO2=$( echo "${PreviousLinelog[*]}" | gawk -F '|' '{gsub(" ",""); print $4}' )
         IGCM_debug_Print 1 "IPCC_PIS_CO2 : ${IPCC_PIS_CO2} "
-        IGCM_comp_modifyNamelist nonblocker    namelist_pisces_cfg atcco2 ${IPCC_PIS_CO2} 
+        IGCM_comp_modifyNamelist force  namelist_pisces_cfg atcco2 ${IPCC_PIS_CO2}
     else
         IGCM_debug_Print 1 "Take same CO2 as for LMDZ, in parameter file config.def."
-        # ATM_Update is done before MBG_Update and therefor config.def file contains the correct value for CO2.
+        # ATM_Update is done before MBG_Update and therefore config.def file contains the correct value for CO2.
         IGCM_debug_Print 1 'Update atcco2 in namelist_pisces_cfg with same value as for LMDZ'
         LMDZ_CO2=$( lmdzgrep2 co2_ppm config.def )
         IGCM_debug_Print 1 "LMDZ_CO2 : ${LMDZ_CO2} "
-        IGCM_comp_modifyNamelist nonblocker    namelist_pisces_cfg atcco2 ${LMDZ_CO2} 
+        IGCM_comp_modifyNamelist force  namelist_pisces_cfg atcco2 ${LMDZ_CO2}
     fi
 
@@ -90 +90 @@
    IGCM_comp_modifyNamelist blocker    namelist_top_cfg nn_rsttr  ${TOP_NRSTTR}
 
-   IGCM_debug_PopStack "MBG_Update"
+    IGCM_comp_modifyNamelist blocker  namelist_top_cfg     ln_rsttr   ${TOP_LN_RSSTR}
+    IGCM_comp_modifyNamelist blocker  namelist_top_cfg     nn_rsttr   ${TOP_NN_RSTR}
+    IGCM_comp_modifyNamelist blocker  namelist_pisces_cfg  nn_pisdmp  ${OPA_NPDT_YEAR}
+    
+    IGCM_debug_PopStack "MBG_Update"
 }