Changeset 4135


Ignore:
Timestamp:
11/13/18 17:30:14 (4 years ago)
Author:
jgipsl
Message:

Updated LMDZOR_v6.2 configuration according to changes done in ORCHIDEE trunk revision 5565:

  • input file context_input_orchidee.xml is added
  • input file file_def_input_orchidee.xml is removed
  • remove orchidee.def_Choi because Choisnel hydrology has been removed in ORCHIDEE trunk (done earlier in ORCHIDEE trunk)
Location:
CONFIG/UNIFORM/v6/LMDZOR_v6.2
Files:
1 deleted
7 edited

Legend:

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

    r3563 r4135  
    44[UserChoices] 
    55# 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 
     6# By default the file orchidee.def_CWRR will be selected. 
    97DefSuffix=CWRR 
    108 
     
    4644List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    4745        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    48         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
     46        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    4947        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    5048        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    5452 
    5553[OutputText] 
    56 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
     54List=   (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) 
    5755 
    5856[OutputFiles] 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/EXPERIMENTS/LMDZOR/amip_CMIP6/COMP/orchidee.card

    r3915 r4135  
    44[UserChoices] 
    55# 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 
     6# By default the file orchidee.def_CWRR will be selected. 
    97DefSuffix=CWRR 
    108 
     
    4745List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    4846        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    49         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
     47        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    5048        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    5149        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) ,\ 
     
    5654 
    5755[OutputText] 
    58 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc, ping_orchidee.xml, dr2xml_orchidee.xml) 
     56List=   (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, ping_orchidee.xml, dr2xml_orchidee.xml) 
    5957 
    6058[OutputFiles] 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/EXPERIMENTS/LMDZOR/amip_nudge/COMP/orchidee.card

    r3563 r4135  
    44[UserChoices] 
    55# 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 
     6# By default the file orchidee.def_CWRR will be selected. 
    97DefSuffix=CWRR 
    108 
     
    4644List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    4745        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    48         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
     46        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    4947        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    5048        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    5452 
    5553[OutputText] 
    56 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
     54List=   (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) 
    5755 
    5856[OutputFiles] 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/EXPERIMENTS/LMDZOR/clim_360d/COMP/orchidee.card

    r3563 r4135  
    44[UserChoices] 
    55# 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 
     6# By default the file orchidee.def_CWRR will be selected. 
    97DefSuffix=CWRR 
    108 
     
    5149List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    5250        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    53         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
     51        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    5452        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    5553        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    5957 
    6058[OutputText] 
    61 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
     59List=   (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) 
    6260 
    6361[OutputFiles] 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card

    r3563 r4135  
    44[UserChoices] 
    55# 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 
     6# By default the file orchidee.def_CWRR will be selected. 
    97DefSuffix=CWRR 
    108 
     
    5149List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    5250        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    53         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
     51        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    5452        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    5553        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    5957 
    6058[OutputText] 
    61 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
     59List=   (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) 
    6260 
    6361[OutputFiles] 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/EXPERIMENTS/LMDZOR/highresmip_CMIP6/COMP/orchidee.card

    r4034 r4135  
    44[UserChoices] 
    55# The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
    6 # Set DefSuffix=CWRR to activate 11-layer CWRR hydrology (default) 
    7 # Sef DefSuffix=Choi to activate 2-layer Choisnel hydrology (obsolete option) 
     6# By default the file orchidee.def_CWRR will be selected. 
    87DefSuffix=CWRR 
    98 
     
    5352        (${SUBMIT_DIR}/PARAM/ping_orchidee.xml, .) ,\ 
    5453        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    55         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
     54        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    5655        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    5756        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    6160 
    6261[OutputText] 
    63 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc, ping_orchidee.xml, dr2xml_orchidee.xml) 
     62List=   (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, ping_orchidee.xml, dr2xml_orchidee.xml) 
    6463 
    6564[OutputFiles] 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/GENERAL/DRIVER/orchidee.driver

    r4108 r4135  
    1212        DefSuffix=${orchidee_UserChoices_DefSuffix} 
    1313    else 
    14         DefSuffix=Choi 
     14        DefSuffix=CWRR 
    1515    fi 
    1616 
Note: See TracChangeset for help on using the changeset viewer.