Changeset 630 for XIOS/trunk/inputs

Timestamp:

07/07/15 10:46:25 (9 years ago)

Author:

mhnguyen

Message:

Implementing interpolation (polynomial) and correct some bugs

+) Implement interpolation (polynomial)
+) Correct some minor bugs relating to memory allocation
+) Clear some redundant codes

Test
+) On Curie
+) test_client and test_complete pass

File:

• XIOS/trunk/inputs/Version2/iodef.xml (modified) (4 diffs)

XIOS/trunk/inputs/Version2/iodef.xml

@@ -5 +5 @@
    <calendar type="Gregorian" start_date="2012-03-01 15:00:00" time_origin="2012-02-29 15:00:00" />
 
-
    <field_definition level="1" enabled=".FALSE." default_value="9.96921e+36">
-     <field id="field_AA"  operation="average" freq_op="3600s" domain_ref="domain_A"  axis_ref="axis_A" />
+     <field id="field_Domain_Axis"  operation="average" freq_op="3600s" domain_ref="domain_A"  axis_ref="axis_A" />
      <field id="field_A"  operation="average" freq_op="3600s" grid_ref="grid_A" />
      <field id="field_Axis"  operation="average" freq_op="3600s" grid_ref="grid_Axis" />
      <field id="field_Two_Axis"  operation="average" freq_op="3600s" grid_ref="grid_Two_Axis" />
+     <field id="field_All_Axis" operation="average" freq_op="3600s" grid_ref="grid_All_Axis" />
      <field id="field_Axis_transformed"  operation="average" freq_op="3600s" field_ref="field_A" grid_ref="grid_Axis_tranformed" />
-     <field id="field_All_Axis" operation="average" freq_op="3600s" grid_ref="grid_All_Axis" />
+     <field id="field_Axis_transformed_Interpolated"  operation="average" freq_op="3600s" field_ref="field_Axis" grid_ref="grid_Axis_tranformed_Interpolated" />
      <field id="field_Scalar" operation="average" freq_op="3600s" grid_ref="ScalarGrid" />
    </field_definition>
 
-
    <file_definition type="multiple_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE.">
      <file id="output" name="output">
-<!--        <field field_ref="field_A" />-->
+        <field field_ref="field_A" />
      </file>
      <file id="output_Axis" name="output_Axis" type="one_file">
-<!--        <field field_ref="field_Axis" />-->
+        <field field_ref="field_Axis" />
      </file>
-     <file id="output_Axis_transformed" name="output_Axis_transformed" type="one_file">
+     <file id="output_All_Axis" name="output_All_Axis" type="one_file">
+        <field field_ref="field_All_Axis" />
+     </file>
+     <file id="output_Axis_transformed" name="output_Axis_transformed">
         <field field_ref="field_Axis_transformed" />
      </file>
-     <file id="output_All_Axis" name="output_All_Axis" type="one_file">
-<!--        <field field_ref="field_All_Axis" />-->
+     <file id="output_Axis_transformed_interpolated" name="output_Axis_transformed_interpolated">
+        <field field_ref="field_Axis_transformed_Interpolated" />
      </file>
      <file id="output_Scalar" name="output_Scalar" type="one_file">
@@ -40 +42 @@
      <axis id="axis_C" />
      <axis id="axis_D" />
-     <axis id="axis_E" axis_ref="axis_C">
-<!--        <inverse_axis />-->
-
-        <zoom_axis zoom_begin="1" zoom_size="2" />
-<!--        <inverse_axis />-->
+     <axis id="axis_E" axis_ref="axis_A">
+       <inverse_axis />
      </axis>
-     <axis id="axis_F" axis_ref="axis_A">
-       <inverse_axis />
+     <axis id="axis_F" axis_ref="axis_B">
+        <inverse_axis />
+        <zoom_axis zoom_begin="0" zoom_size="4" />
+        <inverse_axis />
+     </axis>
+     <axis id="axis_G" axis_ref="axis_D">
+       <interpolate_axis type="polynomial" order="3"/>
+     </axis>
+     <axis id="axis_H" axis_ref="axis_C">
+<!--       <inverse_axis />-->
+       <zoom_axis zoom_begin="0" zoom_size="3" />
      </axis>
    </axis_definition>
@@ -63 +71 @@
        <grid id="grid_Axis">
          <axis axis_ref="axis_D" />
-
        </grid>
        <grid id="grid_Two_Axis">
@@ -69 +76 @@
          <axis axis_ref="axis_B" />
        </grid>
-       <grid id="grid_Axis_tranformed">
-         <domain domain_ref="domain_A" />
-            <axis axis_ref="axis_E" />
-<!--         <axis axis_ref="axis_F" />-->
-<!--         <axis axis_ref="axis_E" />-->
-       </grid>
        <grid id="grid_All_Axis">
          <axis axis_ref="axis_A" />
          <axis axis_ref="axis_B" />
          <axis axis_ref="axis_C" />
+       </grid>
+       <grid id="grid_Axis_tranformed">
+         <domain domain_ref="domain_A" />
+            <axis axis_ref="axis_H" />
+<!--         <axis axis_ref="axis_E" />-->
+<!--         <axis axis_ref="axis_F" />-->
+       </grid>
+       <grid id="grid_Axis_tranformed_Interpolated">
+         <axis axis_ref="axis_G" />
        </grid>
        <grid id="ScalarGrid">