Changeset 3434

Timestamp:

10/23/17 15:21:02 (7 years ago)

Author:

cetlod

Message:

CM6.0.13 : the output frequencies of OCE, ICE & MBG must be independent + New output PISCES variables

Location:

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL

Files:

• DRIVER/lim2.driver (modified) (1 diff)
• DRIVER/lim3.driver (modified) (1 diff)
• DRIVER/opa9.driver (modified) (2 diffs)
• DRIVER/pisces.driver (modified) (2 diffs)
• PARAM/file_def_nemo-pisces.xml (modified) (6 diffs)

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

@@ -16 +16 @@
     IGCM_debug_PushStack "ICE_Update"
 
+    ##--Write Frequency for iomput
+    ## Differents frequencies are allowed for ICE files
+
+    VI1D_ENABLE=".FALSE."
+    VI5D_ENABLE=".FALSE."
+    VI1M_ENABLE=".FALSE."
+    VI1Y_ENABLE=".FALSE."
+
+    for frequency in ${config_ICE_WriteFrequency} ; do
+        case ${frequency} in
+            ( 1D|1d ) VI1D_ENABLE=".TRUE." ;;
+            ( 5D|5d ) VI5D_ENABLE=".TRUE." ;;
+            ( 1M|1m ) VI1M_ENABLE=".TRUE." ;;
+            ( *[yY] ) VI1Y_ENABLE=".TRUE." ;;
+        esac
+    done
+
+
+  # Update iodef.xml
+
+    IGCM_debug_Print 1 'Informations into iodef.xml : VI1D_ENABLE VI5D_ENABLE VI1M_ENABLE VI1Y_ENABLE '
+    IGCM_debug_Print 1 ${VI1D_ENABLE}  ${VI5D_ENABLE} ${VI1M_ENABLE} ${VI1Y_ENABLE}
+
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1d enabled ${VI1D_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 5d enabled ${VI5D_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1m enabled ${VI1M_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1y enabled ${VI1Y_ENABLE}
+
     echo UPDATE ICE !!!
 

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

@@ -16 +16 @@
     IGCM_debug_PushStack "ICE_Update"
 
+    ##--Write Frequency for iomput
+    ## Differents frequencies are allowed for ICE files
+
+    VI1D_ENABLE=".FALSE."
+    VI5D_ENABLE=".FALSE."
+    VI1M_ENABLE=".FALSE."
+    VI1Y_ENABLE=".FALSE."
+
+    for frequency in ${config_ICE_WriteFrequency} ; do
+        case ${frequency} in
+            ( 1D|1d ) VI1D_ENABLE=".TRUE." ;;
+            ( 5D|5d ) VI5D_ENABLE=".TRUE." ;;
+            ( 1M|1m ) VI1M_ENABLE=".TRUE." ;;
+            ( *[yY] ) VI1Y_ENABLE=".TRUE." ;;
+        esac
+    done
+
+
+  # Update iodef.xml
+
+    IGCM_debug_Print 1 'Informations into iodef.xml : VI1D_ENABLE VI5D_ENABLE VI1M_ENABLE VI1Y_ENABLE '
+    IGCM_debug_Print 1 ${VI1D_ENABLE}  ${VI5D_ENABLE} ${VI1M_ENABLE} ${VI1Y_ENABLE}
+
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1d enabled ${VI1D_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 5d enabled ${VI5D_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1m enabled ${VI1M_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1y enabled ${VI1Y_ENABLE}
+
     echo UPDATE ICE !!!
 

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

@@ -79 +79 @@
   
     ##--Write Frequency for iomput
-    ## Differents frequencies are allowed for grid_[TUVW] and icemod files
+    ## Differents frequencies are allowed for OCE files
 
     V1D_ENABLE=".FALSE."
@@ -188 +188 @@
     IGCM_comp_modifyXmlFile nonblocker file_def_nemo-opa.xml 1y enabled ${V1Y_ENABLE}
         
-    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1d enabled ${V1D_ENABLE}
-    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1m enabled ${V1M_ENABLE}
-    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-lim.xml 1y enabled ${V1Y_ENABLE}
-
-    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 1d enabled ${V1D_ENABLE}
-    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 1m enabled ${V1M_ENABLE}
-    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 1y enabled ${V1Y_ENABLE}
-
+ 
     # vargas/titane/MPP and switch from 1 proc to 5 procs. We need to suppres restartopa the second month, if restartopa_0000 exist
     # same thing for restart_trc and restart_ice_in

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

@@ -24 +24 @@
 {
     IGCM_debug_PushStack "MBG_Update"
+
+    ##--Write Frequency for iomput
+    ## Differents frequencies are allowed for MBG files
+
+    VT1D_ENABLE=".FALSE."
+    VT5D_ENABLE=".FALSE."
+    VT1M_ENABLE=".FALSE."
+    VT1Y_ENABLE=".FALSE."
+
+    for frequency in ${config_MBG_WriteFrequency} ; do
+        case ${frequency} in
+            ( 1D|1d ) VT1D_ENABLE=".TRUE." ;;
+            ( 5D|5d ) VT5D_ENABLE=".TRUE." ;;
+            ( 1M|1m ) VT1M_ENABLE=".TRUE." ;;
+            ( *[yY] ) VT1Y_ENABLE=".TRUE." ;;
+        esac
+    done
 
     ##-- Restart configuration
@@ -90 +107 @@
     IGCM_comp_modifyNamelist blocker  namelist_top_cfg     nn_rsttr   ${TOP_NN_RSTR}
     IGCM_comp_modifyNamelist blocker  namelist_pisces_cfg  nn_pisdmp  ${OPA_NPDT_YEAR}
-    
+ 
+    # Update iodef.xml
+
+    IGCM_debug_Print 1 'Informations into iodef.xml : VT1D_ENABLE VT5D_ENABLE VT1M_ENABLE VT1Y_ENABLE '
+    IGCM_debug_Print 1 ${VT1D_ENABLE}  ${VT5D_ENABLE} ${VT1M_ENABLE} ${VT1Y_ENABLE}
+
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 1d enabled ${VT1D_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 5d enabled ${VT5D_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 1m enabled ${VT1M_ENABLE}
+    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 1y enabled ${VT1Y_ENABLE}
+   
     IGCM_debug_PopStack "MBG_Update"
 }

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-pisces.xml

@@ -76 +76 @@
        <file id="file19" name_suffix="_diad_T" description="additional pisces diagnostics" >
         <field field_ref="PH"         name="PH" />
+        <field field_ref="CO3"        name="CO3" />
+        <field field_ref="CO3sat"     name="CO3sat" />
         <field field_ref="PAR"        name="PAR"   />
-        <field field_ref="PARDM"      name="PARDM"   />
+        <field field_ref="PCAL"       name="PCAL"   />
         <field field_ref="Cflx"       name="Cflx"  />
-        <field field_ref="Oflx"      name="Oflx"  />
+        <field field_ref="Oflx"       name="Oflx"  />
         <field field_ref="Dpco2"      name="Dpco2"   />
         <field field_ref="Dpo2"       name="Dpo2"   />
@@ -93 +95 @@
         <field field_ref="LDlight"   name="LDlight"  />
         <field field_ref="TPP"       name="TPP"  />
+        <field field_ref="INTPP"     name="INTPP"  />
+        <field field_ref="INTPNEW"     name="INTPNEW"  />
         <field field_ref="TPNEW"      name="TPNEW"  />
         <field field_ref="EPC100"    name="EPC100"  />
@@ -98 +102 @@
         <field field_ref="EPSI100"   name="EPSI100"  />
         <field field_ref="EPCAL100"  name="EPCAL100"  />
-        <field field_ref="xfracal"   name="xfracal"  />
        </file>
        
@@ -154 +157 @@
 
       <file id="file22" name_suffix="_diad_T" description="additional pisces diagnostics"  >
+
         <field field_ref="PH"         name="PH" />
+        <field field_ref="CO3"        name="CO3" />
+        <field field_ref="CO3sat"     name="CO3sat" />
         <field field_ref="PAR"        name="PAR"   />
-        <field field_ref="PARDM"      name="PARDM"   />
+        <field field_ref="PCAL"       name="PCAL"   />
         <field field_ref="Cflx"       name="Cflx"  />
-        <field field_ref="Oflx"      name="Oflx"  />
+        <field field_ref="Oflx"       name="Oflx"  />
         <field field_ref="Dpco2"      name="Dpco2"   />
         <field field_ref="Dpo2"       name="Dpo2"   />
@@ -172 +178 @@
         <field field_ref="LDlight"   name="LDlight"  />
         <field field_ref="TPP"       name="TPP"  />
+        <field field_ref="INTPP"     name="INTPP"  />
+        <field field_ref="INTPNEW"   name="INTPNEW"  />
         <field field_ref="TPNEW"      name="TPNEW"  />
         <field field_ref="EPC100"    name="EPC100"  />
@@ -178 +186 @@
         <field field_ref="EPCAL100"  name="EPCAL100"  />
         <field field_ref="xfracal"   name="xfracal"  />
-      </file>
+
+        </file>
 
        <file id="file23" name_suffix="_age" description="Age inert tracer" >