Changeset 2839

Timestamp:

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

Author:

cetlod

Message:

Use the IGCM_comp_modifyNamelist function for PISCES parameters

Location:

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL

Files:

• DRIVER/pisces.driver (modified) (3 diffs)
• PARAM/namelist_pisces_ORCA2_cfg (modified) (1 diff)
• PARAM/namelist_top_ORCA1_cfg (modified) (1 diff)
• PARAM/namelist_top_ORCA2_cfg (modified) (1 diff)

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"
 }
 

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_pisces_ORCA2_cfg

@@ -5 +5 @@
 &nampisext     !   air-sea exchange
 !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-   ln_co2int  =  .false.       ! AUTO - read atm pco2 from a file (T) or constant (F)
-   atcco2     = 0.36886500E+03 ! AUTO - atmospheric pCO2
+   ln_co2int  =  .false.        ! AUTO - read atm pco2 from a file (T) or constant (F)
+   atcco2     = 0.36886500E+03  ! AUTO - atmospheric pCO2
 /
 !'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_top_ORCA1_cfg

@@ -5 +5 @@
 &namtrc_run     !   run information
 !-----------------------------------------------------------------------
-   nn_writetrc   =  5475     !  time step frequency for sn_tracer outputs
-   ln_top_euler  = .true.    !  use Euler time-stepping for TOP
-   ln_rsttr      = .false.   !  AUTO - start from a restart file (T) or not (F)
-   nn_rsttr      =   0       !  AUTO - restart control = 0 initial time step is not compared to the restart file value
-                             !                  = 1 do not use the value in the restart file
-                             !                  = 2 calendar parameters read in the restart file
-   cn_trcrst_in  = "restart_trc"   !  suffix of pass. sn_tracer restart name (input)
-   cn_trcrst_out = "restart_trc"   !  suffix of pass. sn_tracer restart name (output)
+   ln_rsttr      = _AUTO_
+   nn_rsttr      = _AUTO_
+   ln_top_euler  = .true.
 /
 !-----------------------------------------------------------------------

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_top_ORCA2_cfg

@@ -5 +5 @@
 &namtrc_run     !   run information
 !-----------------------------------------------------------------------
-   nn_dttrc      =  1        !  time step frequency for passive sn_tracers
-   nn_writetrc   =  5475     !  time step frequency for sn_tracer outputs
-   ln_top_euler  = .true.    !  use Euler time-stepping for TOP
-   ln_rsttr      = .false.   !  AUTO - start from a restart file (T) or not (F)
-   nn_rsttr      =   0       !  AUTO - restart control = 0 initial time step is not compared to the restart file value
-                             !                  = 1 do not use the value in the restart file
-                             !                  = 2 calendar parameters read in the restart file
-   cn_trcrst_in  = "restart_trc"   !  suffix of pass. sn_tracer restart name (input)
-   cn_trcrst_out = "restart_trc"   !  suffix of pass. sn_tracer restart name (output)
+   ln_rsttr      = _AUTO_
+   nn_rsttr      = _AUTO_
+   ln_top_euler  = .true.
 /
 !-----------------------------------------------------------------------