Changeset 624 for XIOS/trunk/inputs

Timestamp:

06/22/15 13:36:37 (9 years ago)

Author:

mhnguyen

Message:

Final tests of zoom and inverse on axis

+) Modify test_client and test_complete to work with new grid definition
+) Correct some bugs causing memory leak
+) Clean abundant code
+) Add more comments to new files

Test
+) On Curie
+) test_client and test_complete pass with correct results

Location:

XIOS/trunk/inputs

Files:

• COMPLETE/context_atmosphere.xml (modified) (2 diffs)
• Version2/iodef.xml (modified) (4 diffs)
• iodef.xml (modified) (4 diffs)

XIOS/trunk/inputs/COMPLETE/context_atmosphere.xml

@@ -4 +4 @@
 
   <field_definition level="1" enabled=".FALSE." default_value="9.96921e+36">
-    <field id="field_A_atm"  name="field_A_atm" operation="average" freq_op="1ts" domain_ref="domain_atm"  axis_ref="axis_atm" />
+    <field id="field_A_atm"  name="field_A_atm_origin" operation="average" freq_op="1ts" grid_ref="grid_A_atm" />
+    <field id="field_A_atm_zoom"  name="field_A_atm" operation="average" freq_op="1ts" field_ref="field_A_atm" grid_ref="grid_A_atm_zoom" />
   </field_definition>
 
   <file_definition type="multiple_file" par_access="collective" output_freq="6h" sync_freq="6h" output_level="10" enabled=".TRUE.">
     <file id="output_atmosphere" name="output_atmosphere">
-      <field field_ref="field_A_atm" />
+      <field field_ref="field_A_atm_zoom" />
     </file>
     <file id="output_atmosphere_zoom" name="output_atmosphere_zoom">
-      <field field_ref="field_A_atm" name="field_A_atm_zoom" domain_ref="domain_atm_zoom" />
+      <field field_ref="field_A_atm" name="field_A_atm_zoom" />
     </file>
   </file_definition>
 
   <axis_definition>
-    <axis id="axis_atm" zoom_size="2" zoom_end="2" />
+    <axis id="axis_atm"/>
+    <axis id="axis_atm_zoom" axis_ref="axis_atm">
+      <zoom_axis zoom_size="2" zoom_end="2" />
+    </axis>
   </axis_definition>
 
@@ -25 +29 @@
   </domain_definition>
 
-  <grid_definition />
+  <grid_definition>
+   <grid id="grid_A_atm">
+     <domain domain_ref="domain_atm" />
+     <axis axis_ref="axis_atm" />
+   </grid>
+   <grid id="grid_A_atm_zoom">
+     <domain domain_ref="domain_atm" />
+     <axis axis_ref="axis_atm_zoom" />
+   </grid>
+  </grid_definition>
+
 
 </context>

XIOS/trunk/inputs/Version2/iodef.xml

@@ -6 +6 @@
 
 
-   <field_definition level="1" enabled=".FALSE.">
+   <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_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_Axis_transformed"  operation="average" freq_op="3600s" field_ref="field_Two_Axis" grid_ref="grid_Axis_tranformed" />
+     <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_Scalar" operation="average" freq_op="3600s" grid_ref="ScalarGrid" />
@@ -35 +35 @@
    </file_definition>
 
-
    <axis_definition>
      <axis id="axis_A" />
@@ -41 +40 @@
      <axis id="axis_C" />
      <axis id="axis_D" />
-     <axis id="axis_E" axis_ref="axis_B">
-        <inverse_axis />
+     <axis id="axis_E" axis_ref="axis_C">
+<!--        <inverse_axis />-->
 
-        <zoom_axis zoom_begin="0" zoom_size="4" />
+        <zoom_axis zoom_begin="1" zoom_size="2" />
 <!--        <inverse_axis />-->
      </axis>
      <axis id="axis_F" axis_ref="axis_A">
-<!--       <inverse_axis />-->
+       <inverse_axis />
      </axis>
    </axis_definition>
@@ -71 +70 @@
        </grid>
        <grid id="grid_Axis_tranformed">
-<!--         <domain domain_ref="domain_A" />-->
-         <axis axis_ref="axis_F" />
-         <axis axis_ref="axis_E" />
+         <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">

XIOS/trunk/inputs/iodef.xml

@@ -7 +7 @@
 
    <field_definition level="1" enabled=".FALSE.">
-     <field id="field_A"  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_A_zoom"  operation="average" freq_op="3600s" field_ref="field_A" grid_ref="grid_A_zoom"/>
    </field_definition>
 
@@ -13 +14 @@
    <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_zoom" name="field_A" />
      </file>
    </file_definition>
@@ -19 +20 @@
 
    <axis_definition>
-     <axis id="axis_A" zoom_size="2" zoom_end="2" />
+     <axis id="axis_A"/>
+     <axis id="axis_A_zoom" axis_ref="axis_A">
+       <zoom_axis zoom_begin="1" zoom_size="2" />
+     </axis>
    </axis_definition>
 
@@ -26 +30 @@
    </domain_definition>
 
-   <grid_definition />
-
+   <grid_definition>
+     <grid id="grid_A">
+       <domain domain_ref="domain_A" />
+       <axis axis_ref="axis_A" />
+     </grid>
+     <grid id="grid_A_zoom">
+       <domain domain_ref="domain_A" />
+       <axis axis_ref="axis_A_zoom" />
+     </grid>
+   </grid_definition>
   </context>