Changeset 8133 for branches/ORCHIDEE_2_2/ORCHIDEE

Timestamp:

2023-08-09T18:17:29+02:00 (11 months ago)

Author:

josefine.ghattas

Message:

• Updated to use module hdf5/1.12.2 needed at irene-skl, previously done in coupled configuration. Needed for XIOS3.
• Cleaning in xml files needed for use with XIOS3. All modifications are also working with XIOS2.

See ticket #933

Location:

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml

Files:

• context_input_orchidee.xml (modified) (4 diffs)
• context_orchidee.xml (modified) (2 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/context_input_orchidee.xml

@@ -28 +28 @@
 
     <file id="soils_param_file" mode="read" output_freq="1y" enabled="true">
-      <field id="soilcolor" name="soilcolor" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts"/>
+      <field id="soilcolor" name="soilcolor" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" enabled="false"/>
       <field id="soiltext" name="soiltext" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts"/>
     </file>
@@ -138 +138 @@
       <field id="frac_veget_frac" field_ref="maxvegetfrac_mask" domain_ref="dom_from_pft" read_access="true" enabled="true" />
 
-      <field id="slope_tmp"           field_ref="pente_read"       domain_ref="dom_from_topo"                                  />
-      <field id="frac_slope_interp"   field_ref="mask_pente_read"  domain_ref="dom_from_topo" read_access="true" enabled="true"/>
+      <field id="slope_tmp"           field_ref="pente_read"       domain_ref="dom_from_topo_read"                                  />
+      <field id="frac_slope_interp"   field_ref="mask_pente_read"  domain_ref="dom_from_topo_read" read_access="true" enabled="true"/>
       <field id="reinf_slope_interp"                               domain_ref="dom_from_topo" read_access="true" enabled="true"> (frac_slope_interp &gt; $min_sechiba ) ? 1-slope_tmp/(frac_slope_interp+1e-100) : $slope_default </field>
 
@@ -163 +163 @@
     </field_group>
 
-    <field_group id="orchidee_input_mc" grid_ref="grid_nslm_nstm">
+    <field_group id="orchidee_input_mc" grid_ref="grid_nslm_nstm_read">
       <!-- Interpolate the mask. This gives now the fraction of the source area underlaying the model grid cell -->
       <field id="mask_moistc_interp" field_ref="mask_moistc_in" read_access="true" />
@@ -225 +225 @@
     
     <domain id="dom_from_topo" domain_ref="domain_landpoints">
-      <interpolate_domain order="1" renormalize="false" />
-    </domain>
-    
+    </domain>
+    
+    <domain id="dom_from_topo_read" domain_ref="domain_landpoints">
+      <interpolate_domain order="1" renormalize="false" />
+    </domain>
+
     <domain id="dom_from_albedo" domain_ref="domain_landpoints">
       <interpolate_domain order="1" renormalize="true" detect_missing_value="true"/>

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/context_orchidee.xml

@@ -266 +266 @@
 
     <!-- Definition of grids with fields having two extra dimensions, 4D grids -->
-    <grid id="grid_nslm_nstm">
+    <grid id="grid_nslm_nstm_read">
       <domain domain_ref="domain_landpoints" >
         <interpolate_domain order="1"/>
@@ -273 +273 @@
       <axis axis_ref="nstm" />
     </grid>
+    <grid id="grid_nslm_nstm">
+      <domain domain_ref="domain_landpoints" >
+      </domain>
+      <axis axis_ref="nslm" />
+      <axis axis_ref="nstm" />
+    </grid>
     <grid id="grid_nslm_nstm_out">
       <domain domain_ref="domain_landpoints_out" />