Changeset 4215


Ignore:
Timestamp:
01/11/19 12:01:05 (2 years ago)
Author:
acosce
Message:

propagate dev from LMDZOR_v6 (.1.8) to LMDZORINCA_v6 for GENERAL/PARAM GENERAL/DRIVER & EXPERIMENTS/LMDZOR

Location:
CONFIG/UNIFORM/v6
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

    r3967 r4215  
    1212# LMDZ_Physics=NPv6.0.15_T or NPv6.0.15_S to be used with LMDZ6/branches/IPSLCM6.0.15 rev 3224 
    1313# LMDZ_Physics=NPv6.1 to be used with LMDZ6/branches/IPSLCM6.0.15 rev 3301 
    14 LMDZ_Physics=NPv6.1 
     14# LMDZ_Physics=NPv6.1.3 as NPv6.1 but allows tau_gl to be modified 
     15LMDZ_Physics=NPv6.1.3 
    1516 
    1617# Set ConfType to choose parameters for aerosols, solar and green house gazes. 
     
    4748 
    4849# Set NMC output frequency (monthly, daily, HF) = y/n 
    49 LMDZ_NMC_monthly=y 
     50LMDZ_NMC_monthly=n 
    5051LMDZ_NMC_daily=n 
    5152LMDZ_NMC_hf=n 
     
    6162[BoundaryFiles] 
    6263# With CMIP6 aerosols version 1 
    63 List=   (${R_IN}/ATM/LIMIT/AMIP.v20170419/interpol/${RESOL_ATM_XY}_eORCA1.2_gregorian/limit_${year}.nc, limit.nc),\ 
     64List=   (${R_IN}/ATM/LIMIT/AMIP.v20180427/interpol/${RESOL_ATM_XY}_eORCA1.2_gregorian/limit_${year}.nc, limit.nc),\ 
    6465        (${R_IN}/ATM/AEROSOLS/CMIP6/v1/${RESOL_ATM_XY}/L${RESOL_ATM_Z}/aerosols${year}_from_inca.nc,              aerosols${year}.nc),\ 
    6566        (${R_IN}/ATM/OZONE/UReading/historical.v20160711.v2/interpol/${RESOL_ATM_XY}/climoz_LMDZ_${year}.nc, climoz_LMDZ.nc),\ 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip_nudge/COMP/lmdz.card

    r3967 r4215  
    1212# LMDZ_Physics=NPv6.0.15_T or NPv6.0.15_S to be used with LMDZ6/branches/IPSLCM6.0.15 rev 3224 
    1313# LMDZ_Physics=NPv6.1 to be used with LMDZ6/branches/IPSLCM6.0.15 rev 3301 
    14 LMDZ_Physics=NPv6.1 
     14# LMDZ_Physics=NPv6.1.3 as NPv6.1 but allows tau_gl to be modified 
     15LMDZ_Physics=NPv6.1.3 
    1516 
    1617# Set ConfType to choose parameters for aerosols, solar and green house gazes. 
     
    4748 
    4849# Set NMC output frequency (monthly, daily, HF) = y/n 
    49 LMDZ_NMC_monthly=y 
     50LMDZ_NMC_monthly=n 
    5051LMDZ_NMC_daily=n 
    5152LMDZ_NMC_hf=n 
     
    6162[BoundaryFiles] 
    6263# With CMIP6 aerosols version 1 
    63 List=   (${R_IN}/ATM/LIMIT/AMIP.v20170419/interpol/${RESOL_ATM_XY}_eORCA1.2_gregorian/limit_${year}.nc, limit.nc),\ 
     64List=   (${R_IN}/ATM/LIMIT/AMIP.v20180427/interpol/${RESOL_ATM_XY}_eORCA1.2_gregorian/limit_${year}.nc, limit.nc),\ 
    6465        (${R_IN}/ATM/AEROSOLS/CMIP6/v1/${RESOL_ATM_XY}/L${RESOL_ATM_Z}/aerosols${year}_from_inca.nc,              aerosols${year}.nc),\ 
    6566        (${R_IN}/ATM/OZONE/UReading/historical.v20160711.v2/interpol/${RESOL_ATM_XY}/climoz_LMDZ_${year}.nc, climoz_LMDZ.nc),\ 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim_360d/COMP/lmdz.card

    r3967 r4215  
    1212# LMDZ_Physics=NPv6.0.15_T or NPv6.0.15_S to be used with LMDZ6/branches/IPSLCM6.0.15 rev 3224 
    1313# LMDZ_Physics=NPv6.1 to be used with LMDZ6/branches/IPSLCM6.0.15 rev 3301 
    14 LMDZ_Physics=NPv6.1 
     14# LMDZ_Physics=NPv6.1.3 as NPv6.1 but allows tau_gl to be modified 
     15LMDZ_Physics=NPv6.1.3 
    1516 
    1617# Set ConfType to choose parameters for aerosols, solar and green house gazes. 
     
    4748 
    4849# Set NMC output frequency (monthly, daily, HF) = y/n 
    49 LMDZ_NMC_monthly=y 
     50LMDZ_NMC_monthly=n 
    5051LMDZ_NMC_daily=n 
    5152LMDZ_NMC_hf=n 
     
    6162[BoundaryFiles] 
    6263List=() 
    63 ListNonDel= (${R_IN}/ATM/LIMIT/AMIP.v20170419/interpol/${RESOL_ATM_XY}_eORCA1.2_360d/limit_1979_2008_clim.nc, limit.nc),\ 
     64ListNonDel= (${R_IN}/ATM/LIMIT/AMIP.v20180427/interpol/${RESOL_ATM_XY}_eORCA1.2_360d/limit_1979_2008_clim.nc, limit.nc),\ 
    6465            (${R_IN}/ATM/AEROSOLS/CMIP6/v1/${RESOL_ATM_XY}/L${RESOL_ATM_Z}/aerosols1850_from_inca.nc,   aerosols.nat.nc),\ 
    6566            (${R_IN}/ATM/AEROSOLS/CMIP6/v1/${RESOL_ATM_XY}/L${RESOL_ATM_Z}/aerosols1995_from_inca.nc,   aerosols1980.nc),\ 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim_360d/COMP/orchidee.card

    r3648 r4215  
    1111# VEGET_UPDATE_at_start=y : orchidee.driver will set VEGET_UPDATE=1Y at the first cumul period when starting a new simulation.  
    1212#                           After the first period, VEGET_UPDATE will be set according to the choice done below.   
    13 VEGET_UPDATE_at_start=y 
     13VEGET_UPDATE_at_start=n 
    1414 
    1515# VEGET_UPDATE=0Y : default, do not update the vegetation and woodharvest file except if starting without restart file 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/lmdz.card

    r3967 r4215  
    1212# LMDZ_Physics=NPv6.0.15_T or NPv6.0.15_S to be used with LMDZ6/branches/IPSLCM6.0.15 rev 3224 
    1313# LMDZ_Physics=NPv6.1 to be used with LMDZ6/branches/IPSLCM6.0.15 rev 3301 
    14 LMDZ_Physics=NPv6.1 
     14# LMDZ_Physics=NPv6.1.3 as NPv6.1 but allows tau_gl to be modified 
     15LMDZ_Physics=NPv6.1.3 
    1516 
    1617# Set ConfType to choose parameters for aerosols, solar and green house gazes. 
     
    4748 
    4849# Set NMC output frequency (monthly, daily, HF) = y/n 
    49 LMDZ_NMC_monthly=y 
     50LMDZ_NMC_monthly=n 
    5051LMDZ_NMC_daily=n 
    5152LMDZ_NMC_hf=n 
     
    6768            (${R_IN}/ATM/AEROSOLS/CMIP6/v1/${RESOL_ATM_XY}/L${RESOL_ATM_Z}/aerosols1995_from_inca.nc,   aerosols1980.nc),\ 
    6869            (${R_IN}/ATM/OZONE/UReading/historical.v20160711.v2/interpol/${RESOL_ATM_XY}/climoz_LMDZ_1979_2008_clim.nc, climoz_LMDZ.nc),\ 
    69             (${R_IN}/ATM/LIMIT/AMIP.v20170419/interpol/${RESOL_ATM_XY}_eORCA1.2_365d/limit_1979_2008_clim.nc, limit.nc),\ 
     70            (${R_IN}/ATM/LIMIT/AMIP.v20180427/interpol/${RESOL_ATM_XY}_eORCA1.2_365d/limit_1979_2008_clim.nc, limit.nc),\ 
    7071            (${R_IN}/ATM/SOLAR/CMIP6/v3.1corr/Control/solarforcing_v3.1_pdControl_ave_6bands_365days.nc, solarforcing.nc),\ 
    7172            (${R_IN}/ATM/STRATAERO/CMIP6/v3/${RESOL_ATM_XY}/L${RESOL_ATM_Z}/taulwstrat.2D.ave.nc, taulwstrat.2D.nc),\ 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card

    r3648 r4215  
    1111# VEGET_UPDATE_at_start=y : orchidee.driver will set VEGET_UPDATE=1Y at the first cumul period when starting a new simulation.  
    1212#                           After the first period, VEGET_UPDATE will be set according to the choice done below.   
    13 VEGET_UPDATE_at_start=y 
     13VEGET_UPDATE_at_start=n 
    1414 
    1515# VEGET_UPDATE=0Y : default, do not update the vegetation and woodharvest file except if starting without restart file 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver

    r4207 r4215  
    528528 
    529529    # Add include of LMDZ context in iodef.xml 
    530     # In iodef.xml add on next line after "COMPONENT CONTEXT" 
    531     #  <context id="LMDZ" src="./context_lmdz.xml"/> 
     530    # In iodef.xml add on the next line after "COMPONENT CONTEXT" 
    532531    echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp 
     532    # Add inclusion of file context_input_lmdz.xml if this file exists 
     533    if [ -f context_input_lmdz.xml ] ; then 
     534        echo '<context id="LMDZ" src="./context_input_lmdz.xml"/>' >> add.tmp 
     535    fi 
     536    # Include xml files for output configuration if running with workflow CMIP6 
    533537    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    534538        echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/orchidee.driver

    r3967 r4215  
    131131 
    132132    # Add include of orchidee context in iodef.xml 
    133     # In iodef.xml add on next line after "COMPONENT CONTEXT" 
    134     #  <context id="orchidee" src="./context_orchidee.xml"/> 
     133    # In iodef.xml add on the next line after "COMPONENT CONTEXT" 
    135134    echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp 
     135    # Add inclusion of file context_input_orchidee.xml if this file exists 
     136    if [ -f context_input_orchidee.xml ] ; then 
     137        echo '<context id="orchidee" src="./context_input_orchidee.xml"/>' >> add.tmp 
     138    fi 
     139    # Include xml files for output configuration if running with workflow CMIP6 
    136140    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    137141        echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/config.def_actuel

    r4207 r4215  
    7373# Aerosols stratospheriques utilises par defaut  
    7474flag_aerosol_strat=2 
     75# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
     76ok_volcan=n 
    7577# 
    7678# COSP 
    7779ok_cosp=_AUTO_ 
    78  
    79  
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/config.def_annuel

    r4207 r4215  
    7474# Aerosols stratospheriques utilises par defaut  
    7575flag_aerosol_strat=2 
     76# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
     77ok_volcan=n 
     78# 
    7679# COSP 
    7780ok_cosp=_AUTO_ 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/config.def_preind

    r4207 r4215  
    7474# 
    7575flag_aerosol_strat=2 
     76# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
     77ok_volcan=n 
    7678# 
    7779# COSP 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/physiq.def_NPv6.1

    r4207 r4215  
    11# 
    2 # $Id: physiq.def_NPv6.1 3675 2018-03-22 08:27:36Z jgipsl $ 
     2# $Id: physiq.def_NPv6.1 4020 2018-09-05 17:28:38Z jgipsl $ 
    33# 
    44 
  • CONFIG/UNIFORM/v6/diff_configurations.ksh

    r3127 r4215  
    1717ConfigList=`ls |grep ${ConfigFamily} |grep -v out` 
    1818#ConfigList=$ConfigList" IPSLCM6 IPSLCM6CHT" 
    19 ConfigList="LMDZOR_v6 IPSLCM6" 
     19ConfigList="LMDZOR_v6 LMDZORINCA_v6" 
    2020verbose=no 
    2121echo All configurations to tests : $ConfigList 
  • CONFIG/UNIFORM/v6/propagate_master_config.ksh

    r3055 r4215  
    2424ConfigList=`ls |grep ${ConfigFamily} |grep -v out` 
    2525ConfigList=$ConfigList" IPSLCM6"  
    26 ConfigList="IPSLCM6 LMDZOR_v6"  
     26ConfigList="LMDZOR_v6 LMDZORINCA_v6"  
    2727echo  All modifications in configuration $MasterConfig will copied to the other configurations $ConfigList . 
    2828 
Note: See TracChangeset for help on using the changeset viewer.