Changeset 6291 for CONFIG


Ignore:
Timestamp:
12/21/22 16:34:17 (16 months ago)
Author:
aclsce
Message:
  • Merge in ICOLMDZOR_LAM configuration accordingly with ICOLMDZOR configuration :

compilation : added rad option (with correct handling of svn test version)
experiments : merge with LMDZOR_v6.2 configuration
cleaning and other small things

Location:
CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7
Files:
1 added
24 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZ/CREATE_amip/COMP/lmdz.card

    r6186 r6291  
    4242        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    4343        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    44         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     44        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    4545        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    4646        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 
    … …  
    7878        (${SUBMIT_DIR}/PARAM/guide.def, .), \ 
    7979    (${SUBMIT_DIR}/PARAM/tracer.def, .), \ 
    80         (${SUBMIT_DIR}/PARAM/traceur.def, .) 
    8180 
    8281[RestartFiles] 
    … …  
    8483 
    8584[OutputText] 
    86 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) 
     85List=   (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) 
    8786 
    8887[OutputFiles] 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZ/CREATE_amip_ERA5_LAM/COMP/lmdz.card

    r6186 r6291  
    4040        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    4141        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    42         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     42        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    4343        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    4444        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZ/CREATE_amip_LAM/COMP/lmdz.card

    r6186 r6291  
    4040        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    4141        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    42         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     42        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    4343        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    4444        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZ/amip/COMP/lmdz.card

    r6186 r6291  
    8181        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
    8282        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \ 
    83         (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \ 
    8483        (${SUBMIT_DIR}/PARAM/tracer.def, .),                               \ 
    8584        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
    … …  
    8786        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    8887        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    89         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     88        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    9089        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    9190        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 
    … …  
    106105 
    107106[OutputText] 
    108 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) 
     107List=   (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) 
    109108 
    110109[OutputFiles] 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZ/amip_ERA5_LAM/COMP/lmdz.card

    r6186 r6291  
    8989        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    9090        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    91         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     91        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    9292        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    9393        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZ/amip_LAM/COMP/lmdz.card

    r6191 r6291  
    8989        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    9090        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    91         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     91        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    9292        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    9393        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/CREATE_amip/COMP/lmdz.card

    r6260 r6291  
    4242        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    4343        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    44         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     44        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    4545        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    4646        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 
    … …  
    7878        (${SUBMIT_DIR}/PARAM/guide.def, .), \ 
    7979    (${SUBMIT_DIR}/PARAM/tracer.def, .), \ 
    80         (${SUBMIT_DIR}/PARAM/traceur.def, .) 
    8180 
    8281[RestartFiles] 
    … …  
    8483 
    8584[OutputText] 
    86 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) 
     85List=   (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) 
    8786 
    8887[OutputFiles] 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/CREATE_amip_ERA5_LAM/COMP/lmdz.card

    r6260 r6291  
    4040        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    4141        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    42         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     42        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    4343        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    4444        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/CREATE_amip_LAM/COMP/lmdz.card

    r6260 r6291  
    4040        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    4141        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    42         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     42        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    4343        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    4444        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/amip/COMP/lmdz.card

    r6260 r6291  
    8181        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \ 
    8282        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \ 
    83         (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \ 
    8483        (${SUBMIT_DIR}/PARAM/tracer.def, .),                               \ 
    8584        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \ 
    … …  
    8786        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    8887        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    89         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     88        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    9089        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    9190        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 
    … …  
    106105 
    107106[OutputText] 
    108 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) 
     107List=   (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) 
    109108 
    110109[OutputFiles] 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/amip/COMP/orchidee.card

    r6260 r6291  
    66# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year 
    77VEGET_UPDATE=1Y 
     8 
     9# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def : 
     10# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard 
     11# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple 
     12# ROUTING=off        => in orchidee.def RIVER_ROUTING=n 
     13ROUTING=simple 
    814 
    915# Specify output level for output files 
    … …  
    3339ListNonDel= (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2v2/historical/15PFT.v2/PFTmap_${year}.nc, PFTmap.nc),\ 
    3440            (${R_IN}/SRF/WOODHARVEST/LUH2v2/historical4/woodharvest_${year}.nc,          woodharvest.nc),\ 
     41            (${R_IN}/SRF/ROUTING/routing_simple.nc, .) 
    3542 
    3643[SmoothFiles] 
    … …  
    4653 
    4754[RestartFiles] 
    48 List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc) 
     55List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc),\ 
     56        (routing_restart.nc, routing_restart.nc, routing_start.nc) 
    4957 
    5058[OutputText] 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/amip_ERA5_LAM/COMP/lmdz.card

    r6260 r6291  
    8989        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    9090        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    91         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     91        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    9292        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    9393        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/amip_ERA5_LAM/COMP/orchidee.card

    r6260 r6291  
    66# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year 
    77VEGET_UPDATE=1Y 
     8 
     9# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def : 
     10# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard 
     11# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple 
     12# ROUTING=off        => in orchidee.def RIVER_ROUTING=n 
     13ROUTING=simple 
    814 
    915# Specify output level for output files 
    … …  
    3339ListNonDel= (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2v2/historical/15PFT.v2/PFTmap_${year}.nc, PFTmap.nc),\ 
    3440            (${R_IN}/SRF/WOODHARVEST/LUH2v2/historical4/woodharvest_${year}.nc,          woodharvest.nc),\ 
     41            (${R_IN}/SRF/ROUTING/routing_simple.nc, .) 
    3542 
    3643[SmoothFiles] 
    … …  
    4653 
    4754[RestartFiles] 
    48 List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc) 
     55List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc), \ 
     56        (routing_restart.nc, routing_restart.nc, routing_start.nc) 
    4957 
    5058[OutputText] 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/amip_LAM/COMP/lmdz.card

    r6260 r6291  
    8989        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \ 
    9090        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),          \ 
    91         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \ 
     91        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),  
    9292        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\ 
    9393        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/EXPERIMENTS/ICOLMDZOR/amip_LAM/COMP/orchidee.card

    r6260 r6291  
    66# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year 
    77VEGET_UPDATE=1Y 
     8 
     9# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def : 
     10# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard 
     11# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple 
     12# ROUTING=off        => in orchidee.def RIVER_ROUTING=n 
     13ROUTING=simple 
    814 
    915# Specify output level for output files 
    … …  
    3339ListNonDel= (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2v2/historical/15PFT.v2/PFTmap_${year}.nc, PFTmap.nc),\ 
    3440            (${R_IN}/SRF/WOODHARVEST/LUH2v2/historical4/woodharvest_${year}.nc,          woodharvest.nc),\ 
     41            (${R_IN}/SRF/ROUTING/routing_simple.nc, .) 
    3542 
    3643[SmoothFiles] 
    … …  
    4653 
    4754[RestartFiles] 
    48 List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc) 
     55List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc),\ 
     56        (routing_restart.nc, routing_restart.nc, routing_start.nc) 
    4957 
    5058[OutputText] 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/DRIVER/dynamico.driver

    r6179 r6291  
    2222        IGCM_debug_Verif_Exit 
    2323    fi 
     24 
     25 
     26    if [ ! -f ${SUBMIT_DIR}/../../../modeles/DYNAMICO/xml/file_def_dynamico.xml ];  then  
     27        module load python3 
     28        python3 ${SUBMIT_DIR}/../../../modeles/DYNAMICO/xml/file_def_dynamico.xml.py > ${SUBMIT_DIR}/../../../modeles/DYNAMICO/xml/file_def_dynamico.xml 
     29    fi 
     30 
    2431 
    2532    IGCM_debug_PopStack "ICO_Initialize" 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/DRIVER/orchidee.driver

    r6260 r6291  
    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 
    … …  
    162182        echo '<context id="orchidee" src="./context_input_orchidee.xml"/>' >> add.tmp 
    163183    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 
    164190    # Include xml files for output configuration if running with workflow CMIP6 
    165     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    166         echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
    167         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 
    168194    fi 
    169195    cp iodef.xml iodef.xml.tmp 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/PARAM/context_lmdz.xml

    r6179 r6291  
    122122     </grid> 
    123123 
     124     <grid id="grid_glo_plev"> 
     125        <domain domain_ref="dom_glo" /> 
     126        <axis axis_ref="plev" /> 
     127     </grid> 
     128 
    124129     <grid id="grid_glo_presinter"> 
    125130        <domain domain_ref="dom_glo" /> 
    … …  
    131136     </grid> 
    132137 
    133      <grid id="grid_glo_plev"> 
    134         <domain domain_ref="dom_glo" /> 
    135         <axis axis_ref="plev" /> 
    136      </grid> 
     138     <grid id="grid_out_plev17"> 
     139        <domain id="dom_out" /> 
     140          <axis long_name="pressure" n_glo="17" name="plev_std" positive="down" standard_name="air_pressure" unit="Pa" value="(0,16)[ 100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000. ]"><interpolate_axis coordinate="pres" order="1" type="polynomial" /> 
     141        </axis> 
     142     </grid> 
     143 
    137144     <grid id="grid_out_plev"> 
    138145        <domain domain_ref="dom_out" /> 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/PARAM/context_orchidee.xml

    r6260 r6291  
    7070    <axis id="albtyp" standard_name="model_level_number" long_name="Albedo types" unit="1"/> 
    7171    <axis id="nslm" name="solay" standard_name="model_level_number" long_name="Hydrological soil levels" unit="1"/> 
    72     <axis id="ncsm" name="ncsm"    standard_name="model_level_number" long_name="Soil type" unit="1"/> 
     72    <axis id="nscm" name="nscm" standard_name="model_level_number" long_name="Soil type" unit="1"/> 
    7373    <axis id="nsnow" name="snowlev" standard_name="model_level_number" long_name="Snow levels" unit="1"/> 
     74    <axis id="nbhtu" name="nbhtu" standard_name="model_level_number" long_name="HTU dimension for routing" unit="1"/> 
     75    <axis id="nbasmon" name="nbasmon" standard_name="model_level_number" long_name="HTU monitoring dimension" unit="1"/> 
    7476    <axis id="P10" standard_name="model_level_number" long_name="Pool 10 years" unit="1"/> 
    7577    <axis id="P100" standard_name="model_level_number" long_name="Pool 100 years" unit="1"/> 
    … …  
    145147    </grid> 
    146148 
     149    <grid id="grid_nscm"> 
     150      <domain domain_ref="domain_landpoints" /> 
     151      <axis axis_ref="nscm" /> 
     152    </grid> 
     153    <grid id="grid_nscm_out"> 
     154      <domain domain_ref="domain_landpoints_out" /> 
     155      <axis axis_ref="nscm" /> 
     156    </grid> 
     157 
    147158    <grid id="grid_ngrnd"> 
    148159      <domain domain_ref="domain_landpoints" /> 
    … …  
    233244      <domain domain_ref="domain_landpoints_out" /> 
    234245      <axis axis_ref="P101" /> 
     246    </grid> 
     247 
     248    <grid id="grid_nbhtu"> 
     249      <domain domain_ref="domain_landpoints" /> 
     250      <axis axis_ref="nbhtu" /> 
     251    </grid> 
     252    <grid id="grid_nbhtu_out"> 
     253      <domain domain_ref="domain_landpoints_out" /> 
     254      <axis axis_ref="nbhtu" /> 
     255    </grid> 
     256 
     257    <grid id="grid_nbasmon"> 
     258      <domain domain_ref="domain_landpoints" /> 
     259      <axis axis_ref="nbasmon" /> 
     260    </grid> 
     261    <grid id="grid_nbasmon_out"> 
     262      <domain domain_ref="domain_landpoints_out" /> 
     263      <axis axis_ref="nbasmon" /> 
    235264    </grid> 
    236265 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/PARAM/file_def_orchidee.xml

    r6260 r6291  
    2727<!-- For regular grid, this group do not contain any attributes so it'll not make any difference.                --> 
    2828<!--                                                                                                             --> 
    29 <!-- $HeadURL: svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE_Quest/ORCHIDEE/src_xml/file_def_orchidee.xml $               --> 
    30 <!-- $Date: 2019-11-29 15:58:40 +0100 (Fri, 29 Nov 2019) $                                                      --> 
    31 <!-- $Revision: 6369 $                                                                                           --> 
     29<!-- $HeadURL: svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/file_def_orchidee.xml $               --> 
     30<!-- $Date: 2022-08-01 15:26:27 +0200 (Mon, 01 Aug 2022) $                                                      --> 
     31<!-- $Revision: 7720 $                                                                                           --> 
    3232<!-- =========================================================================================================== --> 
    3333 
    34 <file_definition type="one_file" par_access="collective" enabled=".TRUE." min_digits="4" compression_level="4" > 
     34<file_definition type="one_file" par_access="collective" enabled=".TRUE." min_digits="4" compression_level="2" > 
    3535 
    3636  <!-- ========================================================================================================= --> 
    … …  
    5656    <field field_ref="mrsow" level="1"/> 
    5757    <field field_ref="ksat" grid_ref="grid_nslm_out" level="1"/> 
     58    <field field_ref="ksref" level="1"/> 
    5859    <field field_ref="precip_rain" level="0" name="rain" unit="mm/d" > @precip_rain*86400  </field> 
    5960    <field field_ref="precip_snow" level="0" name="snowf" unit="mm/d" > @precip_snow*86400  </field> 
    … …  
    7374    <field field_ref="riversret" level="2"/> 
    7475    <field field_ref="hydrographs" level="2"/> 
     76    <field field_ref="htuhgmon" name="HTUhydrographs" grid_ref="grid_nbasmon_out" level="2"/> 
     77    <field field_ref="hydrotemp" name="RiverTemp" level="2"/> 
     78    <field field_ref="htutempmon" name="HTUTemp" grid_ref="grid_nbasmon_out" level="2"/> 
     79    <field field_ref="streamlimit" level="2"/> 
    7580    <field field_ref="vevapnu" name="evapnu" level="0" unit="mm/d" > @vevapnu*86400  </field> 
    7681    <field field_ref="evap_bare_lim" level="2"/> 
    … …  
    168173    <field field_ref="lwnet" level="5"/> 
    169174    <field field_ref="diffevap" level="5"/> 
    170     <field field_ref="temp_hydro" grid_ref="grid_nslm_out" level="5"/> 
    171175    <field field_ref="snowmelt" level="5"/> 
    172176    <field field_ref="tot_melt" level="5"/> 
    … …  
    194198    <field field_ref="irrigmap" level="8"/> 
    195199    <field field_ref="floodmap" level="8"/> 
     200    <field field_ref="flood_frac" name="flood_frac" level="8"/> 
    196201    <field field_ref="floodh" level="8"/> 
    197202    <field field_ref="floodr" level="8"/> 
    … …  
    311316    <field field_ref="snowgrain" grid_ref="grid_nsnow_out"  level="11"/> 
    312317    <field field_ref="snowdepth"  level="11"/> 
    313     <field field_ref="asoilcol"  level="11"/> 
    314     <field field_ref="aalb_bg"  level="11"/> 
    315     <field field_ref="atext"  level="11"/> 
    316     <field field_ref="areftemp"  level="11"/> 
    317     <field field_ref="alaimap"  level="11"/> 
    318     <field field_ref="aslope"  level="11"/> 
    319     <field field_ref="aveget"  level="11"/> 
    320     <field field_ref="aveget5k"  level="11"/> 
    321     <field field_ref="achem_wrice"  level="11"/> 
    322     <field field_ref="achem_other"  level="11"/> 
    323     <field field_ref="achem_co2"  level="11"/> 
    324318    <field field_ref="frac_snow"  level="0"/> 
    325319    <field field_ref="snowliqtot"  level="11"/> 
    … …  
    340334    <field field_ref="tmcs" level="11"/> 
    341335    <field field_ref="tmcfc" level="11"/> 
     336<!-- 
    342337    <field field_ref="wilt" grid_ref="grid_nslm_out" level="11"/> 
    343338    <field field_ref="fldcapacity" grid_ref="grid_nslm_out" level="11"/> 
     339--> 
    344340    <field field_ref="znetco2" level="11" /> 
    345341    <field field_ref="zcarblu" level="11" /> 
    … …  
    352348    <field field_ref="snowtemp_read_current" grid_ref="grid_nsnow_out"  level="12"/> 
    353349    <field field_ref="mask_snow_interp_out" grid_ref="grid_nsnow_out"  level="12"/> 
     350 
     351     <!-- Irrigation scheme  --> 
     352     <field field_ref="irrigation" name="Qirrig" level="8"/> 
     353     <field field_ref="irrig_gw_source" name="Qirrig_gw" level="8"/> 
     354     <field field_ref="irrig_gw_source" name="irrig_gw_source" level="8" unit="mm/d" > this*86400  </field> 
     355     <field field_ref="irrig_fast_source" name="Qirrig_fast" level="8"/> 
     356     <field field_ref="irrig_fast_source" name="irrig_fast_source" level="8" unit="mm/d" > this*86400  </field> 
     357     <field field_ref="irrig_str_source" name="Qirrig_str" level="8"/> 
     358     <field field_ref="irrig_str_source" name="irrig_str_source" level="8" unit="mm/d" > this*86400  </field> 
     359     <field field_ref="netirrig" name="Qirrig_req" long_name="Irrigation requirement" level="8"/> 
     360     <field field_ref="soilflx" level="8"/> 
     361     <field field_ref="irrig_deficit" name="Qirrig_deficit" level="8"/> 
     362     <field field_ref="irrig_deficit" name="irrig_deficit" level="8" unit="mm/d" > this*86400  </field> 
     363     <field field_ref="irrig_adduct" name="Qirrig_adduct" level="8"/> 
     364     <field field_ref="irrig_adduct" name="irrig_adduct" level="8" unit="mm/d" > this*86400  </field> 
     365     <field field_ref="Count_failure_slow" name="Count_failure_slow" level="8"/> 
     366     <field field_ref="Count_failure_fast" name="Count_failure_fast" level="8"/> 
     367     <field field_ref="Count_failure_stre" name="Count_failure_stre" level="8"/> 
     368     <!--field field_ref="PotSurfT" level="8"/--> 
     369     <field field_ref="transpot" grid_ref="grid_nvm_out" level="8"/> 
     370     <field field_ref="vbeta3pot" grid_ref="grid_nvm_out" level="8"/> 
     371     <field field_ref="root_deficit" level="8"/> 
     372     <field field_ref="root_mc_fc" level="8"/> 
     373     <field field_ref="irrigmap_dyn" level="8"/> 
     374     <field field_ref="aei_sw" level="8"/> 
     375 
    354376   </field_group> 
    355377  </file> 
    … …  
    438460    <field field_ref="maxvegetfrac" grid_ref="grid_nvm_out" level="5"/> 
    439461    <field field_ref="nobiofrac" grid_ref="grid_nnobio_out" level="5"/> 
    440     <field field_ref="temp_hydro" grid_ref="grid_nslm_out"  level="5"/> 
    441462    <!-- level 6 --> 
    442463    <field field_ref="humtot" level="6"/> 
    … …  
    475496    <field field_ref="irrigmap" level="8"/> 
    476497    <field field_ref="floodmap" level="8"/> 
     498    <field field_ref="flood_frac" name="flood_frac" level="8"/> 
    477499    <field field_ref="swampmap" level="8"/> 
    478  
    479     <!-- for water budget control --> 
    480     <!-- Note! The _daily variables need an output frequency of at least one day --> 
    481     <field field_ref="delsoilmoist_daily" level="8" /> 
    482     <field field_ref="delintercept_daily" level="8" /> 
    483     <field field_ref="delswe_daily" level="8" /> 
    484     <field field_ref="delfastr_daily" level="8" /> 
    485     <field field_ref="delslowr_daily" level="8" /> 
    486     <field field_ref="delstreamr_daily" level="8" /> 
    487     <field field_ref="dellaker_daily" level="8" /> 
    488     <field field_ref="delpondr_daily" level="8" /> 
    489     <field field_ref="delfloodr_daily" level="8" /> 
    490     <field field_ref="delstock_routing_daily" level="8" /> 
    491500    <field field_ref="vevapflo" name="evapflo" level="8" unit="mm/d" > @vevapflo*86400 </field> 
    492501 
    … …  
    616625    <field field_ref="laker" level="1"/> 
    617626    <field field_ref="pondr" level="1"/> 
    618     <field field_ref="PotSurfT" level="1"/> 
    619627    <field field_ref="albedo_glob" level="1"/> 
    620628    <field field_ref="soilalb_bg" grid_ref="grid_albtyp_out" name="Albedo_Background" level="1"/> 
    … …  
    629637    <field field_ref="irrigmap" name="IrrigationMap" level="1"/> 
    630638    <field field_ref="floodmap" name="FloodplainsMap" level="1"/> 
     639    <field field_ref="flood_frac" name="flood_frac" level="1"/> 
    631640    <field field_ref="swampmap" name="SwampMap" level="1"/> 
    632641    <field field_ref="hydrographs" name="Dis" level="1"/> 
     642    <field field_ref="htuhgmon" name="HTUDis" grid_ref="grid_nbasmon_out" level="1"/> 
    633643    <field field_ref="gpp" grid_ref="grid_nvm_out" name="GPP" level="1"/> 
    634644    <field field_ref="nee" grid_ref="grid_nvm_out" name="NEE" level="1"/> 
    … …  
    645655    <field field_ref="vevapnu" name="ESoil" level="1"/> 
    646656    <field field_ref="vevapflo" name="EWater" level="1"/> 
    647     <field field_ref="ACond" level="1"/> 
    648657    <field field_ref="temp_air" name="Tair" level="2"/> 
    649658    <field field_ref="qair" name="Qair" level="2"/> 
    … …  
    701710    <field field_ref="irrigmap" name="IrrigationMap" level="1"/> 
    702711    <field field_ref="floodmap" name="FloodplainsMap" level="1"/> 
     712    <field field_ref="flood_frac" name="flood_frac" level="1"/> 
    703713    <field field_ref="swampmap" name="SwampMap" level="1"/> 
    704714    <field field_ref="hydrographs" name="Dis" level="1"/> 
    … …  
    714724    <field field_ref="vevapnu" name="ESoil" level="1"/> 
    715725    <field field_ref="vevapflo" name="EWater" level="1"/> 
    716     <field field_ref="ACond" level="1"/> 
    717726    <field field_ref="soilmoist" grid_ref="grid_nslm_out" level="7"/> 
    718727    <field field_ref="humtot" name="RootMoist" long_name="Root zone soil water" level="1"/> 
    … …  
    728737 
    729738  </file> 
     739 
     740  <!-- Sechiba file 4 containing variables read and interpolated from input files --> 
     741  <file id="sechiba4" name="sechiba_interp_diag" output_level="1" output_freq="1d" enabled=".TRUE."> 
     742    <field_group group_ref="remap_1d" grid_ref="grid_landpoints_out" > 
     743 
     744      <field field_ref="interp_diag_veget_next" grid_ref="grid_nvm_out" level="1"/> 
     745      <field field_ref="interp_diag_njsc" level="1"/> 
     746      <field field_ref="interp_diag_clayfraction"  level="1"/> 
     747      <field field_ref="interp_diag_sandfraction"  level="1"/> 
     748      <field field_ref="interp_diag_siltfraction"  level="1"/> 
     749      <field field_ref="interp_diag_reinf_slope"  level="1"/> 
     750      <field field_ref="interp_diag_alb_vis"  level="1"/> 
     751      <field field_ref="interp_diag_alb_nir"  level="1"/> 
     752      <field field_ref="interp_diag_N_qt_WRICE_year" level="1"/> 
     753      <field field_ref="interp_diag_N_qt_OTHER_year" level="1"/> 
     754      <field field_ref="interp_diag_flx_co2_bbg_year" level="1"/> 
     755      <field field_ref="interp_diag_reftemp" level="1"/> 
     756      <field field_ref="interp_diag_woodharvest" level="1"/> 
     757      <!--      <field field_ref="interp_diag_lai" grid_ref="grid_from_lai" level="1"/> --> 
     758       
     759      <field field_ref="interp_avail_aveget"  level="3"/> 
     760      <field field_ref="interp_diag_vegetrefrac" grid_ref="grid_nvm_out" level="3"/> 
     761      <field field_ref="interp_avail_atext"  level="3"/> 
     762      <field field_ref="interp_diag_soilclass" grid_ref="grid_nscm_out" level="3"/> 
     763      <field field_ref="interp_avail_aslope"  level="3"/>      
     764      <field field_ref="interp_avail_aalb_bg"  level="3"/> 
     765      <field field_ref="interp_avail_asoilcol"  level="3"/> 
     766      <field field_ref="interp_avail_achem_wrice" level="3"/> 
     767      <field field_ref="interp_avail_achem_other" level="3"/> 
     768      <field field_ref="interp_avail_achem_co2" level="3"/> 
     769      <field field_ref="interp_avail_alaimap"  level="3"/> 
     770      <field field_ref="interp_avail_areftemp" level="3"/> 
     771       
     772   </field_group> 
     773  </file> 
     774 
    730775 
    731776  <!-- Definition of files with stomate diagnostics --> 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/PARAM/iodef.xml

    r6179 r6291  
    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_LAM_v7/GENERAL/PARAM/orchidee.def

    r6179 r6291  
    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_LAM_v7/GENERAL/PARAM/tracer.def

    r6181 r6291  
    11&version=1.0                                                                     
    2 &dynamico                                                                        
    3 default parent=air phases=g hadv=10 vadv=10                                      
    4 H2O phases=gls 
    5 AGA                                                               
     2&lmdz                                                                        
     3default parent=air phases=g hadv=10 vadv=10 scheme=vanleer default_init_value=0 
     4H2O phases=gls                                                                   
     5Aga hadv=0 vadv=0 

  • CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/compile_icolmdzor.sh

    r6179 r6291  
    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 
    … …  
    268291    echo >> $outfile ; echo " NOW COMPILE DYNAMICO"   >> $outfile  
    269292     
    270     if [ -d $modipsl/config/ICOLMDZOR_v7/SOURCES/DYNAMICO ] ; then 
    271         cd $modipsl/config/ICOLMDZOR_v7/SOURCES/DYNAMICO 
    272         for dir in $( find . -mindepth 1 -maxdepth 1 -type d ); do 
    273             for file in $( find $dir -type f ! -path '*.svn*' ); do 
    274                 echo cp $file $modipsl/modeles/DYNAMICO/$file >> $outfile  
    275                 cp $file $modipsl/modeles/DYNAMICO/$file  >> $outfile 2>&1 
    276             done 
    277         done 
    278         cd $modipsl/modeles/DYNAMICO 
    279     fi 
    280  
    281     echo ./make_icosa -$optmode -parallel $parallel -external_ioipsl -with_xios -arch $fcm_arch -arch_path $arch_path -job 8 $full_dyna    >> $outfile  
    282     ./make_icosa -$optmode -parallel $parallel -external_ioipsl -with_xios -arch $fcm_arch -arch_path $arch_path -job 8 $full_dyna    >> $outfile 2>&1 
     293 
     294    echo ./make_icosa -$optmode -with_fcm1 -parallel $parallel -external_ioipsl -with_xios -arch $fcm_arch -arch_path $arch_path -job 8 $full_dyna    >> $outfile  
     295    ./make_icosa -$optmode -with_fcm1 -parallel $parallel -external_ioipsl -with_xios -arch $fcm_arch -arch_path $arch_path -job 8 $full_dyna    >> $outfile 2>&1 
    283296    # Test if compiling finished 
    284297    if [[ $? != 0 ]] ; then 
    … …  
    291304    echo; echo "NOW COMPILE ICOSA_LMDZ " 
    292305    echo >> $outfile ; echo " NOW COMPILE ICOSA_LMDZ"   >> $outfile  
    293      
    294     if [ -d $modipsl/config/ICOLMDZOR_v7/SOURCES/ICOSA_LMDZ ] ; then 
    295         cd $modipsl/config/ICOLMDZOR_v7/SOURCES/ICOSA_LMDZ 
    296         for dir in $( find . -mindepth 1 -maxdepth 1 -type d ); do 
    297             for file in $( find $dir -type f ! -path '*.svn*' ); do 
    298                 echo cp $file $modipsl/modeles/ICOSA_LMDZ/$file >> $outfile  
    299                 cp $file $modipsl/modeles/ICOSA_LMDZ/$file  >> $outfile 2>&1 
    300             done 
    301         done 
    302         cd $modipsl/modeles/ICOSA_LMDZ 
    303     fi 
    304306     
    305307    echo ./make_icosa_lmdz -nodeps -p lmd -$optmode -parallel $parallel -with_orchidee -arch ${fcm_arch} -arch_path ${arch_path} -job 8 $full_dyna    >> $outfile  
    … …  
    323325 
    324326# Find executable suffix 
     327suffix=_${resol_atm}_phylmd 
     328if [ $lmdzsvn -ge 4186 ] ; then suffix=${suffix}_${rad} ; fi 
    325329if [ $parallel == seq ] || [ $parallel == none ] ; then 
    326     suffix=_${resol_atm}_phylmd_seq_orch.e 
     330    suffix=${suffix}_seq_orch.e 
    327331else 
    328     suffix=_${resol_atm}_phylmd_para_mem_orch.e 
    329 fi 
     332    suffix=${suffix}_para_mem_orch.e 
     333fi 
     334echo gcm suffix = $suffix 
    330335 
    331336 
    … …  
    349354        rm -f .lock 
    350355    fi 
    351     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  
    352          ./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 
    353358    # Test if compiling finished 
    354359    if [[ $? != 0 ]] ; then 
Note: See TracChangeset for help on using the changeset viewer.