Changeset 6290 for CONFIG/UNIFORM/v7


Ignore:
Timestamp:
12/21/22 15:49:31 (19 months ago)
Author:
aclsce
Message:
  • Finalized merge in ICOLMDZOR configuration :
    • compilation : added rad option (with correct handling of svn test version)
    • experiments : merge with LMDZOR_v6.2 configuration, handling of remap frequency for ORCHIDEE xml file_def
    • cleaning and other small things
Location:
CONFIG/UNIFORM/v7/ICOLMDZOR_v7
Files:
1 added
27 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/CREATE_amip/COMP/lmdz.card

    r5878 r6290  
    7474        (${SUBMIT_DIR}/PARAM/run.def, .), \ 
    7575        (${SUBMIT_DIR}/PARAM/guide.def, .), \ 
    76         (${SUBMIT_DIR}/PARAM/traceur.def, .) 
     76        (${SUBMIT_DIR}/PARAM/tracer.def, .) 
    7777 
    7878[RestartFiles] 
     
    8080 
    8181[OutputText] 
    82 List=   (physiq.def, gcm.def, vert.def, run.def, config.def, traceur.def, guide.def, context_lmdz.xml, context_input_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml) 
     82List=   (physiq.def, gcm.def, vert.def, run.def, config.def, tracer.def, guide.def, context_lmdz.xml, context_input_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml) 
    8383 
    8484[OutputFiles] 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/CREATE_hadisst/COMP/lmdz.card

    r5878 r6290  
    7474        (${SUBMIT_DIR}/PARAM/run.def, .), \ 
    7575        (${SUBMIT_DIR}/PARAM/guide.def, .), \ 
    76         (${SUBMIT_DIR}/PARAM/traceur.def, .) 
     76        (${SUBMIT_DIR}/PARAM/tracer.def, .) 
    7777 
    7878[RestartFiles] 
     
    8080 
    8181[OutputText] 
    82 List=   (physiq.def, gcm.def, vert.def, run.def, config.def, traceur.def, guide.def, context_lmdz.xml, context_input_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml) 
     82List=   (physiq.def, gcm.def, vert.def, run.def, config.def, tracer.def, guide.def, context_lmdz.xml, context_input_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml) 
    8383 
    8484[OutputFiles] 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/clim_noleap/COMP/lmdz.card

    r6070 r6290  
    7878        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
    7979        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \ 
    80         (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \ 
     80        (${SUBMIT_DIR}/PARAM/tracer.def, .),                               \ 
    8181        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
    8282        (${MODIPSL}/modeles/LMDZ/DefLists/context_input_lmdz.xml, . ),      \ 
     
    102102 
    103103[OutputText] 
    104 List=   (physiq.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
     104List=   (physiq.def, run.def, tracer.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
    105105 
    106106[OutputFiles] 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/lmdz.card

    r6284 r6290  
    102102 
    103103[OutputText] 
    104 List=   (physiq.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
     104List=   (physiq.def, run.def, tracer.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
    105105 
    106106[OutputFiles] 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/orchidee.card

    r6284 r6290  
    33 
    44[UserChoices] 
     5# VEGET_UPDATE_at_start=y : orchidee.driver will set VEGET_UPDATE=1Y at the first cumul period when starting a new simulation.  
     6#                           After the first period, VEGET_UPDATE will be set according to the choice done below.   
     7VEGET_UPDATE_at_start=n 
     8 
    59# VEGET_UPDATE=0Y : default, do not update the vegetation and woodharvest file except if starting without restart file 
    610# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year 
    711VEGET_UPDATE=0Y 
     12 
     13# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def :  
     14# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard 
     15# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple 
     16# ROUTING=off        => in orchidee.def RIVER_ROUTING=n  
     17ROUTING=simple 
    818 
    919# Specify output level for output files 
     
    3343ListNonDel= (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2v2/historical/15PFT.v2/PFTmap_2000.nc, PFTmap.nc),\ 
    3444            (${R_IN}/SRF/WOODHARVEST/LUH2v2/historical4/woodharvest_2000.nc,          woodharvest.nc),\ 
     45            (${R_IN}/SRF/ROUTING/routing_simple.nc, .) 
    3546 
    3647[SmoothFiles] 
     
    4657 
    4758[RestartFiles] 
    48 List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc) 
     59List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc) ,\ 
     60        (routing_restart.nc, routing_restart.nc, routing_start.nc) 
    4961 
    5062[OutputText] 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/highresmip/COMP/lmdz.card

    r6070 r6290  
    8383        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
    8484        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \ 
    85         (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \ 
     85        (${SUBMIT_DIR}/PARAM/tracer.def, .),                               \ 
    8686        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
    8787        (${MODIPSL}/modeles/LMDZ/DefLists/context_input_lmdz.xml, . ),      \ 
     
    107107 
    108108[OutputText] 
    109 List=   (physiq.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
     109List=   (physiq.def, run.def, tracer.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
    110110 
    111111[OutputFiles] 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/highresmip_CMIP6/COMP/lmdz.card

    r5878 r6290  
    8484        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
    8585        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \ 
    86         (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \ 
     86        (${SUBMIT_DIR}/PARAM/tracer.def, .),                               \ 
    8787        (${SUBMIT_DIR}/PARAM/ping_LMDZ.xml, ping_lmdz.xml),            \ 
    8888        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
     
    109109 
    110110[OutputText] 
    111 List=   (physiq.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
     111List=   (physiq.def, run.def, tracer.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt) 
    112112 
    113113[OutputFiles] 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_amip/config.card

    r5878 r6290  
    8080#D-- NO Post - 
    8181[Post] 
    82 RebuildFrequency=NONE 
    8382PackFrequency=NONE 
    8483TimeSeriesFrequency=NONE 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_clim/config.card

    r5878 r6290  
    8181#D-- NO Post - 
    8282[Post] 
    83 RebuildFrequency=NONE 
    8483PackFrequency=NONE 
    8584TimeSeriesFrequency=NONE 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_clim_360d/config.card

    r5878 r6290  
    8181#D-- NO Post - 
    8282[Post] 
    83 RebuildFrequency=NONE 
    8483PackFrequency=NONE 
    8584TimeSeriesFrequency=NONE 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/clim_360d/COMP/lmdz.card

    r6070 r6290  
    9595        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
    9696        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
     97        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),         \ 
    9798        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
    9899        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
     
    120121List=   (histmth.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc,       Post_1M_histmth),       \ 
    121122        (histmthCOSP.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthCOSP.nc,   NONE),                  \ 
    122         (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    Post_1M_histmthNMC),    \ 
     123        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    NONE),                  \ 
    123124        (histday.nc,       ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,       NONE),                  \ 
    124125        (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),                  \ 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/clim_360d/config.card

    r5878 r6290  
    9999#D-- Post - 
    100100[Post] 
    101 #D- RebuildFrequency determines the frequency of rebuild submission 
    102 RebuildFrequency=NONE 
    103101#D- PackFrequency determines the frequency of pack submission 
    104102PackFrequency=1Y 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

    r6070 r6290  
    127127List=   (histmth.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc,       Post_1M_histmth),       \ 
    128128        (histmthCOSP.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthCOSP.nc,   NONE),                  \ 
    129         (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    Post_1M_histmthNMC),    \ 
     129        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    NONE),                  \ 
    130130        (histday.nc,       ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,       NONE),                  \ 
    131131        (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),                  \ 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r5878 r6290  
    77DefSuffix=CWRR 
    88 
     9# VEGET_UPDATE=0Y : default, do not update the vegetation and woodharvest file except if starting without restart file 
     10# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year 
    911VEGET_UPDATE=1Y 
    1012 
     13# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def :  
     14# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard 
     15# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple 
     16# ROUTING=off        => in orchidee.def RIVER_ROUTING=n  
     17ROUTING=standard 
    1118 
    1219# Specify output level for output files 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/lmdz.card

    r6070 r6290  
    122122List=   (histmth.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc,       Post_1M_histmth),       \ 
    123123        (histmthCOSP.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthCOSP.nc,   NONE),                  \ 
    124         (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    Post_1M_histmthNMC),    \ 
     124        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    NONE),                  \ 
    125125        (histday.nc,       ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,       NONE),                  \ 
    126126        (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),                  \ 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card

    r5878 r6290  
    1414# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year 
    1515VEGET_UPDATE=0Y 
     16 
     17# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def :  
     18# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard 
     19# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple 
     20# ROUTING=off        => in orchidee.def RIVER_ROUTING=n  
     21ROUTING=standard 
    1622 
    1723# Specify output level for output files 
     
    3238 
    3339[InitialStateFiles] 
    34 List=   (${R_IN}/SRF/soils_param.nc, . ), \ 
     40List=   (${R_IN}/SRF/SOIL/soils_param.nc, .), \ 
    3541        (${R_IN}/SRF/reftemp.nc, . ), \ 
    36         (${R_IN}/SRF/routing.nc, . ), \ 
     42        (${R_IN}/SRF/ROUTING/routing.nc, . ), \ 
    3743        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    3844        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/lmdz.driver

    r6100 r6290  
    382382    fi 
    383383 
    384     if [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
     384    if [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ; then 
     385    echo "ESM config, with INCA and CO2i, set type_trac=inco in run.def" 
     386    IGCM_comp_modifyDefFile blocker run.def type_trac inco 
     387    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1 
     388    elif [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
    385389        echo "Activate coupling to INCA, set type_trac=inca in run.def" 
    386390        IGCM_comp_modifyDefFile blocker run.def type_trac inca 
    387         IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1 
     391        IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1   
    388392    elif [ X${config_ListOfComponents_CHM} = Xreprobus ] ; then 
    389393        echo "Activate coupling to REPROBUS, set type_trac=repr in run.def" 
    390394        IGCM_comp_modifyDefFile blocker run.def type_trac repr 
    391395        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    392         IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1 
     396        IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1   
    393397    elif [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then  
    394398        echo "ESM config, set type_trac=co2i in run.def" 
    395399        IGCM_comp_modifyDefFile blocker run.def type_trac co2i 
    396400        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    397         IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
     401    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
    398402    elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then 
    399403        echo "No coupling to chemistry model but it is a LMDZ STRATAER configuration, set type_trac=coag in run.def" 
     
    495499    fi  
    496500 
    497     if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then 
     501    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then 
    498502        # Set carbon cycle parameters according to parmeters in lmdz.card  
    499503        IGCM_comp_modifyDefFile blocker config.def level_coupling_esm 2  
     
    501505        IGCM_comp_modifyDefFile blocker config.def carbon_cycle_tr ${lmdz_UserChoices_carbon_cycle_tr} 
    502506        IGCM_comp_modifyDefFile blocker config.def carbon_cycle_rad ${lmdz_UserChoices_carbon_cycle_rad} 
     507        IGCM_comp_modifyDefFile nonblocker config.def co2_ppm0 ${lmdz_UserChoices_co2_ppm0}  
    503508    else 
    504509        # Take default value set in config.def 
     
    507512        IGCM_comp_modifyDefFile nonblocker config.def carbon_cycle_tr DEFAULT 
    508513        IGCM_comp_modifyDefFile nonblocker config.def carbon_cycle_rad DEFAULT 
     514        IGCM_comp_modifyDefFile nonblocker config.def co2_ppm0 DEFAULT 
     515    fi 
     516 
     517    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] ) ; then 
     518        # Set carbon cycle parameters according to parmeters in lmdz.card  
     519        IGCM_comp_modifyDefFile nonblocker config.def read_fco2_ocean_cor ${lmdz_UserChoices_read_fco2_ocean_cor} 
     520        IGCM_comp_modifyDefFile nonblocker config.def var_fco2_ocean_cor ${lmdz_UserChoices_var_fco2_ocean_cor} 
     521        IGCM_comp_modifyDefFile nonblocker config.def read_fco2_land_cor ${lmdz_UserChoices_read_fco2_land_cor} 
     522        IGCM_comp_modifyDefFile nonblocker config.def var_fco2_land_cor ${lmdz_UserChoices_var_fco2_land_cor} 
     523    else 
     524        IGCM_comp_modifyDefFile nonblocker config.def read_fco2_ocean_cor DEFAULT 
     525        IGCM_comp_modifyDefFile nonblocker config.def var_fco2_ocean_cor DEFAULT 
     526        IGCM_comp_modifyDefFile nonblocker config.def read_fco2_land_cor DEFAULT 
     527        IGCM_comp_modifyDefFile nonblocker config.def var_fco2_land_cor DEFAULT 
    509528    fi 
    510529 
     
    577596    fi 
    578597    # Include xml files for output configuration if running with workflow CMIP6 
    579     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
     598    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
    580599        echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp 
    581600        echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/orchidee.driver

    r6100 r6290  
    4242        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level 0 
    4343        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq 1mo 
    44  
    4544        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled .FALSE. 
    4645        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level 0 
    4746        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq 1mo 
    48  
    49         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 enabled .FALSE. 
    50         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level 0 
    51         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq 1mo 
     47        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 enabled .FALSE. 
     48        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level 0 
     49        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq 1mo 
     50        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     51        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     52        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
    5253    fi 
    5354 
     
    7071    else 
    7172        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y 
     73    fi 
     74 
     75    # Set parameters related to ROUTING in orchidee.def 
     76    if [ X${orchidee_UserChoices_ROUTING} = X ] || [ X${orchidee_UserChoices_ROUTING} = Xstandard ]; then 
     77        # Nothing is set or ROUTING=standard in orchidee.def, default option 
     78        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     79        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard 
     80    elif [ X${orchidee_UserChoices_ROUTING} = Xsimple ]; then 
     81        # ROUTING=simple is set in orchidee.card 
     82        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     83        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  simple 
     84    elif [ X${orchidee_UserChoices_ROUTING} = Xhighres ]; then 
     85        # ROUTING=highres is set in orchidee.card 
     86        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     87        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  highres 
     88    else 
     89        # ROUTING=off, routing will be deactivated 
     90        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING n 
     91        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard 
    7292    fi 
    7393 
     
    120140        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_level ${orchidee_UserChoices_output_level_sechiba_history} 
    121141        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_freq  ${orchidee_UserChoices_output_freq_sechiba_history} 
     142        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba1 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_history} 
    122143    fi 
    123144     
     
    132153        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_level ${orchidee_UserChoices_output_level_sechiba_out_2} 
    133154        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_freq  ${orchidee_UserChoices_output_freq_sechiba_out_2} 
     155        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba2 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_out_2}           
    134156    fi 
    135157     
     
    144166        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_level ${orchidee_UserChoices_output_level_sechiba_history_4dim} 
    145167        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_freq  ${orchidee_UserChoices_output_freq_sechiba_history_4dim} 
     168        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba3 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_history_4dim}            
    146169    fi 
    147170         
     
    159182        echo '<context id="orchidee" src="./context_input_orchidee.xml"/>' >> add.tmp 
    160183    fi 
     184 
     185    # Add inclusion of file context_routing_orchidee.xml if this file exists 
     186    if [ -f context_routing_orchidee.xml ] ; then 
     187        echo '<context id="orchidee" src="./context_routing_orchidee.xml"/>' >> add.tmp 
     188    fi 
     189 
    161190    # Include xml files for output configuration if running with workflow CMIP6 
    162     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    163         echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
    164         echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
     191    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
     192          echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
     193          echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
    165194    fi 
    166195    cp iodef.xml iodef.xml.tmp 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/stomate.driver

    r6100 r6290  
    3737        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level ${stomate_UserChoices_output_level_stomate_history} 
    3838        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq  ${stomate_UserChoices_output_freq_stomate_history} 
     39        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_stomate1 group_ref remap_${stomate_UserChoices_output_freq_stomate_history} 
    3940    fi 
    4041     
     
    4950        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level ${stomate_UserChoices_output_level_stomate_ipcc_history} 
    5051        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq  ${stomate_UserChoices_output_freq_stomate_ipcc_history} 
     52        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_stomate2 group_ref remap_${stomate_UserChoices_output_freq_stomate_ipcc_history} 
    5153    fi 
    5254 
     
    6264        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level ${stomate_UserChoices_output_level_stomate_history_4dim} 
    6365        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq  ${stomate_UserChoices_output_freq_stomate_history_4dim} 
     66        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_stomate3 group_ref remap_${stomate_UserChoices_output_freq_stomate_history_4dim} 
     67    fi 
     68 
     69 
     70    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     71        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     72        # Deactivate the file. 
     73        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     74        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     75        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     76    else 
     77        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     78        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     79        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     80        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_stomate4 group_ref remap_${stomate_UserChoices_output_freq_stomate_history_fixed_dia} 
    6481    fi 
    6582 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_actuel

    r5479 r6290  
    88carbon_cycle_rad=_AUTO_ : DEFAULT=n 
    99 
     10## read_fco2_ocean_cor : y/n flag d'activation de la correction du flux net de carbone (ocean)  
     11read_fco2_ocean_cor=_AUTO_ : DEFAULT=n 
     12## var_fco2_ocean_cor : valeur de la correction du flux net de carbone (ocean)  
     13var_fco2_ocean_cor=_AUTO_: DEFAULT = 0.2576 
     14## read_fco2_land_cor : y/n flag d'activation de la correction du flux net de carbone (land)  
     15read_fco2_land_cor=_AUTO_ : DEFAULT=n 
     16## var_fco2_land_cor : valeur de la correction du flux net de carbone (land)  
     17var_fco2_land_cor=_AUTO_: DEFAULT =-0.2036 
     18 
    1019##  Cycle diurne  ou non                  
    1120iflag_cycle_diurne=1 
    12 ##  Soil Model  ou non                
     21 
     22## Soil Model ou non 
    1323soil_model=y 
    14 ## Pas de temps de couplage (s). 
     24 
     25## Pas de temps de couplage (s) 
    1526t_coupl=_AUTO_ 
    1627 
     
    4152### co2_ppm =    taux CO2 en ppm, l'année 2000 forcage CMIP6 
    4253co2_ppm = _AUTO_: DEFAULT = 3.6912e+02 
     54# co2_ppm0 = taux initial du CO2 en ppm, l'année 1850 forcage CMIP6 (transport) 
     55co2_ppm0 = _AUTO_: DEFAULT  = 2.8432e+02 
    4356### co2_ppm_per =    taux 4xCO2 en ppm (uniqument pour calcul des diags) 
    4457co2_ppm_per = _AUTO_: DEFAULT = 14.7648e+02 
     
    6679###  flag_aerosol = type of coupled aerosol, if aerosol offline  
    6780###  0 => no aerosol, 1 => sulfate only, 2 => bc only, 3 => pom only, 4 => seasalt only, 5 => dust only, 6 => all aerosol 
    68 flag_aerosol=_AUTO_  
     81flag_aerosol=_AUTO_ 
    6982### ok_cdnc=y/n   Cloud droplet number concentration 
    7083ok_cdnc=_AUTO_ 
     
    7992# 2: read two ozone climatologies, the average day and night climatology and the daylight climatology 
    8093read_climoz=_AUTO_ 
    81 #  
     94# 
    8295# Aerosols stratospheriques utilises par defaut  
    8396flag_aerosol_strat=_AUTO_ : DEFAULT=2 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_annuel

    r5479 r6290  
    1 # level_coupling_esm : 0(pas d'echange de carbone), 2 (change entre LMDZ/CPL/NEMO et LMDZ/ORCHIDEE) 
     1## level_coupling_esm : 0(pas d'echange de carbone), 2 (change entre LMDZ/CPL/NEMO et LMDZ/ORCHIDEE) 
    22level_coupling_esm=  _AUTO_: DEFAULT = 0 
    33## carbon_cycle_cpl: couplage des flux de carbone ATM/OCE, ATM/SRF 
     
    88carbon_cycle_rad=_AUTO_ : DEFAULT=n 
    99 
     10## read_fco2_ocean_cor : y/n flag d'activation de la correction du flux net de carbone (ocean)  
     11read_fco2_ocean_cor=_AUTO_ : DEFAULT=n 
     12## var_fco2_ocean_cor : valeur de la correction du flux net de carbone (ocean)  
     13var_fco2_ocean_cor=_AUTO_: DEFAULT = 0.2576 
     14## read_fco2_land_cor : y/n flag d'activation de la correction du flux net de carbone (land)  
     15read_fco2_land_cor=_AUTO_ : DEFAULT=n 
     16## var_fco2_land_cor : valeur de la correction du flux net de carbone (land)  
     17var_fco2_land_cor=_AUTO_: DEFAULT =-0.2036 
     18 
    1019##  Cycle diurne  ou non                  
    1120iflag_cycle_diurne=1 
    12 ##  Soil Model  ou non                
     21 
     22## Soil Model ou non 
    1323soil_model=y 
    14 ## Pas de temps de couplage (s). 
     24 
     25## Pas de temps de couplage (s) 
    1526t_coupl=_AUTO_ 
    1627 
     
    4152### co2_ppm =    taux CO2 en ppm 
    4253co2_ppm = _AUTO_ 
     54# co2_ppm0 = taux initial du CO2 en ppm, l'année 1850 forcage CMIP6 (transport) 
     55co2_ppm0 = _AUTO_: DEFAULT  = 2.8432e+02 
    4356### co2_ppm_per =    taux 4xCO2 en ppm (uniqument pour calcul des diags) 
    4457co2_ppm_per = _AUTO_ 
     
    6679###  flag_aerosol = type of coupled aerosol, if aerosol offline  
    6780###  0 => no aerosol, 1 => sulfate only, 2 => bc only, 3 => pom only, 4 => seasalt only, 5 => dust only, 6 => all aerosol 
    68 flag_aerosol=_AUTO_  
     81flag_aerosol=_AUTO_ 
    6982### ok_cdnc=y/n   Cloud droplet number concentration 
    7083ok_cdnc=_AUTO_ 
    7184# ok_alw=y flag pour activer l effet LW des poussieres 
    7285ok_alw=y 
    73 # 
    7486# 
    7587# Parametre de lecture de l'ozone 
     
    8092# 2: read two ozone climatologies, the average day and night climatology and the daylight climatology 
    8193read_climoz=_AUTO_ 
    82 #  
     94# 
    8395# Aerosols stratospheriques utilises par defaut  
    8496flag_aerosol_strat=_AUTO_ : DEFAULT=2 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_preind

    r5479 r6290  
    88carbon_cycle_rad=_AUTO_ : DEFAULT=n 
    99 
     10## read_fco2_ocean_cor : y/n flag d'activation de la correction du flux net de carbone (ocean)  
     11read_fco2_ocean_cor=_AUTO_ : DEFAULT=n 
     12## var_fco2_ocean_cor : valeur de la correction du flux net de carbone (ocean)  
     13var_fco2_ocean_cor=_AUTO_: DEFAULT = 0.2576 
     14## read_fco2_land_cor : y/n flag d'activation de la correction du flux net de carbone (land)  
     15read_fco2_land_cor=_AUTO_ : DEFAULT=n 
     16## var_fco2_land_cor : valeur de la correction du flux net de carbone (land)  
     17var_fco2_land_cor=_AUTO_: DEFAULT =-0.2036 
     18 
    1019##  Cycle diurne  ou non                  
    1120iflag_cycle_diurne=1 
    1221 
    13 ## Pas de temps de couplage (s).  
     22## Soil Model ou non 
     23soil_model=y 
     24 
     25## Pas de temps de couplage (s) 
    1426t_coupl=_AUTO_ 
    15  
    16 ##  Soil Model  ou non                
    17 soil_model=y 
    1827 
    1928## Nombre  d'appels des routines de rayonnements ( par jour)                  
     
    4352### co2_ppm_per =    taux 4xCO2 en ppm (uniqument pour calcul des diags) 
    4453co2_ppm_per = _AUTO_: DEFAULT  =11.3728e+02 
     54## co2_ppm0 = taux initial du CO2 en ppm, l'année 1850 forcage CMIP6 (transport) 
     55co2_ppm0 = _AUTO_: DEFAULT  = 2.8432e+02 
    4556### CH4_ppb =    taux CH4 en ppb, l'année 1850 forcage CMIP6 
    4657CH4_ppb = _AUTO_: DEFAULT = 8.0825e+02 
     
    8192# 
    8293# Aerosols stratospheriques utilises par defaut  
    83 # 
    8494flag_aerosol_strat=_AUTO_ : DEFAULT=2 
    8595# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones 
     
    8797# 
    8898# COSP 
    89 # 
    9099ok_cosp=_AUTO_ 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/file_def_orchidee.xml

    r6284 r6290  
    4343  <file id="sechiba1" name="sechiba_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_"> 
    4444 
    45    <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
     45   <field_group id="groupremap_sechiba1" group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
    4646    <!-- level 1 --> 
    4747    <field field_ref="areas" level="0"/> 
     
    379379  <!-- Sechiba file 2 --> 
    380380  <file id="sechiba2" name="sechiba_out_2" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_"> 
    381    <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
     381   <field_group id="groupremap_sechiba2" group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
    382382    <!-- level 1 --> 
    383383    <field field_ref="areas" level="1"/> 
     
    583583  <!-- This files contains all variables having more than one vertical axis --> 
    584584  <file id="sechiba3" name="sechiba_history_4dim" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_"> 
    585    <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
     585   <field_group id="groupremap_sechiba3" group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
    586586    <field field_ref="areas" level="1"/> 
    587587    <field field_ref="contfrac" level="1"/> 
     
    777777  <!-- Stomate file 1 --> 
    778778  <file id="stomate1" name="stomate_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_"> 
    779    <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
     779   <field_group id="groupremap_stomate1" group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
    780780      
    781781    <!-- level 1 --> 
     
    919919  <!-- Stomate file 2 --> 
    920920  <file id="stomate2" name="stomate_ipcc_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_"> 
    921    <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
     921   <field_group id="groupremap_stomate2" group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
    922922    <!-- level 1 --> 
    923923    <field field_ref="RESOLUTION_X" level="1"/> 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/iodef.xml

    r5479 r6290  
    2121        <variable_group id="buffer"> 
    2222            <variable id="optimal_buffer_size" type="string">performance</variable> 
    23             <variable id="buffer_size_factor" type="double">1.0</variable> 
     23            <variable id="buffer_size_factor" type="double">2.0</variable> 
    2424            <variable id="min_buffer_size" type="int">10000000</variable> 
    2525         </variable_group> 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/orchidee.def

    r4330 r6290  
    4141# Activate river routing 
    4242# default = y 
    43 RIVER_ROUTING = n  
     43RIVER_ROUTING = _AUTO_ 
     44 
     45# Choice of routing method: standard or simple 
     46ROUTING_METHOD = _AUTO_ 
    4447 
    4548# Activate creation of river_desc.nc file 
     
    133136 
    134137# Activate downregulation for CO2 
    135 DOWNREGULATION_CO2=y 
     138# Set DOWNREGULATION_CO2_NEW=y to activate new revised version of  
     139# downregulation parametrization available in ORCHIDEE_2_0 for  
     140# configurations v6.1.11 or later or in ORCHIDEE_2_2 from revision 6393 and later.  
     141# When DOWNREGULATION_CO2_NEW=y,  
     142# DOWNREGULATION_CO2 will be forced to false by the model. 
     143DOWNREGULATION_CO2_NEW=y 
    136144DOWNREGULATION_CO2_BASELEVEL=380. 
    137145 
     
    218226#************************************************************************ 
    219227# CHEMISTRY_OK_BVOC :  Activate chemistry 
    220 CHEMISTRY_BVOC =  n 
     228CHEMISTRY_BVOC = _AUTO_: DEFAULT=n 
    221229 
    222230# CO2 FOR BVOC - WILKINSON :  CO2 inhibition effect for isoprene based on Wilkinson approach? 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/orchidee.def_CWRR

    r5878 r6290  
    4141# Activate river routing 
    4242# default = y 
    43 RIVER_ROUTING = y 
     43RIVER_ROUTING = _AUTO_ 
     44 
     45# Choice of routing method: standard or simple 
     46ROUTING_METHOD = _AUTO_ 
    4447 
    4548# Activate creation of river_desc.nc file 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/compile_icolmdzor.sh

    r6286 r6290  
    3535full_orch="" 
    3636full_dyna="" 
    37  
     37# choose radiative code compilation option  
     38rad=rrtm 
     39opt_rad="" 
    3840# Default netcdf_lib is used for XIOS but can be change by argument 
    3941netcdf_lib="" 
     
    8183Example 7: compile only create_etat0_limt for reg  
    8284./compile_icolmdzor.sh -ce0l_only 
     85 
     86Example 8: choose radiative schema for LMDZ (oldrad/rrtm/ecrad). Default is rrtm 
     87./compile_icolmdzor.sh -rad ecrad 
    8388 
    8489end_help 
     
    101106        "-ce0l_only")       ce0l_only=yes  ; shift ;; 
    102107        "-netcdf_lib_seq")  netcdf_lib="--netcdf_lib netcdf4_seq"; shift ;; 
     108        "-rad")        rad=$2; shift ; shift ;; 
    103109        *)                  echo "unknown option "$1" , exiting..." ;  exit  
    104110    esac 
     
    136142                echo "You used -parallel" $parallel 
    137143            fi ;; 
     144        spirit*) 
     145            fcm_arch=ifort_MESOIPSL;; 
    138146        ciclad*|climserv*|loholt*|camelot*) 
    139147            fcm_arch=ifort_CICLAD;; 
     
    154162    echo " Personal module list before sourcing of ARCH/arch.env file:"    >> $outfile  
    155163    module list   >> $outfile 2>&1 
    156  
     164    svn_version=$(module list -t | grep subversion) 
     165        
    157166    # Make a link to this file, to be used also in config.card 
    158167    rm -f ARCH/arch.env 
     
    161170    # Source the file 
    162171    source ARCH/arch.env   >> $outfile 2>&1 
    163  
     172    if [ X$svn_version != X ] ; then 
     173        module load ${svn_version} 
     174    fi 
    164175    echo >> $outfile 
    165176    echo " New module list after sourcing of ARCH/arch.env file:"    >> $outfile  
     
    240251    echo; echo "NOW COMPILE LMDZ FOR COUPLING TO DYNAMICO" 
    241252    echo >> $outfile ; echo " NOW COMPILE LMDZ FOR COUPLING TO DYNAMICO"   >> $outfile  
    242  
     253    # Retrieve the final svn release number, needed for radiative code suffix of executable 
     254    lmdzsvn=`svnversion . | egrep -o "[0-9]+"  | awk 'NR==1'` 
    243255    # Check if the compilation of LMDZ was previsouly interupted prematured.  
    244256    # In that case, the files dimension.h and .lock exist. If the files exist, they are here removed to avoid makelmdz_fcm  
     
    254266    fi 
    255267 
    256     echo ./makelmdz_fcm -p lmd -rrtm true -cosp true -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile  
    257     ./makelmdz_fcm -p lmd -rrtm true -cosp true -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 2>&1 
     268# Need to define the proper option for radiative code compilation. By default, we use rrtm 
     269case $rad in 
     270    oldrad) opt_rad="" ;; 
     271    rrtm)   if [ $lmdzsvn -le 4185 ] ; then opt_rad="-rrtm true" ; else opt_rad="-rad rrtm" ; fi ;; 
     272    ecrad)  opt_rad="-rad ecrad" ;; 
     273    *) echo Only oldrad rrtm ecrad for rad option ; exit 
     274esac 
     275 
     276if [ $lmdzsvn -le 4185 -a $rad = "ecrad" ] ; then echo "ecrad only available for LMDZ rev starting with 4186 " ; exit ; fi 
     277 
     278 
     279    echo ./makelmdz_fcm -p lmd -cosp true $opt_rad -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile  
     280    ./makelmdz_fcm -p lmd -cosp true $opt_rad -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 2>&1 
    258281    # Test if compiling finished 
    259282    if [[ $? != 0 ]] ; then 
     
    302325 
    303326# Find executable suffix 
     327suffix=_${resol_atm}_phylmd 
     328if [ $lmdzsvn -ge 4186 ] ; then suffix=${suffix}_${rad} ; fi 
    304329if [ $parallel == seq ] || [ $parallel == none ] ; then 
    305     suffix=_${resol_atm}_phylmd_seq_orch.e 
     330    suffix=${suffix}_seq_orch.e 
    306331else 
    307     suffix=_${resol_atm}_phylmd_para_mem_orch.e 
     332    suffix=${suffix}_para_mem_orch.e 
    308333fi 
    309334echo gcm suffix = $suffix 
     
    329354        rm -f .lock 
    330355    fi 
    331     echo ./makelmdz_fcm -d ${resol_atm} -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile  
    332          ./makelmdz_fcm -d ${resol_atm} -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 2>&1 
     356    echo ./makelmdz_fcm -d ${resol_atm} -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile  
     357         ./makelmdz_fcm -d ${resol_atm} -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 2>&1 
    333358    # Test if compiling finished 
    334359    if [[ $? != 0 ]] ; then 
Note: See TracChangeset for help on using the changeset viewer.