Changeset 6076


Ignore:
Timestamp:
03/01/22 17:05:18 (2 years ago)
Author:
jgipsl
Message:

Homogenisation of all common files in DRIVER in config : LMDZOR_v6.4 LMDZOR_v6.3 LMDZOR_v6.2 IPSLCM6.2 IPSLCM6.3

Also small clean in orchidee.card.

No changes should change the experiments.

Location:
CONFIG/UNIFORM/v6
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v6/IPSLCM6.3/GENERAL/DRIVER/lmdz.driver

    r6013 r6076  
    367367    fi 
    368368 
    369     if [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
     369    if [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ; then 
     370    echo "ESM config, with INCA and CO2i, set type_trac=inco in run.def" 
     371    IGCM_comp_modifyDefFile blocker run.def type_trac inco 
     372    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1 
     373    elif [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
    370374        echo "Activate coupling to INCA, set type_trac=inca in run.def" 
    371375        IGCM_comp_modifyDefFile blocker run.def type_trac inca 
    … …  
    380384        IGCM_comp_modifyDefFile blocker run.def type_trac co2i 
    381385        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    382         IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
     386    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
    383387    elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
    384388        echo "No coupling to chemistry model but it is a LMDZ STRATAER configuration, set type_trac=coag in run.def" 
    … …  
    480484    fi  
    481485 
    482     if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then 
     486    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then 
    483487        # Set carbon cycle parameters according to parmeters in lmdz.card  
    484488        IGCM_comp_modifyDefFile blocker config.def level_coupling_esm 2  

  • CONFIG/UNIFORM/v6/IPSLCM6.3/GENERAL/DRIVER/pisces.driver

    r5555 r6076  
    8585    IGCM_comp_modifyNamelist force  namelist_pisces_cfg atcco2 ${LMDZ_CO2} 
    8686 
    87     if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then 
     87    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then 
    8888        ##-- N2O forcing : update atcn2o value in namelist_pisces_cfg with the same one used in LMDZ 
    8989        IGCM_debug_Print 1 "Take same N2O as for LMDZ, in parameter file config.def." 
    … …  
    115115    IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 1y_pis output_level ${pisces_UserChoices_OutputLevel} 
    116116 
    117     if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then 
     117    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then 
    118118      # Output file with PISCES gas variables 
    119119      IGCM_comp_modifyXmlFile force file_def_nemo-pisces.xml file41 enabled .TRUE. 

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

    r5717 r6076  
    3232 
    3333[InitialStateFiles] 
    34 List=   (${R_IN}/SRF/soils_param.nc, . ), \ 
     34List=   (${R_IN}/SRF/SOIL/soils_param.nc, .), \ 
    3535        (${R_IN}/SRF/reftemp.nc, . ), \ 
    36         (${R_IN}/SRF/routing.nc, . ), \ 
     36        (${R_IN}/SRF/ROUTING/routing.nc, . ), \ 
    3737        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    3838        (${R_IN}/SRF/cartepente2d_15min.nc, .) 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.3/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card

    r4299 r6076  
    5858 
    5959[OutputText] 
    60 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, context_input_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
     60List=   (out_orchidee*, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, context_input_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
    6161 
    6262[OutputFiles] 

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

    r6013 r6076  
    367367    fi 
    368368 
    369     if [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
     369    if [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ; then 
     370    echo "ESM config, with INCA and CO2i, set type_trac=inco in run.def" 
     371    IGCM_comp_modifyDefFile blocker run.def type_trac inco 
     372    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1 
     373    elif [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
    370374        echo "Activate coupling to INCA, set type_trac=inca in run.def" 
    371375        IGCM_comp_modifyDefFile blocker run.def type_trac inca 
    … …  
    380384        IGCM_comp_modifyDefFile blocker run.def type_trac co2i 
    381385        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    382         IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
     386    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
    383387    elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
    384388        echo "No coupling to chemistry model but it is a LMDZ STRATAER configuration, set type_trac=coag in run.def" 
    … …  
    480484    fi  
    481485 
    482     if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then 
     486    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then 
    483487        # Set carbon cycle parameters according to parmeters in lmdz.card  
    484488        IGCM_comp_modifyDefFile blocker config.def level_coupling_esm 2  
    … …  
    556560    fi 
    557561    # Include xml files for output configuration if running with workflow CMIP6 
    558     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
     562    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
    559563        echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp 
    560         echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp 
     564    echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp 
    561565    fi 
    562566    cp iodef.xml iodef.xml.tmp 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.3/GENERAL/DRIVER/orchidee.driver

    r4936 r6076  
    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/LMDZOR_v6.3/GENERAL/DRIVER/xios.driver

    r4936 r6076  
    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 

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

    r6013 r6076  
    367367    fi 
    368368 
    369     if [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
     369    if [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ; then 
     370    echo "ESM config, with INCA and CO2i, set type_trac=inco in run.def" 
     371    IGCM_comp_modifyDefFile blocker run.def type_trac inco 
     372    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1 
     373    elif [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
    370374        echo "Activate coupling to INCA, set type_trac=inca in run.def" 
    371375        IGCM_comp_modifyDefFile blocker run.def type_trac inca 
    … …  
    380384        IGCM_comp_modifyDefFile blocker run.def type_trac co2i 
    381385        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    382         IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
     386    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
    383387    elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
    384388        echo "No coupling to chemistry model but it is a LMDZ STRATAER configuration, set type_trac=coag in run.def" 
    … …  
    480484    fi  
    481485 
    482     if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then 
     486    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then 
    483487        # Set carbon cycle parameters according to parmeters in lmdz.card  
    484488        IGCM_comp_modifyDefFile blocker config.def level_coupling_esm 2  
    … …  
    556560    fi 
    557561    # Include xml files for output configuration if running with workflow CMIP6 
    558     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
     562    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
    559563        echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp 
    560         echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp 
     564    echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp 
    561565    fi 
    562566    cp iodef.xml iodef.xml.tmp 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.4/GENERAL/DRIVER/orchidee.driver

    r4936 r6076  
    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/LMDZOR_v6.4/GENERAL/DRIVER/xios.driver

    r4936 r6076  
    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.