Changeset 3378 for CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM

Timestamp:

09/20/17 16:09:25 (7 years ago)

Author:

jgipsl

Message:

Preparing for IPSLCM6.0.13: Added new input file file_def_input_orchidee.xml needed for ORCHIDEE trunk revision 4577 and later. This modification can not be used with older versions of ORCHIDEE because the file did not exist.

Some homogenization of empty space between orchidee.card.

Location:

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM

Files:

• historical/COMP/orchidee.card (modified) (3 diffs)
• pdControl/COMP/orchidee.card (modified) (3 diffs)
• piControl/COMP/orchidee.card (modified) (3 diffs)

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/historical/COMP/orchidee.card

@@ -12 +12 @@
 
 [InitialStateFiles]
-List=   (${R_IN}/SRF/soils_param.nc,        . ), \
-        (${R_IN}/SRF/reftemp.nc,. ), \
-        (${R_IN}/SRF/routing.nc,            . ), \
+List=   (${R_IN}/SRF/soils_param.nc, . ), \
+        (${R_IN}/SRF/reftemp.nc, . ), \
+        (${R_IN}/SRF/routing.nc, . ), \
         (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \
-        (${R_IN}/SRF/cartepente2d_15min.nc, .)
+        (${R_IN}/SRF/cartepente2d_15min.nc, .)
 
 [BoundaryFiles]
@@ -28 +28 @@
 List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\
+        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
@@ -35 +36 @@
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc)
 
 [OutputFiles]

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/orchidee.card

@@ -12 +12 @@
 
 [InitialStateFiles]
-List=   (${R_IN}/SRF/soils_param.nc,        . ), \
-        (${R_IN}/SRF/reftemp.nc,. ), \
-        (${R_IN}/SRF/routing.nc,            . ), \
+List=   (${R_IN}/SRF/soils_param.nc, . ), \
+        (${R_IN}/SRF/reftemp.nc, . ), \
+        (${R_IN}/SRF/routing.nc, . ), \
         (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \
         (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2/historical/v1.2/withoutNoBio/13PFTmap_2000_ESA_LUH2v2h_withoutNoBio_v1.2.nc, PFTmap.nc),\
-        (${R_IN}/SRF/cartepente2d_15min.nc, .)
+        (${R_IN}/SRF/cartepente2d_15min.nc, .)
 
 [BoundaryFiles]
@@ -29 +29 @@
 List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\
+        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
@@ -36 +37 @@
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc)
 
 [OutputFiles]

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card

@@ -12 +12 @@
 
 [InitialStateFiles]
-List=   (${R_IN}/SRF/soils_param.nc,        . ), \
-        (${R_IN}/SRF/reftemp.nc,. ), \
-        (${R_IN}/SRF/routing.nc,            . ), \
+List=   (${R_IN}/SRF/soils_param.nc, . ), \
+        (${R_IN}/SRF/reftemp.nc, . ), \
+        (${R_IN}/SRF/routing.nc, . ), \
         (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \
         (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2/historical/v1.2/withoutNoBio/13PFTmap_1850_ESA_LUH2v2h_withoutNoBio_v1.2.nc, PFTmap.nc),\
-        (${R_IN}/SRF/cartepente2d_15min.nc, .)
+        (${R_IN}/SRF/cartepente2d_15min.nc, .)
 
 [BoundaryFiles]
@@ -29 +29 @@
 List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\
+        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\
         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
@@ -36 +37 @@
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc)
 
 [OutputFiles]