Changeset 6077 for CONFIG/UNIFORM


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

Add switch for routing scheme standard/simple/highres/off in orchidee.driver. stanard is default routing scheme used if nothing is set in orchidee.card. Note that routing simple is available in ORCHIDEE_2_2 rev 7481 or later. highres routing scheme not yet avaialble and only standard routing scheme available in other branches/trunk on this day.

See ticket ​https://forge.ipsl.jussieu.fr/orchidee/ticket/581

Location:
CONFIG/UNIFORM/v6/LMDZOR_v6.2
Files:
4 edited
2 copied

Legend:

Unmodified
Added
Removed

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

    r5717 r6077  
    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/v6/LMDZOR_v6.2/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card

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

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

    r6076 r6077  
    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=simple 
    1622 
    1723# Specify output level for output files 
    … …  
    3238 
    3339[InitialStateFiles] 
    34 List=   (${R_IN}/SRF/SOIL/soils_param.nc, .), \ 
     40List=   (${R_IN}/SRF/SOIL/soils_param.nc, . ), \ 
    3541        (${R_IN}/SRF/reftemp.nc, . ), \ 
    36         (${R_IN}/SRF/ROUTING/routing.nc, . ), \ 
    3742        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    3843        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    … …  
    4146List= () 
    4247ListNonDel= (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2v2/historical/15PFT.v1/PFTmap_2000.nc, PFTmap.nc),\ 
     48            (${R_IN}/SRF/ROUTING/routing_simple.nc,                                   .),\ 
    4349            (${R_IN}/SRF/WOODHARVEST/LUH2v2/historical/woodharvest_2000.nc,           woodharvest.nc),\ 
    4450 
    … …  
    5157        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    5258        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
     59        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_routing_orchidee.xml, .)   ,\ 
    5360        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
    5461 
    5562[RestartFiles] 
    56 List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc) 
     63List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc),\ 
     64        (routing_restart.nc, routing_restart.nc, routing_start.nc) 
    5765 
    5866[OutputText] 
    59 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) 
     67List=   (out_orchidee*, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, context_input_orchidee.xml, context_routing_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
    6068 
    6169[OutputFiles] 

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

    r5717 r6077  
    6262    else 
    6363        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y 
     64    fi 
     65 
     66    # Set parameters related to ROUTING in orchidee.def 
     67    if [ X${orchidee_UserChoices_ROUTING} = X ] || [ X${orchidee_UserChoices_ROUTING} = Xstandard ]; then 
     68        # Nothing is set or ROUTING=standard in orchidee.def, default option 
     69        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     70        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard 
     71    elif [ X${orchidee_UserChoices_ROUTING} = Xsimple ]; then 
     72        # ROUTING=simple is set in orchidee.card 
     73        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     74        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  simple 
     75    elif [ X${orchidee_UserChoices_ROUTING} = Xhighres ]; then 
     76        # ROUTING=highres is set in orchidee.card 
     77        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     78        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  highres 
     79    else 
     80        # ROUTING=off, routing will be deactivated 
     81        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING n 
     82        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard 
    6483    fi 
    6584 
    … …  
    142161    # In iodef.xml add on the next line after "COMPONENT CONTEXT" 
    143162    echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp 
     163 
    144164    # Add inclusion of file context_input_orchidee.xml if this file exists 
    145165    if [ -f context_input_orchidee.xml ] ; then 
    146166        echo '<context id="orchidee" src="./context_input_orchidee.xml"/>' >> add.tmp 
    147167    fi 
     168 
     169    # Add inclusion of file context_routing_orchidee.xml if this file exists 
     170    if [ -f context_routing_orchidee.xml ] ; then 
     171        echo '<context id="orchidee" src="./context_routing_orchidee.xml"/>' >> add.tmp 
     172    fi 
     173 
    148174    # Include xml files for output configuration if running with workflow CMIP6 
    149175    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 

  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/GENERAL/PARAM/orchidee.def_CWRR

    r4861 r6077  
    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 
Note: See TracChangeset for help on using the changeset viewer.