Changeset 5117


Ignore:
Timestamp:
06/18/20 17:26:34 (3 weeks ago)
Author:
aclsce
Message:

Added functionality to use "CMIP6 light workflow" by activating dr2xmlIPSL variable in config.card.

Location:
CONFIG/UNIFORM/v6/IPSLCM6.2
Files:
3 added
10 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/IPSLCM/pdControl_TEST/COMP/lmdz.card

    r4918 r5117  
    8686        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \ 
    8787        (${SUBMIT_DIR}/PARAM/ping_LMDZ.xml, ping_lmdz.xml ),                \ 
     88        (${SUBMIT_DIR}/PARAM/dr2xml_IPSL_LMDZ.xml, dr2xml_lmdz.xml ),       \ 
    8889        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
    8990        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/IPSLCM/pdControl_TEST/COMP/opa9.card

    r4808 r5117  
    4747List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_ref                            , namelist_ref        ), \ 
    4848        (${SUBMIT_DIR}/PARAM/ping_nemo.xml, . )                                                                  , \ 
     49        (${SUBMIT_DIR}/PARAM/dr2xml_IPSL_nemo.xml                                         , dr2xml_opa9.xml     ), \ 
    4950        (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA1_LIM3_PISCES/EXP00/context_nemo.xml       , context_nemo.xml    ), \ 
    5051        (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA1_LIM3_PISCES/EXP00/domain_def_nemo.xml    , domain_def_nemo.xml ), \ 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/IPSLCM/pdControl_TEST/COMP/orchidee.card

    r4475 r5117  
    5050List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    5151    (${SUBMIT_DIR}/PARAM/ping_orchidee.xml, . )                       ,\ 
     52    (${SUBMIT_DIR}/PARAM/dr2xml_IPSL_orchidee.xml, dr2xml_orchidee.xml) ,\ 
    5253        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    5354        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/IPSLCM/piControl_TEST/COMP/lmdz.card

    r4918 r5117  
    8585        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \ 
    8686        (${SUBMIT_DIR}/PARAM/ping_LMDZ.xml, ping_lmdz.xml ),                \ 
     87        (${SUBMIT_DIR}/PARAM/dr2xml_IPSL_LMDZ.xml, dr2xml_lmdz.xml ),            \ 
    8788        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
    8889        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/IPSLCM/piControl_TEST/COMP/opa9.card

    r4808 r5117  
    4747List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_ref                            , namelist_ref        ), \ 
    4848        (${SUBMIT_DIR}/PARAM/ping_nemo.xml, . )                                                                  , \ 
     49        (${SUBMIT_DIR}/PARAM/dr2xml_IPSL_nemo.xml                                              , dr2xml_opa9.xml    ), \ 
    4950        (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA1_LIM3_PISCES/EXP00/context_nemo.xml       , context_nemo.xml    ), \ 
    5051        (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA1_LIM3_PISCES/EXP00/domain_def_nemo.xml    , domain_def_nemo.xml ), \ 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/EXPERIMENTS/IPSLCM/piControl_TEST/COMP/orchidee.card

    r4475 r5117  
    5050List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    5151    (${SUBMIT_DIR}/PARAM/ping_orchidee.xml, . )                       ,\ 
     52    (${SUBMIT_DIR}/PARAM/dr2xml_IPSL_orchidee.xml, dr2xml_orchidee.xml)                    ,\ 
    5253        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    5354        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/lmdz.driver

    r4919 r5117  
    554554    fi 
    555555    # Include xml files for output configuration if running with workflow CMIP6 
    556     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
     556    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
    557557        echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp 
    558         echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp 
     558    echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp 
    559559    fi 
    560560    cp iodef.xml iodef.xml.tmp 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/opa9.driver

    r4795 r5117  
    262262    #  <context id="nemo" src="./context_nemo.xml"/> 
    263263    echo '<context id="nemo" src="./context_nemo.xml"/>' > add.tmp 
    264     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    265         echo '<context id="nemo" src="./ping_nemo.xml"/>' >> add.tmp 
    266         echo '<context id="nemo" src="./dr2xml_opa9.xml"/>' >> add.tmp 
     264    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
     265      echo '<context id="nemo" src="./ping_nemo.xml"/>' >> add.tmp 
     266          echo '<context id="nemo" src="./dr2xml_opa9.xml"/>' >> add.tmp 
    267267    fi 
    268268    cp iodef.xml iodef.xml.tmp 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/orchidee.driver

    r4919 r5117  
    147147    fi 
    148148    # Include xml files for output configuration if running with workflow CMIP6 
    149     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    150         echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
    151         echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
     149    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
     150          echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
     151          echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
    152152    fi 
    153153    cp iodef.xml iodef.xml.tmp 
  • CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/xios.driver

    r4670 r5117  
    2020 
    2121# Activate 2nd server level for CMIP6 type experiments (CMIP6 workflow) 
    22     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X"$( echo ${config_UserChoices_ExpType} | grep MR025 )" != "X" ] ; then 
     22 
     23    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X"$( echo ${config_UserChoices_ExpType} | grep MR025 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
    2324       IGCM_comp_modifyXmlFile force iodef.xml using_server2 NONE true 
    2425    fi 
Note: See TracChangeset for help on using the changeset viewer.