Changeset 6117 for CONFIG/UNIFORM


Ignore:
Timestamp:
04/20/22 16:07:08 (2 years ago)
Author:
jgipsl
Message:
  • Update orchidee.driver as done in LMDZOR_v6.2 to be easier to use with routing scheme simple. This is done in all configurations using ORCHIDEE_2_x, ORCHIDEE_3 and ORCHIDEE trunk.
  • Update orchidee.def in configurations using ORCHIDEE_2_2 only. Only these configurations can activate routing simple currently. Now to activate routing simple, only modifications in orchidee.card is needed.

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

Location:
CONFIG/UNIFORM/v6
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r5117 r6117  
    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/IPSLCM6.2/GENERAL/PARAM/orchidee.def_CWRR

    r4861 r6117  
    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/v6/IPSLCM6.3/GENERAL/DRIVER/orchidee.driver

    r5555 r6117  
    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/IPSLCM6.5/GENERAL/DRIVER/orchidee.driver

    r5066 r6117  
    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 
    149     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    150         echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
    151         echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
     175    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
     176          echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
     177          echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
    152178    fi 
    153179    cp iodef.xml iodef.xml.tmp 

  • CONFIG/UNIFORM/v6/IPSLCM6.5/GENERAL/PARAM/orchidee.def_CWRR

    r5066 r6117  
    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/v6/IPSLCM6/GENERAL/DRIVER/orchidee.driver

    r4351 r6117  
    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 
    149     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    150         echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
    151         echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
     175    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
     176          echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
     177          echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
    152178    fi 
    153179    cp iodef.xml iodef.xml.tmp 
    … …  
    169195    fi 
    170196 
    171     #Compression level (if CompressionLevel is not empty) 
     197    # Compression level (if CompressionLevel is not empty) 
    172198    if [ ! "X${config_UserChoices_CompressionLevel}" = "X" ] ; then 
    173199        echo "NetCDF output files compression level is " ${config_UserChoices_CompressionLevel} 
    174200        listfile=$(ls file_def*orchidee.xml) 
    175         for file in ${listfile} 
    176         do 
     201        for file in ${listfile} ; do 
    177202            sed -i -e "s/\(compression_level=\"\)[^\"]*\(\"\)/\1${config_UserChoices_CompressionLevel}\2/" ${file} 
    178203        done 

  • CONFIG/UNIFORM/v6/IPSLCM6_LANDN/GENERAL/DRIVER/orchidee.driver

    r4351 r6117  
    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 
    149     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    150         echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
    151         echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
     175    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
     176          echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
     177          echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
    152178    fi 
    153179    cp iodef.xml iodef.xml.tmp 
    … …  
    169195    fi 
    170196 
    171     #Compression level (if CompressionLevel is not empty) 
     197    # Compression level (if CompressionLevel is not empty) 
    172198    if [ ! "X${config_UserChoices_CompressionLevel}" = "X" ] ; then 
    173199        echo "NetCDF output files compression level is " ${config_UserChoices_CompressionLevel} 
    174200        listfile=$(ls file_def*orchidee.xml) 
    175         for file in ${listfile} 
    176         do 
     201        for file in ${listfile} ; do 
    177202            sed -i -e "s/\(compression_level=\"\)[^\"]*\(\"\)/\1${config_UserChoices_CompressionLevel}\2/" ${file} 
    178203        done 

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

    r5702 r6117  
    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/LMDZORINCA_v6.2/GENERAL/PARAM/orchidee.def_CWRR

    r4934 r6117  
    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/v6/LMDZORINCA_v6.3/GENERAL/DRIVER/orchidee.driver

    r5975 r6117  
    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.3/GENERAL/DRIVER/orchidee.driver

    r6076 r6117  
    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.4/GENERAL/DRIVER/orchidee.driver

    r6076 r6117  
    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/GENERAL/DRIVER/orchidee.driver

    r4352 r6117  
    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 
    149     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    150         echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
    151         echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
     175    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
     176          echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
     177          echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
    152178    fi 
    153179    cp iodef.xml iodef.xml.tmp 
    … …  
    169195    fi 
    170196 
    171     #Compression level (if CompressionLevel is not empty) 
     197    # Compression level (if CompressionLevel is not empty) 
    172198    if [ ! "X${config_UserChoices_CompressionLevel}" = "X" ] ; then 
    173199        echo "NetCDF output files compression level is " ${config_UserChoices_CompressionLevel} 
    174200        listfile=$(ls file_def*orchidee.xml) 
    175         for file in ${listfile} 
    176         do 
     201        for file in ${listfile} ; do 
    177202            sed -i -e "s/\(compression_level=\"\)[^\"]*\(\"\)/\1${config_UserChoices_CompressionLevel}\2/" ${file} 
    178203        done 
Note: See TracChangeset for help on using the changeset viewer.