Changeset 624 for XIOS/trunk/inputs/COMPLETE/context_atmosphere.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/COMPLETE/context_atmosphere.xml (modified) (2 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>