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

Timestamp:

05/12/16 14:05:28 (8 years ago)

Author:

cetlod

Message:

Use the IGCM_comp_modifyNamelist function for PISCES parameters

File:

• CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/pisces.driver (modified) (3 diffs)

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

@@ -16 +16 @@
      grep ${1} ${2} | grep -v "#"  | sed -e 's/=//g' -e 's/://g' -e 's/_AUTO_//' -e 's/DEFAULT//' | sed -e "s/${1}//" 
 }
-
-    ##--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)
-    
-    ##--Variables used by PISCES --
- 
-    NAMELIST_TOP_CFG=${SUBMIT_DIR}/PARAM/namelist_top_${RESOL_OCE}_cfg
-    NAMELIST_PISCES_CFG=${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}_cfg
-
-    PAT_TOP_LRSTTR=$( supergrep ln_rsttr          ${NAMELIST_TOP_CFG} )
-    PAT_TOP_NRSTTR=$( supergrep nn_rsttr          ${NAMELIST_TOP_CFG} )
-    PAT_PIS_ATCCO2=$( supergrep atcco2            ${NAMELIST_PISCES_CFG} )
-
-    IGCM_debug_Print 1 " PAT_PIS_ATCCO2 : ${PAT_PIS_ATCCO2} "
 
     IGCM_debug_PopStack "MBG_Initialize"
@@ -92 +76 @@
         IPCC_PIS_CO2=$( echo "${PreviousLinelog[*]}" | gawk -F '|' '{gsub(" ",""); print $4}' )
         IGCM_debug_Print 1 "IPCC_PIS_CO2 : ${IPCC_PIS_CO2} "
-        sed -e "s%${PAT_PIS_ATCCO2}%          atcco2=${IPCC_PIS_CO2}%"             \
-            namelist_pisces_cfg > namelist_pisces_cfg.tmp
-        IGCM_sys_Mv namelist_pisces_cfg.tmp namelist_pisces_cfg
+        IGCM_comp_modifyNamelist nonblocker    namelist_pisces_cfg atcco2 ${IPCC_PIS_CO2} 
     else
         IGCM_debug_Print 1 "Take same CO2 as for LMDZ, in parameter file config.def."
@@ -101 +83 @@
         LMDZ_CO2=$( lmdzgrep2 co2_ppm config.def )
         IGCM_debug_Print 1 "LMDZ_CO2 : ${LMDZ_CO2} "
-        sed -e "s%${PAT_PIS_ATCCO2}%          atcco2=${LMDZ_CO2}%"             \
-            namelist_pisces_cfg > namelist_pisces_cfg.tmp
-        IGCM_sys_Mv namelist_pisces_cfg.tmp namelist_pisces_cfg
+        IGCM_comp_modifyNamelist nonblocker    namelist_pisces_cfg atcco2 ${LMDZ_CO2} 
     fi
 
     ##-- Update namelist_top_cfg and namelist_pisces_cfg
+   IGCM_comp_modifyNamelist blocker    namelist_top_cfg ln_rsttr  ${TOP_LRSTTR}
+   IGCM_comp_modifyNamelist blocker    namelist_top_cfg nn_rsttr  ${TOP_NRSTTR}
 
-    sed -e "s%${PAT_TOP_LRSTTR}%          ln_rsttr=${TOP_LRSTTR}%"                   \
-        -e "s%${PAT_TOP_NRSTTR}%          nn_rsttr=${TOP_NRSTTR}%"                   \
-        namelist_top_cfg > namelist_top_cfg.tmp
-
-    IGCM_sys_Mv namelist_top_cfg.tmp namelist_top_cfg
-
-    IGCM_debug_PopStack "MBG_Update"
+   IGCM_debug_PopStack "MBG_Update"
 }