Changeset 4722


Ignore:
Timestamp:
09/20/19 10:44:16 (5 years ago)
Author:
jgipsl
Message:

Update LMDZOR_v6.2 with changes done in IPSLCM6.2 and other way around.

Location:
CONFIG/UNIFORM/v6
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/LMDZ/CREATE_amip/config.card

    r4630 r4722  
    3232#-- Source following file with module settings, only if it exists 
    3333EnvFile=${SUBMIT_DIR}/../ARCH/arch.env 
     34#============================ 
     35#-- ResolAtm indicates the atmospheric resolution 
     36#   This variable is used in the executable name  
     37ResolAtm=144x142x79 
     38#============================ 
     39# OptMode indicates the optimization mode choosen during compilation 
     40# This variable is used in the executable name 
     41OptMode=prod 
    3442 
    3543#======================================================================== 
    … …  
    4351[Executable] 
    4452#D- For each component: Real name of executable, Name of executable in the run directory  
    45 ATM= (create_etat0_limit.e, create_etat0_limit.e, 1MPI) 
     53ATM= (ce0l_${ResolAtm}_${OptMode}.e, ce0l.e, 1MPI) 
    4654 
    4755#======================================================================== 

  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/LMDZ/CREATE_clim_360d/config.card

    r4630 r4722  
    3232#-- Source following file with module settings, only if it exists 
    3333EnvFile=${SUBMIT_DIR}/../ARCH/arch.env 
     34#============================ 
     35#-- ResolAtm indicates the atmospheric resolution 
     36#   This variable is used in the executable name  
     37ResolAtm=144x142x79 
     38#============================ 
     39# OptMode indicates the optimization mode choosen during compilation 
     40# This variable is used in the executable name 
     41OptMode=prod 
    3442 
    3543#======================================================================== 
    … …  
    4351[Executable] 
    4452#D- For each component: Real name of executable, Name of executable in the run directory  
    45 ATM= (create_etat0_limit.e, create_etat0_limit.e, 1MPI) 
     53ATM= (ce0l_${ResolAtm}_${OptMode}.e, ce0l.e, 1MPI) 
    4654 
    4755#======================================================================== 

  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/LMDZOR/amip/config.card

    r4630 r4722  
    3636#   This variable is used in the executable name  
    3737ResolAtm=144x142x79 
    38 ResolOce=ORCA1 
    3938#============================ 
    4039# OptMode indicates the optimization mode choosen during compilation 
    … …  
    5453#D-- Executable - 
    5554[Executable] 
    56 #D- For each component: Real name of executable, Name of executable in the run directory  
    57 #D- Here is set 47MPI*8OMP which is suitable for resolution 144x142x79 
     55#D- For each component: First argument is the executable name as in bin folder. 
     56#D  ResolAtm and OptMode are set in UserChoices section. 
     57#D- Here is set 71MPI*8OMP which is suitable for resolution 144x142x79 
    5858#D- Change to 31MPI*4OMP for resolution 96x95x39 
    5959ATM= (gcm_${ResolAtm}_${OptMode}.e, lmdz.x, 71MPI, 8OMP) 

  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/LMDZOR/clim_pdControl/config.card

    r4630 r4722  
    3636#   This variable is used in the executable name  
    3737ResolAtm=144x142x79 
    38 ResolOce=ORCA1 
    3938#============================ 
    4039# OptMode indicates the optimization mode choosen during compilation 
    … …  
    5453#D-- Executable - 
    5554[Executable] 
    56 #D- For each component: Real name of executable, Name of executable in the run directory  
    57 #D- Here is set 47MPI*8OMP which is suitable for resolution 144x142x79 
     55#D- For each component: First argument is the executable name as in bin folder. 
     56#D  ResolAtm and OptMode are set in UserChoices section. 
     57#D- Here is set 71MPI*8OMP which is suitable for resolution 144x142x79 
    5858#D- Change to 31MPI*4OMP for resolution 96x95x39 
    5959ATM= (gcm_${ResolAtm}_${OptMode}.e, lmdz.x, 71MPI, 8OMP) 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

    r4048 r4722  
    106106        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . ),   \ 
    107107        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstrataer_lmdz.xml, . ),\ 
     108        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdaystrataer_lmdz.xml, . ),\ 
    108109        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . ) 
    109110 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/lmdz.card

    r4048 r4722  
    101101        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . ),   \ 
    102102        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstrataer_lmdz.xml, . ),\ 
     103        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdaystrataer_lmdz.xml, . ),\ 
    103104        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . ) 
    104105 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/GENERAL/DRIVER/lmdz.driver

    r4635 r4722  
    141141        LMDZ_NMC_hf=.FALSE. 
    142142    fi 
    143      
    144143 
    145144    IGCM_debug_PopStack "ATM_Initialize" 
    … …  
    337336    if [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
    338337        IGCM_comp_modifyXmlFile nonblocker file_def_histstrataer_lmdz.xml histstrataer enabled .TRUE. 
     338        IGCM_comp_modifyXmlFile nonblocker file_def_histdaystrataer_lmdz.xml histdaystrataer enabled .TRUE. 
    339339    else 
    340340        IGCM_comp_modifyXmlFile nonblocker file_def_histstrataer_lmdz.xml histstrataer enabled .FALSE. 
     341        IGCM_comp_modifyXmlFile nonblocker file_def_histdaystrataer_lmdz.xml histdaystrataer enabled .FALSE. 
    341342    fi 
    342343 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/GENERAL/DRIVER/xios.driver

    r3864 r4722  
    2020 
    2121# Activate 2nd server level for CMIP6 type experiments (CMIP6 workflow) 
    22     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    23     IGCM_comp_modifyXmlFile force iodef.xml using_server2 NONE true 
     22    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X"$( echo ${config_UserChoices_ExpType} | grep MR025 )" != "X" ] ; then 
     23       IGCM_comp_modifyXmlFile force iodef.xml using_server2 NONE true 
    2424    fi 
    2525 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/GENERAL/PARAM/config.def_actuel

    r4632 r4722  
     1## level_coupling_esm : 0(pas d'echange de carbone), 2 (change entre LMDZ/CPL/NEMO et LMDZ/ORCHIDEE) 
     2level_coupling_esm=  _AUTO_: DEFAULT = 0 
     3## carbon_cycle_cpl: couplage des flux de carbone ATM/OCE, ATM/SRF 
     4carbon_cycle_cpl=_AUTO_ : DEFAULT=n 
     5## carbon_cycle_tr: transport atmospherique de CO2 dans LMDZ 
     6carbon_cycle_tr=_AUTO_ : DEFAULT=n 
     7## carbon_cycle_rad: utilisation de traceur CO2 dans le code radiatif 
     8carbon_cycle_rad=_AUTO_ : DEFAULT=n 
     9 
    110##  Cycle diurne  ou non                  
    211iflag_cycle_diurne=1 
    … …  
    7281#  
    7382# Aerosols stratospheriques utilises par defaut  
    74 flag_aerosol_strat= _AUTO_: DEFAULT = 2 
     83flag_aerosol_strat=2 
    7584# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
    7685ok_volcan=n 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/GENERAL/PARAM/config.def_annuel

    r4632 r4722  
     1# level_coupling_esm : 0(pas d'echange de carbone), 2 (change entre LMDZ/CPL/NEMO et LMDZ/ORCHIDEE) 
     2level_coupling_esm=  _AUTO_: DEFAULT = 0 
     3## carbon_cycle_cpl: couplage des flux de carbone ATM/OCE, ATM/SRF 
     4carbon_cycle_cpl=_AUTO_ : DEFAULT=n 
     5## carbon_cycle_tr: transport atmospherique de CO2 dans LMDZ 
     6carbon_cycle_tr=_AUTO_ : DEFAULT=n 
     7## carbon_cycle_rad: utilisation de traceur CO2 dans le code radiatif 
     8carbon_cycle_rad=_AUTO_ : DEFAULT=n 
     9 
    110##  Cycle diurne  ou non                  
    211iflag_cycle_diurne=1 
    … …  
    7382#  
    7483# Aerosols stratospheriques utilises par defaut  
    75 flag_aerosol_strat= _AUTO_: DEFAULT = 2 
     84flag_aerosol_strat=2 
    7685# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
    7786ok_volcan=n 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/GENERAL/PARAM/config.def_preind

    r4632 r4722  
     1## level_coupling_esm : 0(pas d'echange de carbone), 2 (change entre LMDZ/CPL/NEMO et LMDZ/ORCHIDEE) 
     2level_coupling_esm=  _AUTO_: DEFAULT = 0 
     3## carbon_cycle_cpl: couplage des flux de carbone ATM/OCE, ATM/SRF 
     4carbon_cycle_cpl=_AUTO_ : DEFAULT=n 
     5## carbon_cycle_tr: transport atmospherique de CO2 dans LMDZ 
     6carbon_cycle_tr=_AUTO_ : DEFAULT=n 
     7## carbon_cycle_rad: utilisation de traceur CO2 dans le code radiatif 
     8carbon_cycle_rad=_AUTO_ : DEFAULT=n 
     9 
    110##  Cycle diurne  ou non                  
    211iflag_cycle_diurne=1 
    … …  
    7382# Aerosols stratospheriques utilises par defaut  
    7483# 
    75 flag_aerosol_strat= _AUTO_: DEFAULT = 2 
     84flag_aerosol_strat=2 
    7685# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
    7786ok_volcan=n 
Note: See TracChangeset for help on using the changeset viewer.