Changeset 6871

Timestamp:

06/03/24 15:29:33 (4 weeks ago)

Author:

jgipsl

Message:

Update due to several previous commit

File:

• CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card_routage_simple (modified) (5 diffs)

CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card_routage_simple

@@ -3 +3 @@
 
 [UserChoices]
-# The variable DefSuffix gives the suffix of the orchidee.def file to be used.
-# By default the file orchidee.def_CWRR will be selected.
-DefSuffix=CWRR
-
 # VEGET_UPDATE_at_start=y : orchidee.driver will set VEGET_UPDATE=1Y at the first cumul period when starting a new simulation. 
 #                           After the first period, VEGET_UPDATE will be set according to the choice done below.  
@@ -18 +14 @@
 # ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard
 # ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple
+# ROUTING=native     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=native (note: routing_simple.nc is used also for this case)
 # ROUTING=off        => in orchidee.def RIVER_ROUTING=n 
 ROUTING=simple
@@ -38 +35 @@
 
 [InitialStateFiles]
-List=   (${R_IN}/SRF/SOIL/soils_param.nc, .), \
+List=   (${R_IN}/SRF/SOIL/soils_param_zobler_coord.nc, soils_param.nc), \
+        (${R_IN}/SRF/SOIL/soils_param_zobler_coord.nc, soilcolor.nc), \
         (${R_IN}/SRF/reftemp.nc, . ), \
         (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \
@@ -53 +51 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/ORCHIDEE/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+List=   (${SUBMIT_DIR}/PARAM/ORCHIDEE/orchidee.def_v22, orchidee.def)   ,\
         (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/file_def_orchidee.xml, .)  ,\
         (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_input_orchidee.xml, .) ,\
@@ -61 +59 @@
 
 [RestartFiles]
-List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc),\
+List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc), \
         (routing_restart.nc, routing_restart.nc, routing_start.nc)
 
 [OutputText]
-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)
+List=   (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)
 
 [OutputFiles]
 List=   (sechiba_history.nc,   ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history), \
         (sechiba_history_4dim.nc,${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history_4dim.nc, NONE), \
-        (diag_routing.nc,        ${R_OUT_SRF_O_D}/${PREFIX}_1D_sechiba_routing.nc, NONE), \
         (sechiba_out_2.nc,     ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc,   NONE), \
         (ORCHIDEE_interp_diag.nc, ${R_OUT_SRF_O_D}/${PREFIX}_ORCHIDEE_interp_diag.nc, NONE), \
-        (forcing_by_ORCHIDEE.nc, ${R_OUT_SRF_O_H}/${PREFIX}_forcing_by_ORCHIDEE.nc, NONE)
+        (forcing_by_ORCHIDEE.nc, ${R_OUT_SRF_O_H}/${PREFIX}_forcing_by_ORCHIDEE.nc, NONE), \
+        (diag_routing.nc,         ${R_OUT_SRF_O_D}/${PREFIX}_1D_sechiba_routing.nc, NONE),\
+        (diag_routing_r.nc,       ${R_OUT_SRF_O_D}/${PREFIX}_1D_sechiba_routing_r.nc, NONE)