Changeset 5811

Timestamp:

2019-03-13T10:36:46+01:00 (5 years ago)

Author:

josefine.ghattas

Message:

Corrections for unstructured grid:

• one interface restput where wrong
• interpolation to regular grid has been changed

25. Meurdesoif

Location:

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml

Files:

• field_def_orchidee.xml (modified) (1 diff)
• file_def_orchidee.xml (modified) (8 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/field_def_orchidee.xml

@@ -11 +11 @@
 
   <!-- ========================================================================================================= -->
-  <!-- Definition of field_group "remap_expr" used to intrepolate output fields.                                 -->
+  <!-- Definition of field_group "remap_expr" used to interpolate output fields.                                 -->
   <!-- expr is set from the fortran source code for the case with unstructured grid, for regular grid it'll      -->
-  <!-- remain empty and no interpolations will be done for output fields.                                        -->
-  <!-- ========================================================================================================= -->
-  <field_group id="remap_expr" expr="_reset_" prec="_reset_" operation="_reset_" freq_op="_reset_" enabled="_reset_" default_value="_reset_" detect_missing_value="_reset_"/>
-  
+  <!-- remain empty and no interpolations will be done for output fields. When runnig the unstructrured grid,    -->
+  <!-- the field_group remap_xx corresponding to the output_freqi=xx should be set in file_def_orchidee.xml.     -->
+  <!-- ========================================================================================================= -->
+  <field_group id="remap_expr" expr="_reset_" prec="_reset_" operation="_reset_" freq_op="_reset_" enabled="_reset_" default_value="_reset_" detect_missing_value="_reset_">
+    <field_group id="remap_1ts" />
+    <field_group id="remap_1800s" />
+    <field_group id="remap_1h" />
+    <field_group id="remap_3h" />
+    <field_group id="remap_6h" />
+    <field_group id="remap_1d" />
+    <field_group id="remap_1mo" />
+    <field_group id="remap_1y" />
+  </field_group>
+
 
   <!-- ========================================================================================================= -->

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/file_def_orchidee.xml

@@ -23 +23 @@
 <!-- corresponds to no compression and 4 is a middle compression here set as default.                            -->
 <!--                                                                                                             -->
+<!-- field group "remap_1xx" do only have a meaning for unstructured grid when remapping of output is activated. -->
+<!-- For this case, remap_1xx will set a corresponding freq_op done from the fortran code.                       -->
+<!-- For regular grid, this group do not contain any attributes so it'll not make any difference.                -->
+<!--                                                                                                             -->
 <!-- $HeadURL$               -->
 <!-- $Date$                                                      -->
@@ -39 +43 @@
   <file id="sechiba1" name="sechiba_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
 
-   <field_group freq_op="1ts" grid_ref="grid_landpoints_out" group_ref="remap_expr">
+   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <!-- level 1 -->
     <field field_ref="areas" level="0"/>
@@ -349 +353 @@
   <!-- Sechiba file 2 -->
   <file id="sechiba2" name="sechiba_out_2" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
-   <field_group freq_op="1ts" grid_ref="grid_landpoints_out" group_ref="remap_expr" >
+   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <!-- level 1 -->
     <field field_ref="areas" level="1"/>
@@ -562 +566 @@
   <!-- This files contains all variables having more than one vertical axis -->
   <file id="sechiba3" name="sechiba_history_4dim" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
-   <field_group  freq_op="1ts" grid_ref="grid_landpoints_out" group_ref="remap_expr" >
+   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <field field_ref="areas" level="1"/>
     <field field_ref="contfrac" level="1"/>
@@ -576 +580 @@
   <!-- Sechiba alma file 1 -->
   <file id="sechiba1_alma" name="sechiba_history_alma" output_level="10" output_freq="1mo" enabled=".FALSE.">
-   <field_group  freq_op="1ts" grid_ref="grid_landpoints_out" group_ref="remap_expr" >
+   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <field field_ref="areas" level="1"/>
     <field field_ref="LandPoints" level="20"/>
@@ -652 +656 @@
   <!-- Sechiba alma file 2 -->
   <file id="sechiba2_alma" name="sechiba_out_2_alma" output_level="10" output_freq="1d" enabled=".FALSE.">
-   <field_group  freq_op="1ts" grid_ref="grid_landpoints_out" group_ref="remap_expr" >
+   <field_group group_ref="remap_1d" grid_ref="grid_landpoints_out" >
     <field field_ref="areas" level="1"/>
     <field field_ref="LandPoints" level="20"/>
@@ -720 +724 @@
   <!-- Stomate file 1 -->
   <file id="stomate1" name="stomate_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
-   <field_group  freq_op="1ts" grid_ref="grid_landpoints_out" group_ref="remap_expr" >
+   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
      
     <!-- level 1 -->
@@ -860 +864 @@
   <!-- Stomate file 2 -->
   <file id="stomate2" name="stomate_ipcc_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
-   <field_group  freq_op="1ts" grid_ref="grid_landpoints_out" group_ref="remap_expr" >
+   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <!-- level 1 -->
     <field field_ref="RESOLUTION_X" level="1"/>