Changeset 2839


Ignore:
Timestamp:
05/12/16 14:05:28 (5 years ago)
Author:
cetlod
Message:

Use the IGCM_comp_modifyNamelist function for PISCES parameters

Location:
CONFIG/UNIFORM/v6/IPSLCM6/GENERAL
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/pisces.driver

    r2753 r2839  
    1616     grep ${1} ${2} | grep -v "#"  | sed -e 's/=//g' -e 's/://g' -e 's/_AUTO_//' -e 's/DEFAULT//' | sed -e "s/${1}//"  
    1717} 
    18  
    19     ##--Variables used by MBG -- 
    20  
    21     # ln_rsttr  boolean term for tracer model restart (true or false) 
    22     # nrsttr    control of the time step (0, 1 or 2) 
    23      
    24     ##--Variables used by PISCES -- 
    25   
    26     NAMELIST_TOP_CFG=${SUBMIT_DIR}/PARAM/namelist_top_${RESOL_OCE}_cfg 
    27     NAMELIST_PISCES_CFG=${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}_cfg 
    28  
    29     PAT_TOP_LRSTTR=$( supergrep ln_rsttr          ${NAMELIST_TOP_CFG} ) 
    30     PAT_TOP_NRSTTR=$( supergrep nn_rsttr          ${NAMELIST_TOP_CFG} ) 
    31     PAT_PIS_ATCCO2=$( supergrep atcco2            ${NAMELIST_PISCES_CFG} ) 
    32  
    33     IGCM_debug_Print 1 " PAT_PIS_ATCCO2 : ${PAT_PIS_ATCCO2} " 
    3418 
    3519    IGCM_debug_PopStack "MBG_Initialize" 
     
    9276        IPCC_PIS_CO2=$( echo "${PreviousLinelog[*]}" | gawk -F '|' '{gsub(" ",""); print $4}' ) 
    9377        IGCM_debug_Print 1 "IPCC_PIS_CO2 : ${IPCC_PIS_CO2} " 
    94         sed -e "s%${PAT_PIS_ATCCO2}%          atcco2=${IPCC_PIS_CO2}%"             \ 
    95             namelist_pisces_cfg > namelist_pisces_cfg.tmp 
    96         IGCM_sys_Mv namelist_pisces_cfg.tmp namelist_pisces_cfg 
     78        IGCM_comp_modifyNamelist nonblocker    namelist_pisces_cfg atcco2 ${IPCC_PIS_CO2}  
    9779    else 
    9880        IGCM_debug_Print 1 "Take same CO2 as for LMDZ, in parameter file config.def." 
     
    10183        LMDZ_CO2=$( lmdzgrep2 co2_ppm config.def ) 
    10284        IGCM_debug_Print 1 "LMDZ_CO2 : ${LMDZ_CO2} " 
    103         sed -e "s%${PAT_PIS_ATCCO2}%          atcco2=${LMDZ_CO2}%"             \ 
    104             namelist_pisces_cfg > namelist_pisces_cfg.tmp 
    105         IGCM_sys_Mv namelist_pisces_cfg.tmp namelist_pisces_cfg 
     85        IGCM_comp_modifyNamelist nonblocker    namelist_pisces_cfg atcco2 ${LMDZ_CO2}  
    10686    fi 
    10787 
    10888    ##-- Update namelist_top_cfg and namelist_pisces_cfg 
     89   IGCM_comp_modifyNamelist blocker    namelist_top_cfg ln_rsttr  ${TOP_LRSTTR} 
     90   IGCM_comp_modifyNamelist blocker    namelist_top_cfg nn_rsttr  ${TOP_NRSTTR} 
    10991 
    110     sed -e "s%${PAT_TOP_LRSTTR}%          ln_rsttr=${TOP_LRSTTR}%"                   \ 
    111         -e "s%${PAT_TOP_NRSTTR}%          nn_rsttr=${TOP_NRSTTR}%"                   \ 
    112         namelist_top_cfg > namelist_top_cfg.tmp 
    113  
    114     IGCM_sys_Mv namelist_top_cfg.tmp namelist_top_cfg 
    115  
    116     IGCM_debug_PopStack "MBG_Update" 
     92   IGCM_debug_PopStack "MBG_Update" 
    11793} 
    11894 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_pisces_ORCA2_cfg

    r2451 r2839  
    55&nampisext     !   air-sea exchange 
    66!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 
    7    ln_co2int  =  .false.       ! AUTO - read atm pco2 from a file (T) or constant (F) 
    8    atcco2     = 0.36886500E+03 ! AUTO - atmospheric pCO2 
     7   ln_co2int  =  .false.        ! AUTO - read atm pco2 from a file (T) or constant (F) 
     8   atcco2     = 0.36886500E+03  ! AUTO - atmospheric pCO2 
    99/ 
    1010!''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_top_ORCA1_cfg

    r2834 r2839  
    55&namtrc_run     !   run information 
    66!----------------------------------------------------------------------- 
    7    nn_writetrc   =  5475     !  time step frequency for sn_tracer outputs 
    8    ln_top_euler  = .true.    !  use Euler time-stepping for TOP 
    9    ln_rsttr      = .false.   !  AUTO - start from a restart file (T) or not (F) 
    10    nn_rsttr      =   0       !  AUTO - restart control = 0 initial time step is not compared to the restart file value 
    11                              !                  = 1 do not use the value in the restart file 
    12                              !                  = 2 calendar parameters read in the restart file 
    13    cn_trcrst_in  = "restart_trc"   !  suffix of pass. sn_tracer restart name (input) 
    14    cn_trcrst_out = "restart_trc"   !  suffix of pass. sn_tracer restart name (output) 
     7   ln_rsttr      = _AUTO_ 
     8   nn_rsttr      = _AUTO_ 
     9   ln_top_euler  = .true. 
    1510/ 
    1611!----------------------------------------------------------------------- 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_top_ORCA2_cfg

    r2834 r2839  
    55&namtrc_run     !   run information 
    66!----------------------------------------------------------------------- 
    7    nn_dttrc      =  1        !  time step frequency for passive sn_tracers 
    8    nn_writetrc   =  5475     !  time step frequency for sn_tracer outputs 
    9    ln_top_euler  = .true.    !  use Euler time-stepping for TOP 
    10    ln_rsttr      = .false.   !  AUTO - start from a restart file (T) or not (F) 
    11    nn_rsttr      =   0       !  AUTO - restart control = 0 initial time step is not compared to the restart file value 
    12                              !                  = 1 do not use the value in the restart file 
    13                              !                  = 2 calendar parameters read in the restart file 
    14    cn_trcrst_in  = "restart_trc"   !  suffix of pass. sn_tracer restart name (input) 
    15    cn_trcrst_out = "restart_trc"   !  suffix of pass. sn_tracer restart name (output) 
     7   ln_rsttr      = _AUTO_ 
     8   nn_rsttr      = _AUTO_ 
     9   ln_top_euler  = .true. 
    1610/ 
    1711!----------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.