Changeset 1692


Ignore:
Timestamp:
03/20/12 09:36:08 (10 years ago)
Author:
jgipsl
Message:

Changed to _AUTO_ all variables that will be modified by the orchidee.driver or stomate.driver. Added, where missing, "else ORCHIDEE_sed..." to set default values.

Location:
CONFIG/UNIFORM/u1
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/u1/IPSLCM5REPR_u1/GENERAL/DRIVER/orchidee.driver

    r1650 r1692  
    9393 
    9494    # Outputs HF in HISTFILE2 if required 
    95     [ X${SRF_ok_hf} = Xy ] && ORCHIDEE_sed SECHIBA_HISTFILE2 y 
     95    if [ X${SRF_ok_hf} = Xy ] ; then 
     96        ORCHIDEE_sed SECHIBA_HISTFILE2 y 
     97    else 
     98        ORCHIDEE_sed SECHIBA_HISTFILE2 n 
     99    fi 
    96100    ORCHIDEE_sed SECHIBA_HISTLEVEL2 1 
    97101    ORCHIDEE_sed WRITE_STEP2 10800.0 
     
    99103    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then 
    100104        ORCHIDEE_sed SECHIBA_restart_in sechiba_rest_in.nc 
     105    else 
     106        ORCHIDEE_sed SECHIBA_restart_in NONE 
    101107    fi 
    102  
    103108 
    104109# Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices 
    105110    if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then 
    106111        ORCHIDEE_sed VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
     112    else 
     113        ORCHIDEE_sed VEGET_UPDATE 0Y 
    107114    fi 
    108115    if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then 
    109116        ORCHIDEE_sed LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
     117    else 
     118        ORCHIDEE_sed LAND_COVER_CHANGE n 
    110119    fi 
    111120 
  • CONFIG/UNIFORM/u1/IPSLCM5REPR_u1/GENERAL/DRIVER/stomate.driver

    r1549 r1692  
    7171    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
    7272        echo "STOMATE : without restart" 
     73        ORCHIDEE_sed STOMATE_RESTART_FILEIN NONE 
    7374    else 
    7475        ORCHIDEE_sed STOMATE_RESTART_FILEIN stomate_rest_in.nc 
  • CONFIG/UNIFORM/u1/IPSLCM5REPR_u1/GENERAL/PARAM/orchidee.def

    r1013 r1692  
    102102#  Not truly COADS compliant. NONE will mean that 
    103103#  no restart file is to be expected. 
    104 SECHIBA_restart_in = NONE 
     104SECHIBA_restart_in = _AUTO_ 
    105105# default = NONE 
    106106 
     
    118118# This is the name of the file which will be opened of STOMATE 
    119119#   to extract the initial values of all prognostic values of STOMATE. 
    120 STOMATE_RESTART_FILEIN = NONE 
     120STOMATE_RESTART_FILEIN = _AUTO_ 
    121121# default = NONE 
    122122 
     
    203203#  frequency writing. This second output is optional and not written 
    204204#  by default. 
    205 SECHIBA_HISTFILE2 = FALSE 
     205SECHIBA_HISTFILE2 = _AUTO_ 
    206206# default  = FALSE 
    207207 
     
    231231#  written are available More details can be found on the web under documentation. 
    232232#  web under documentation. 
    233 SECHIBA_HISTLEVEL = 5 
     233SECHIBA_HISTLEVEL = _AUTO_ 
    234234# default = 5 
    235235 
     
    241241#   web under documentation. 
    242242# First level contains all ORCHIDEE outputs. 
    243 SECHIBA_HISTLEVEL2 = 1 
     243SECHIBA_HISTLEVEL2 = _AUTO_ 
    244244# default = 1 
    245245 
    246246# STOMATE history output level (0..10) 
    247247#  0: nothing is written; 10: everything is written 
    248 STOMATE_HISTLEVEL = 10 
     248STOMATE_HISTLEVEL = _AUTO_ 
    249249# default = 10 
    250250 
     
    275275#  It does not affect the frequency at which the 
    276276#  operations such as averaging are done. 
    277 WRITE_STEP = 86400.0 
     277WRITE_STEP = _AUTO_ 
    278278# default = 86400.0 
    279279 
     
    286286#   That is IF the coding of the calls to histdef 
    287287#   are correct ! 
    288 WRITE_STEP2 = 1800.0 
     288WRITE_STEP2 = _AUTO_ 
    289289# default = 1800.0 
    290290 
     
    292292# Time step of the STOMATE history file 
    293293# Care : this variable must be higher than DT_SLOW 
    294 STOMATE_HIST_DT = 10. 
     294STOMATE_HIST_DT = _AUTO_ 
    295295# default = 10. 
    296296 
     
    743743# The veget datas will be update each this time step. 
    744744# If LAND_USE 
    745 VEGET_UPDATE = 0Y 
     745VEGET_UPDATE = _AUTO_ 
    746746# default = 1Y 
    747747 
     
    751751# deforestation.                                 
    752752# If LAND_USE 
    753 LAND_COVER_CHANGE = n 
     753LAND_COVER_CHANGE = _AUTO_ 
    754754# default = y 
    755755 
     
    803803#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    804804#  by default the Choisnel hydrology is used. 
    805 HYDROL_CWRR = n 
     805HYDROL_CWRR = _AUTO_ 
    806806# default = n 
    807807 
  • CONFIG/UNIFORM/u1/IPSLCM5_u1/GENERAL/DRIVER/orchidee.driver

    r1650 r1692  
    9393 
    9494    # Outputs HF in HISTFILE2 if required 
    95     [ X${SRF_ok_hf} = Xy ] && ORCHIDEE_sed SECHIBA_HISTFILE2 y 
     95    if [ X${SRF_ok_hf} = Xy ] ; then 
     96        ORCHIDEE_sed SECHIBA_HISTFILE2 y 
     97    else 
     98        ORCHIDEE_sed SECHIBA_HISTFILE2 n 
     99    fi 
    96100    ORCHIDEE_sed SECHIBA_HISTLEVEL2 1 
    97101    ORCHIDEE_sed WRITE_STEP2 10800.0 
     
    99103    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then 
    100104        ORCHIDEE_sed SECHIBA_restart_in sechiba_rest_in.nc 
     105    else 
     106        ORCHIDEE_sed SECHIBA_restart_in NONE 
    101107    fi 
    102  
    103108 
    104109# Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices 
    105110    if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then 
    106111        ORCHIDEE_sed VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
     112    else 
     113        ORCHIDEE_sed VEGET_UPDATE 0Y 
    107114    fi 
    108115    if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then 
    109116        ORCHIDEE_sed LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
     117    else 
     118        ORCHIDEE_sed LAND_COVER_CHANGE n 
    110119    fi 
    111120 
  • CONFIG/UNIFORM/u1/IPSLCM5_u1/GENERAL/DRIVER/stomate.driver

    r1549 r1692  
    7171    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
    7272        echo "STOMATE : without restart" 
     73        ORCHIDEE_sed STOMATE_RESTART_FILEIN NONE 
    7374    else 
    7475        ORCHIDEE_sed STOMATE_RESTART_FILEIN stomate_rest_in.nc 
  • CONFIG/UNIFORM/u1/IPSLCM5_u1/GENERAL/PARAM/orchidee.def

    r1013 r1692  
    102102#  Not truly COADS compliant. NONE will mean that 
    103103#  no restart file is to be expected. 
    104 SECHIBA_restart_in = NONE 
     104SECHIBA_restart_in = _AUTO_ 
    105105# default = NONE 
    106106 
     
    118118# This is the name of the file which will be opened of STOMATE 
    119119#   to extract the initial values of all prognostic values of STOMATE. 
    120 STOMATE_RESTART_FILEIN = NONE 
     120STOMATE_RESTART_FILEIN = _AUTO_ 
    121121# default = NONE 
    122122 
     
    203203#  frequency writing. This second output is optional and not written 
    204204#  by default. 
    205 SECHIBA_HISTFILE2 = FALSE 
     205SECHIBA_HISTFILE2 = _AUTO_ 
    206206# default  = FALSE 
    207207 
     
    231231#  written are available More details can be found on the web under documentation. 
    232232#  web under documentation. 
    233 SECHIBA_HISTLEVEL = 5 
     233SECHIBA_HISTLEVEL = _AUTO_ 
    234234# default = 5 
    235235 
     
    241241#   web under documentation. 
    242242# First level contains all ORCHIDEE outputs. 
    243 SECHIBA_HISTLEVEL2 = 1 
     243SECHIBA_HISTLEVEL2 = _AUTO_ 
    244244# default = 1 
    245245 
    246246# STOMATE history output level (0..10) 
    247247#  0: nothing is written; 10: everything is written 
    248 STOMATE_HISTLEVEL = 10 
     248STOMATE_HISTLEVEL = _AUTO_ 
    249249# default = 10 
    250250 
     
    275275#  It does not affect the frequency at which the 
    276276#  operations such as averaging are done. 
    277 WRITE_STEP = 86400.0 
     277WRITE_STEP = _AUTO_ 
    278278# default = 86400.0 
    279279 
     
    286286#   That is IF the coding of the calls to histdef 
    287287#   are correct ! 
    288 WRITE_STEP2 = 1800.0 
     288WRITE_STEP2 = _AUTO_ 
    289289# default = 1800.0 
    290290 
     
    292292# Time step of the STOMATE history file 
    293293# Care : this variable must be higher than DT_SLOW 
    294 STOMATE_HIST_DT = 10. 
     294STOMATE_HIST_DT = _AUTO_ 
    295295# default = 10. 
    296296 
     
    743743# The veget datas will be update each this time step. 
    744744# If LAND_USE 
    745 VEGET_UPDATE = 0Y 
     745VEGET_UPDATE = _AUTO_ 
    746746# default = 1Y 
    747747 
     
    751751# deforestation.                                 
    752752# If LAND_USE 
    753 LAND_COVER_CHANGE = n 
     753LAND_COVER_CHANGE = _AUTO_ 
    754754# default = y 
    755755 
     
    803803#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    804804#  by default the Choisnel hydrology is used. 
    805 HYDROL_CWRR = n 
     805HYDROL_CWRR = _AUTO_ 
    806806# default = n 
    807807 
  • CONFIG/UNIFORM/u1/LMDZOR_u1/GENERAL/DRIVER/orchidee.driver

    r1650 r1692  
    9393 
    9494    # Outputs HF in HISTFILE2 if required 
    95     [ X${SRF_ok_hf} = Xy ] && ORCHIDEE_sed SECHIBA_HISTFILE2 y 
     95    if [ X${SRF_ok_hf} = Xy ] ; then 
     96        ORCHIDEE_sed SECHIBA_HISTFILE2 y 
     97    else 
     98        ORCHIDEE_sed SECHIBA_HISTFILE2 n 
     99    fi 
    96100    ORCHIDEE_sed SECHIBA_HISTLEVEL2 1 
    97101    ORCHIDEE_sed WRITE_STEP2 10800.0 
     
    99103    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then 
    100104        ORCHIDEE_sed SECHIBA_restart_in sechiba_rest_in.nc 
     105    else 
     106        ORCHIDEE_sed SECHIBA_restart_in NONE 
    101107    fi 
    102  
    103108 
    104109# Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices 
    105110    if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then 
    106111        ORCHIDEE_sed VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
     112    else 
     113        ORCHIDEE_sed VEGET_UPDATE 0Y 
    107114    fi 
    108115    if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then 
    109116        ORCHIDEE_sed LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
     117    else 
     118        ORCHIDEE_sed LAND_COVER_CHANGE n 
    110119    fi 
    111120 
  • CONFIG/UNIFORM/u1/LMDZOR_u1/GENERAL/DRIVER/stomate.driver

    r1549 r1692  
    7171    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
    7272        echo "STOMATE : without restart" 
     73        ORCHIDEE_sed STOMATE_RESTART_FILEIN NONE 
    7374    else 
    7475        ORCHIDEE_sed STOMATE_RESTART_FILEIN stomate_rest_in.nc 
  • CONFIG/UNIFORM/u1/LMDZOR_u1/GENERAL/PARAM/orchidee.def

    r1013 r1692  
    102102#  Not truly COADS compliant. NONE will mean that 
    103103#  no restart file is to be expected. 
    104 SECHIBA_restart_in = NONE 
     104SECHIBA_restart_in = _AUTO_ 
    105105# default = NONE 
    106106 
     
    118118# This is the name of the file which will be opened of STOMATE 
    119119#   to extract the initial values of all prognostic values of STOMATE. 
    120 STOMATE_RESTART_FILEIN = NONE 
     120STOMATE_RESTART_FILEIN = _AUTO_ 
    121121# default = NONE 
    122122 
     
    203203#  frequency writing. This second output is optional and not written 
    204204#  by default. 
    205 SECHIBA_HISTFILE2 = FALSE 
     205SECHIBA_HISTFILE2 = _AUTO_ 
    206206# default  = FALSE 
    207207 
     
    231231#  written are available More details can be found on the web under documentation. 
    232232#  web under documentation. 
    233 SECHIBA_HISTLEVEL = 5 
     233SECHIBA_HISTLEVEL = _AUTO_ 
    234234# default = 5 
    235235 
     
    241241#   web under documentation. 
    242242# First level contains all ORCHIDEE outputs. 
    243 SECHIBA_HISTLEVEL2 = 1 
     243SECHIBA_HISTLEVEL2 = _AUTO_ 
    244244# default = 1 
    245245 
    246246# STOMATE history output level (0..10) 
    247247#  0: nothing is written; 10: everything is written 
    248 STOMATE_HISTLEVEL = 10 
     248STOMATE_HISTLEVEL = _AUTO_ 
    249249# default = 10 
    250250 
     
    275275#  It does not affect the frequency at which the 
    276276#  operations such as averaging are done. 
    277 WRITE_STEP = 86400.0 
     277WRITE_STEP = _AUTO_ 
    278278# default = 86400.0 
    279279 
     
    286286#   That is IF the coding of the calls to histdef 
    287287#   are correct ! 
    288 WRITE_STEP2 = 1800.0 
     288WRITE_STEP2 = _AUTO_ 
    289289# default = 1800.0 
    290290 
     
    292292# Time step of the STOMATE history file 
    293293# Care : this variable must be higher than DT_SLOW 
    294 STOMATE_HIST_DT = 10. 
     294STOMATE_HIST_DT = _AUTO_ 
    295295# default = 10. 
    296296 
     
    743743# The veget datas will be update each this time step. 
    744744# If LAND_USE 
    745 VEGET_UPDATE = 0Y 
     745VEGET_UPDATE = _AUTO_ 
    746746# default = 1Y 
    747747 
     
    751751# deforestation.                                 
    752752# If LAND_USE 
    753 LAND_COVER_CHANGE = n 
     753LAND_COVER_CHANGE = _AUTO_ 
    754754# default = y 
    755755 
     
    803803#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    804804#  by default the Choisnel hydrology is used. 
    805 HYDROL_CWRR = n 
     805HYDROL_CWRR = _AUTO_ 
    806806# default = n 
    807807 
Note: See TracChangeset for help on using the changeset viewer.