Changeset 8579 for branches/ORCHIDEE_2_2/ORCHIDEE/src_xml

Timestamp:

2024-06-13T16:33:33+02:00 (7 months ago)

Author:

antoine.bierjon

Message:

Adapted read and interpolation of irrigation input files with XIOS_interpolation.
Added a default value for AEI_SW interpolation (in case of missing value, with and without XIOS), which is chosen to be the average of the GMIA5 dataset from FAO.
Related to ticket #857

Location:

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml

Files:

• context_input_orchidee.xml (modified) (5 diffs)
• field_def_orchidee.xml (modified) (1 diff)
• file_def_orchidee.xml (modified) (1 diff)

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/context_input_orchidee.xml

@@ -89 +89 @@
     <file id="woodharvest_file" mode="read" output_freq="1y" cyclic="true">
       <field id="woodharvest_read"  name="woodharvest" domain_ref="dom_file_woodharvest" operation="instant"  freq_offset="1ts"/>
+    </file>
+    
+    <file id="irrigmap_file" mode="read" output_freq="1y" cyclic="true">
+      <field id="irrigmap_read"  name="irrig" domain_ref="dom_file_irrigmap" operation="instant"  freq_offset="1ts" > (this &gt; 101) ? $missing_value : this </field>
+    </file>
+    
+    <file id="aei_sw_file" mode="read" output_freq="1y" cyclic="true">
+      <field id="aei_sw_read"  name="aeisw_pct" domain_ref="dom_file_aei_sw" operation="instant"  freq_offset="1ts" > (this &gt; 101) ? $missing_value : this </field>
     </file>
     
@@ -176 +184 @@
 
       <field id="woodharvest_interp"  field_ref="woodharvest_read"  domain_ref="dom_from_woodharvest" read_access="true" enabled="true" />
+
+      <field id="irrigmap_tmp"   field_ref="irrigmap_read"  domain_ref="dom_from_irrigmap"  />
+      <field id="irrigmap_interp"  field_ref="irrigmap_tmp" read_access="true" enabled="true" > this == $missing_value ? 0 : this </field>
+
+      <field id="aei_sw_tmp"   field_ref="aei_sw_read"  domain_ref="dom_from_aei_sw"  />
+      <field id="aei_sw_interp"  field_ref="aei_sw_tmp" read_access="true" enabled="true" > this == $missing_value ? $aei_sw_default : this </field>
       
     </field_group>
@@ -275 +289 @@
     </domain>
     
+    <domain id="dom_from_irrigmap" domain_ref="domain_landpoints">
+      <interpolate_domain order="1" renormalize="true" detect_missing_value="true" />
+    </domain>
+    
+    <domain id="dom_from_aei_sw" domain_ref="domain_landpoints">
+      <interpolate_domain order="1" renormalize="true" detect_missing_value="true" />
+    </domain>
+    
     <domain id="dom_file_soil" type="rectilinear">
       <!-- generate_rectilinear_domain bounds_lon_start="-180" bounds_lon_end="180" bounds_lat_start="-90" bounds_lat_end="90"/-->
@@ -313 +335 @@
 
     <domain id="dom_file_woodharvest" type="rectilinear">
+      <generate_rectilinear_domain/>
+    </domain>
+
+    <domain id="dom_file_irrigmap" type="rectilinear">
+      <generate_rectilinear_domain/>
+    </domain>
+
+    <domain id="dom_file_aei_sw" type="rectilinear">
       <generate_rectilinear_domain/>
     </domain>
@@ -371 +401 @@
     <variable id="albbg_nir_default" type="double">xxx</variable>
     <variable id="bulk_default" type="double">xxx</variable>
+    <variable id="aei_sw_default" type="double">xxx</variable>
     
   </variable_definition>

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/field_def_orchidee.xml

@@ -391 +391 @@
     <field id="interp_avail_areftemp" name="interp_avail_areftemp" long_name="Availability of data for the reftemp interpolation (negative values if no data found)" unit="1" operation="once" freq_offset="0ts"/>
     <field id="interp_diag_woodharvest" name="interp_diag_woodharvest" long_name="woodharvest read from file" operation="once" freq_offset="0ts"/>
+    <field id="interp_diag_irrigmap_frac" name="interp_diag_irrigmap_frac" long_name="irrigmap_frac read from file" unit="%" operation="once" freq_offset="0ts"/>
+    <field id="interp_diag_aeiswmap_frac" name="interp_diag_aeiswmap_frac" long_name="aeiswmap_frac read from file" unit="%" operation="once" freq_offset="0ts"/>
 
 

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/file_def_orchidee.xml

@@ -755 +755 @@
       <field field_ref="interp_diag_reftemp" level="1"/>
       <field field_ref="interp_diag_woodharvest" level="1"/>
+      <field field_ref="interp_diag_irrigmap_frac" level="1"/>
+      <field field_ref="interp_diag_aeiswmap_frac" level="1"/>
       <!--      <field field_ref="interp_diag_lai" grid_ref="grid_from_lai" level="1"/> -->