Changeset 6462 for CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card

Timestamp:

05/16/23 16:24:04 (14 months ago)

Author:

jgipsl

Message:

Change in organisation to make it possible to have ORCHIDEE version 2_2 and version trunk(also called version 4) in the same modipsl :

• sources are now stored in modeles/ORCHIDEE_2_2 for default settings
• default compilation, modeles/ORCHIDEE_2_2 will be compiled => modification in mod.def is needed
• compilation with option -orch4 compiles folder modeles/ORCHIDEE_trunk
• executables containing ORCHIDEE has suffix orch22 for default version or orch4 for the trunk version.
• experiment set up changes for the name of the executable and the path to xml files in the ORCHIDEE_2_2 or ORCHIDEE_trunk. An experiment set up can only be used with the version of ORCHIDEE which it is prepared for. Currently all experiments are done for ORCHIDEE_2_2 except one in ICOLMDZOR which is suffiexed by orchv4

File:

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

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

@@ -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.  
@@ -53 +49 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+List=   (${SUBMIT_DIR}/PARAM/orchidee.def_v22, orchidee.def)   ,\
         (${SUBMIT_DIR}/PARAM/file_def_orchidee.xml, .)  ,\
-        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\
-        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\
-        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
+        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_input_orchidee.xml, .) ,\
+        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_orchidee.xml, .)   ,\
+        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/field_def_orchidee.xml, .)
 
 [RestartFiles]