Changeset 2018


Ignore:
Timestamp:
03/06/13 18:44:35 (9 years ago)
Author:
jgipsl
Message:

Le fichier orchidee.def est renome en orchidee.def_Choi.

  • Ajoute le fichier orchidee.def_CWRR (CWRR reste toujours en cours de validation et necessite le trunk d'ORCHIDEE).
  • La variable NEWHYDROL est enleve de orchidee.card et driver.
Location:
CONFIG/UNIFORM/v5
Files:
35 edited
5 copied
5 moved

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/EXPERIMENTS/IPSLCM5/Chistorical/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712# If use of PFTmap, put VEGET_UPDATE=1Y and LAND_COVER_CHANGE=y 
     
    2126 
    2227[ParametersFiles] 
    23 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     28List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2429 
    2530[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/EXPERIMENTS/IPSLCM5/CpiControl/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/EXPERIMENTS/IPSLCM5/EXP00/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/EXPERIMENTS/IPSLCM5/historical/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712# If use of PFTmap, put VEGET_UPDATE=1Y and LAND_COVER_CHANGE=y 
     
    2126 
    2227[ParametersFiles] 
    23 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     28List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2429 
    2530[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/EXPERIMENTS/IPSLCM5/piControl/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/EXPERIMENTS/IPSLCM5CHS/ref1/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r1759 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=1Y 
     
    2328 
    2429[ParametersFiles] 
    25 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     30List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2631 
    2732[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

    r1759 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=0Y 
     
    2227 
    2328[ParametersFiles] 
    24 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     29List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2530 
    2631[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/GENERAL/DRIVER/orchidee.driver

    r1692 r2018  
    2929        esac 
    3030    done 
     31 
     32    ##- Define variable DefSuffix set in orchidee.card 
     33    ##  This variable is used in orchidee.card to choose  
     34    ##  parameter file(orchidee.def_DefSuffix).  
     35    if [ ! X${orchidee_UserChoices_DefSuffix} = X ] ; then 
     36        DefSuffix=${orchidee_UserChoices_DefSuffix} 
     37    else 
     38        DefSuffix=Choi 
     39    fi 
    3140 
    3241    IGCM_debug_PopStack "SRF_Initialize" 
     
    8796    esac 
    8897 
    89     ORCHIDEE_sed HYDROL_CWRR ${orchidee_UserChoices_NEWHYDROL} 
    90  
    9198    ORCHIDEE_sed WRITE_STEP ${SECHIBA_WRITE_STEP} 
    9299    ORCHIDEE_sed SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL} 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/GENERAL/PARAM/orchidee.def_CWRR

    r2008 r2018  
    596596 
    597597# Total depth of soil reservoir 
    598 HYDROL_SOIL_DEPTH = 4. 
     598HYDROL_SOIL_DEPTH = 2. 
    599599# default = 2. 
    600600 
     
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = y  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/IPSLCM5CHS_v5/GENERAL/PARAM/orchidee.def_Choi

    r2008 r2018  
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = n  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/EXPERIMENTS/IPSLCM5/Chistorical/COMP/orchidee.card

    r1818 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712# If use of PFTmap, put VEGET_UPDATE=1Y and LAND_COVER_CHANGE=y 
     
    2126 
    2227[ParametersFiles] 
    23 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     28List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2429 
    2530[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/EXPERIMENTS/IPSLCM5/CpiControl/COMP/orchidee.card

    r1818 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/EXPERIMENTS/IPSLCM5/EXP00/COMP/orchidee.card

    r1818 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/EXPERIMENTS/IPSLCM5/historical/COMP/orchidee.card

    r1818 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712# If use of PFTmap, put VEGET_UPDATE=1Y and LAND_COVER_CHANGE=y 
     
    2126 
    2227[ParametersFiles] 
    23 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     28List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2429 
    2530[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/EXPERIMENTS/IPSLCM5/piControl/COMP/orchidee.card

    r1818 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/EXPERIMENTS/IPSLCM5CHT/piControl/COMP/orchidee.card

    r1818 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r1818 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=1Y 
     
    2328 
    2429[ParametersFiles] 
    25 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     30List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2631 
    2732[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

    r1818 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=0Y 
     
    2227 
    2328[ParametersFiles] 
    24 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     29List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2530 
    2631[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/GENERAL/DRIVER/orchidee.driver

    r1818 r2018  
    2929        esac 
    3030    done 
     31 
     32    ##- Define variable DefSuffix set in orchidee.card 
     33    ##  This variable is used in orchidee.card to choose  
     34    ##  parameter file(orchidee.def_DefSuffix).  
     35    if [ ! X${orchidee_UserChoices_DefSuffix} = X ] ; then 
     36        DefSuffix=${orchidee_UserChoices_DefSuffix} 
     37    else 
     38        DefSuffix=Choi 
     39    fi 
    3140 
    3241    IGCM_debug_PopStack "SRF_Initialize" 
     
    8796    esac 
    8897 
    89     ORCHIDEE_sed HYDROL_CWRR ${orchidee_UserChoices_NEWHYDROL} 
    90  
    9198    ORCHIDEE_sed WRITE_STEP ${SECHIBA_WRITE_STEP} 
    9299    ORCHIDEE_sed SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL} 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/GENERAL/PARAM/orchidee.def_CWRR

    r2008 r2018  
    596596 
    597597# Total depth of soil reservoir 
    598 HYDROL_SOIL_DEPTH = 4. 
     598HYDROL_SOIL_DEPTH = 2. 
    599599# default = 2. 
    600600 
     
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = y  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/IPSLCM5CHT_v5/GENERAL/PARAM/orchidee.def_Choi

    r2008 r2018  
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = n  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/EXPERIMENTS/IPSLCM5/Chistorical/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712# If use of PFTmap, put VEGET_UPDATE=1Y and LAND_COVER_CHANGE=y 
     
    2126 
    2227[ParametersFiles] 
    23 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     28List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2429 
    2530[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/EXPERIMENTS/IPSLCM5/CpiControl/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/EXPERIMENTS/IPSLCM5/EXP00/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/EXPERIMENTS/IPSLCM5/historical/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712# If use of PFTmap, put VEGET_UPDATE=1Y and LAND_COVER_CHANGE=y 
     
    2126 
    2227[ParametersFiles] 
    23 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     28List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2429 
    2530[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/EXPERIMENTS/IPSLCM5/piControl/COMP/orchidee.card

    r1549 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712 
     
    1924 
    2025[ParametersFiles] 
    21 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     26List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2227 
    2328[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r1759 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=1Y 
     
    2328 
    2429[ParametersFiles] 
    25 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     30List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2631 
    2732[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

    r1759 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=0Y 
     
    2227 
    2328[ParametersFiles] 
    24 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     29List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2530 
    2631[RestartFiles] 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/GENERAL/DRIVER/orchidee.driver

    r1692 r2018  
    2929        esac 
    3030    done 
     31 
     32    ##- Define variable DefSuffix set in orchidee.card 
     33    ##  This variable is used in orchidee.card to choose  
     34    ##  parameter file(orchidee.def_DefSuffix).  
     35    if [ ! X${orchidee_UserChoices_DefSuffix} = X ] ; then 
     36        DefSuffix=${orchidee_UserChoices_DefSuffix} 
     37    else 
     38        DefSuffix=Choi 
     39    fi 
    3140 
    3241    IGCM_debug_PopStack "SRF_Initialize" 
     
    8796    esac 
    8897 
    89     ORCHIDEE_sed HYDROL_CWRR ${orchidee_UserChoices_NEWHYDROL} 
    90  
    9198    ORCHIDEE_sed WRITE_STEP ${SECHIBA_WRITE_STEP} 
    9299    ORCHIDEE_sed SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL} 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/GENERAL/PARAM/orchidee.def_CWRR

    r2008 r2018  
    596596 
    597597# Total depth of soil reservoir 
    598 HYDROL_SOIL_DEPTH = 4. 
     598HYDROL_SOIL_DEPTH = 2. 
    599599# default = 2. 
    600600 
     
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = y  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/IPSLCM5_v5/GENERAL/PARAM/orchidee.def_Choi

    r2008 r2018  
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = n  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r1759 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=1Y 
     
    2328 
    2429[ParametersFiles] 
    25 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     30List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2631 
    2732[RestartFiles] 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

    r1759 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=0Y 
     
    2227 
    2328[ParametersFiles] 
    24 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     29List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2530 
    2631[RestartFiles] 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/EXPERIMENTS/LMDZORINCA/AER/COMP/orchidee.card

    r1810 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=1Y 
     
    3136 
    3237[ParametersFiles] 
    33 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     38List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    3439 
    3540[RestartFiles] 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/EXPERIMENTS/LMDZORINCA/GES/COMP/orchidee.card

    r1814 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=1Y 
     
    3136 
    3237[ParametersFiles] 
    33 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     38List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    3439 
    3540[RestartFiles] 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/orchidee.card

    r1813 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=1Y 
     
    3136 
    3237[ParametersFiles] 
    33 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     38List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    3439 
    3540[RestartFiles] 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/GENERAL/DRIVER/orchidee.driver

    r1692 r2018  
    2929        esac 
    3030    done 
     31 
     32    ##- Define variable DefSuffix set in orchidee.card 
     33    ##  This variable is used in orchidee.card to choose  
     34    ##  parameter file(orchidee.def_DefSuffix).  
     35    if [ ! X${orchidee_UserChoices_DefSuffix} = X ] ; then 
     36        DefSuffix=${orchidee_UserChoices_DefSuffix} 
     37    else 
     38        DefSuffix=Choi 
     39    fi 
    3140 
    3241    IGCM_debug_PopStack "SRF_Initialize" 
     
    8796    esac 
    8897 
    89     ORCHIDEE_sed HYDROL_CWRR ${orchidee_UserChoices_NEWHYDROL} 
    90  
    9198    ORCHIDEE_sed WRITE_STEP ${SECHIBA_WRITE_STEP} 
    9299    ORCHIDEE_sed SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL} 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/GENERAL/PARAM/orchidee.def_CWRR

    r2008 r2018  
    596596 
    597597# Total depth of soil reservoir 
    598 HYDROL_SOIL_DEPTH = 4. 
     598HYDROL_SOIL_DEPTH = 2. 
    599599# default = 2. 
    600600 
     
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = y  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/LMDZORINCA_v5/GENERAL/PARAM/orchidee.def_Choi

    r2008 r2018  
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = n  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/LMDZOR_v5/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r1759 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=1Y 
     
    2328 
    2429[ParametersFiles] 
    25 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     30List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2631 
    2732[RestartFiles] 
  • CONFIG/UNIFORM/v5/LMDZOR_v5/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

    r1759 r2018  
    33 
    44[UserChoices] 
    5 NEWHYDROL=n 
     5# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
     6# By default the file orchidee.def_Choi will be selected. 
     7# Sef DefSuffix=Choi (default) to activate default 2-layer Choisnel hydrology 
     8# Set DefSuffix=CWRR to activate 11-layer CWRR hydrology 
     9DefSuffix=Choi 
     10 
    611sechiba_LEVEL=11 
    712VEGET_UPDATE=0Y 
     
    2227 
    2328[ParametersFiles] 
    24 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .) 
     29List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
    2530 
    2631[RestartFiles] 
  • CONFIG/UNIFORM/v5/LMDZOR_v5/GENERAL/DRIVER/orchidee.driver

    r1692 r2018  
    2929        esac 
    3030    done 
     31 
     32    ##- Define variable DefSuffix set in orchidee.card 
     33    ##  This variable is used in orchidee.card to choose  
     34    ##  parameter file(orchidee.def_DefSuffix).  
     35    if [ ! X${orchidee_UserChoices_DefSuffix} = X ] ; then 
     36        DefSuffix=${orchidee_UserChoices_DefSuffix} 
     37    else 
     38        DefSuffix=Choi 
     39    fi 
    3140 
    3241    IGCM_debug_PopStack "SRF_Initialize" 
     
    8796    esac 
    8897 
    89     ORCHIDEE_sed HYDROL_CWRR ${orchidee_UserChoices_NEWHYDROL} 
    90  
    9198    ORCHIDEE_sed WRITE_STEP ${SECHIBA_WRITE_STEP} 
    9299    ORCHIDEE_sed SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL} 
  • CONFIG/UNIFORM/v5/LMDZOR_v5/GENERAL/PARAM/orchidee.def_CWRR

    r2008 r2018  
    596596 
    597597# Total depth of soil reservoir 
    598 HYDROL_SOIL_DEPTH = 4. 
     598HYDROL_SOIL_DEPTH = 2. 
    599599# default = 2. 
    600600 
     
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = y  
    812812# default = n 
    813813 
  • CONFIG/UNIFORM/v5/LMDZOR_v5/GENERAL/PARAM/orchidee.def_Choi

    r2008 r2018  
    809809#  diffusion scheme adapted from CWRR by Patricia de Rosnay. 
    810810#  by default the Choisnel hydrology is used. 
    811 HYDROL_CWRR = _AUTO_ 
     811HYDROL_CWRR = n  
    812812# default = n 
    813813 
Note: See TracChangeset for help on using the changeset viewer.