Changeset 4682


Ignore:
Timestamp:
08/28/19 16:37:56 (13 months ago)
Author:
jgipsl
Message:

Updated as done in IPSLCM6.1.10-LR : new file file_def_histdaystrataer_lmdz.xml and ok_volcan became AUTO.

Location:
CONFIG/UNIFORM/v6/LMDZOR_v6
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZ/clim_360d/COMP/lmdz.card

    r4048 r4682  
    9898        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . ),   \ 
    9999        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstrataer_lmdz.xml, . ),\ 
     100        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdaystrataer_lmdz.xml, . ),\ 
    100101        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . ) 
    101102 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

    r4048 r4682  
    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/EXPERIMENTS/LMDZOR/amip_CMIP6/COMP/lmdz.card

    r4048 r4682  
    109109        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . ),   \ 
    110110        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstrataer_lmdz.xml, . ),\ 
     111        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdaystrataer_lmdz.xml, . ),\ 
    111112        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . ) 
    112113 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip_CMIP6/config.card

    r4352 r4682  
    1414TagName=LMDZOR 
    1515# LongName, ModelName and Member are used to copy dr2xml files 
    16 LongName="IPSLCM6.1.9-LR" 
     16LongName="IPSLCM6.1.10-LR" 
    1717ModelName=IPSL-CM6A-LR 
    1818Member=r1i1p1f1 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip_nudge/COMP/lmdz.card

    r4048 r4682  
    108108        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . ),   \ 
    109109        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstrataer_lmdz.xml, . ),\ 
     110        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdaystrataer_lmdz.xml, . ),\ 
    110111        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . ) 
    111112 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim_360d/COMP/lmdz.card

    r4048 r4682  
    9898        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . ),   \ 
    9999        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstrataer_lmdz.xml, . ),\ 
     100        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdaystrataer_lmdz.xml, . ),\ 
    100101        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . ) 
    101102 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/lmdz.card

    r4048 r4682  
    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/EXPERIMENTS/LMDZOR/highresmip_CMIP6/COMP/lmdz.card

    r4034 r4682  
    105105        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . ),   \ 
    106106        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstrataer_lmdz.xml, . ),\ 
     107        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdaystrataer_lmdz.xml, . ),\ 
    107108        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . ) 
    108109 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver

    r4352 r4682  
    322322    IGCM_comp_modifyXmlFile nonblocker file_def_histhfCOSP_lmdz.xml histhfCOSP enabled ${LMDZ_COSP_hf} 
    323323 
    324     # Activate the histstrataer output file only for configuration with interactive stratospheric aersols  
     324    # Activate the histstrataer output files only for configuration with interactive stratospheric aerosols  
    325325    # done by setting the key word LMDZ_strataero=y in lmdz.card 
    326326    if [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
    327327        IGCM_comp_modifyXmlFile nonblocker file_def_histstrataer_lmdz.xml histstrataer enabled .TRUE. 
     328    IGCM_comp_modifyXmlFile nonblocker file_def_histdaystrataer_lmdz.xml histdaystrataer enabled .TRUE. 
    328329    else 
    329330        IGCM_comp_modifyXmlFile nonblocker file_def_histstrataer_lmdz.xml histstrataer enabled .FALSE. 
     331    IGCM_comp_modifyXmlFile nonblocker file_def_histdaystrataer_lmdz.xml histdaystrataer enabled .FALSE. 
    330332    fi 
    331333 
     
    391393 
    392394    if [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
    393         echo "Activate coupling to INCA, set type_trac=inca in run.def" 
    394         IGCM_comp_modifyDefFile blocker run.def type_trac inca 
     395    echo "Activate coupling to INCA, set type_trac=inca in run.def" 
     396    IGCM_comp_modifyDefFile blocker run.def type_trac inca 
    395397    elif [ X${config_ListOfComponents_CHM} = Xreprobus ] ; then 
    396         echo "Activate coupling to REPROBUS, set type_trac=repr in run.def" 
    397         IGCM_comp_modifyDefFile blocker run.def type_trac repr 
     398    echo "Activate coupling to REPROBUS, set type_trac=repr in run.def" 
     399    IGCM_comp_modifyDefFile blocker run.def type_trac repr 
    398400        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    399     else 
    400         echo "No coupling to chemistry model, set type_trac=lmdz in run.def" 
    401         IGCM_comp_modifyDefFile blocker run.def type_trac lmdz 
     401    elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
     402        echo "No coupling to chemistry model but it is a LMDZ STRATAER configuration, set type_trac=coag in run.def" 
     403        IGCM_comp_modifyDefFile blocker run.def type_trac coag 
    402404        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    403     fi 
    404  
     405    else 
     406    echo "No coupling to chemistry model, set type_trac=lmdz in run.def" 
     407    IGCM_comp_modifyDefFile blocker run.def type_trac lmdz 
     408        IGCM_comp_modifyDefFile blocker run.def config_inca none 
     409    fi 
    405410 
    406411    # run.def : Activate the call to phytrac  
    407412    if [ ! X${lmdz_UserChoices_iflag_phytrac} = X ]; then  
    408413        IGCM_comp_modifyDefFile nonblocker run.def iflag_phytrac ${lmdz_UserChoices_iflag_phytrac} 
     414    elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
     415    IGCM_comp_modifyDefFile nonblocker run.def iflag_phytrac 1 
    409416    else 
    410417        IGCM_comp_modifyDefFile nonblocker run.def iflag_phytrac 0 
     
    483490        IGCM_comp_modifyDefFile nonblocker config.def pmagic DEFAULT 
    484491    fi  
     492 
     493    # config.def : Modify parameter ok_volcan if it is set in lmdz.card 
     494    if [ ! X${lmdz_UserChoices_ok_volcan} = X ]; then 
     495    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan ${lmdz_UserChoices_ok_volcan} 
     496    else 
     497    # Take default value set in config.def 
     498    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan DEFAULT 
     499    fi 
     500 
     501    # config.def : set ok_volcan to y if we are in the strataero config 
     502    if [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
     503    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan y 
     504    else 
     505    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan DEFAULT 
     506    fi 
     507 
     508    # Note: ok_volcan is a flag allowing a double-call with/without natural forcing (instead of with/without anthro forcing). 
    485509 
    486510    # physiq.def : Modify parameter tau_gl if it is set in lmdz.card 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/config.def_actuel

    r4213 r4682  
    7373# Aerosols stratospheriques utilises par defaut  
    7474flag_aerosol_strat=2 
    75 # Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
    76 ok_volcan=n 
     75# Flag to yield double call with/without natural forcing (instead of with/without anthropic) 
     76ok_volcan=_AUTO_: DEFAULT = n 
    7777# 
    7878# COSP 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/config.def_annuel

    r4213 r4682  
    7474# Aerosols stratospheriques utilises par defaut  
    7575flag_aerosol_strat=2 
    76 # Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
    77 ok_volcan=n 
     76# Flag to yield double call with/without natural forcing (instead of with/without anthropic) 
     77ok_volcan=_AUTO_: DEFAULT = n 
    7878# 
    7979# COSP 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/config.def_preind

    r4213 r4682  
    7474# 
    7575flag_aerosol_strat=2 
    76 # Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
    77 ok_volcan=n 
     76# Flag to yield double call with/without natural forcing (instead of with/without anthropic) 
     77ok_volcan=_AUTO_: DEFAULT = n 
     78# 
    7879# 
    7980# COSP 
Note: See TracChangeset for help on using the changeset viewer.