Changeset 624 for XIOS/trunk/inputs/iodef.xml

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

File:

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

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>