Changeset 1202 for XIOS/dev/dev_olga/inputs

Timestamp:

07/10/17 15:16:17 (7 years ago)

Author:

mhnguyen

Message:

Porting non-continuous axis zoom to dev branch

+) Port axis zoom
+) Resolve some merge conflicts
+) Revert some codes

Test
+) On Curie
+) Ok

File:

• XIOS/dev/dev_olga/inputs/iodef.xml (modified) (2 diffs)

XIOS/dev/dev_olga/inputs/iodef.xml

@@ -11 +11 @@
      <field id="field_Domain"  operation="average" freq_op="3600s" domain_ref="domain_A"/>
      <field id="field_A_zoom"  operation="average" freq_op="3600s" field_ref="field_A" grid_ref="grid_A_zoom"/>
+     <field id="field_Scalar"  operation="average" freq_op="3600s" grid_ref="grid_Scalar"/>
    </field_definition>
 
 
-   <file_definition type="one_file" par_access="collective" output_freq="1h" output_level="10" enabled=".TRUE.">
-     <file id="output" name="output">
+   <file_definition type="one_file" par_access="collective" output_freq="1h" output_level="10" enabled=".FALSE.">
+      <file id="output" name="output" enabled=".TRUE.">
         <!-- <field field_ref="field_Domain" name="field_A" /> -->
         <field field_ref="field_A" name="field_A" /> 
-        <field field_ref="field_A" name="field_B" />
+        <field field_ref="field_A_zoom" name="field_B" />
      </file>
-     <file id="output1" name="output1">
+     <file id="output1" name="output1" enabled=".TRUE.">
         <!-- <field field_ref="field_Domain" name="field_A" /> -->
         <field field_ref="field_A" name="field_A" />        
+     </file> 
+     <file id="output2" name="output2" enabled=".TRUE.">
+        <!-- <field field_ref="field_Domain" name="field_A" /> -->
+        <field field_ref="field_Scalar" name="field_A" />        
      </file>
+ <!--     <file id="output_s" name="output_s" mode="read" >
+       <field id="field" name="field_A" grid_ref="grid_Scalar" operation="instant" />
+     </file> -->
    </file_definition>
 
+  <scalar_defintion>
+    <scalar id="scalar_A"/>
+  </scalar_defintion>
 
    <axis_definition>
      <axis id="axis_A"/>
      <axis id="axis_A_zoom" axis_ref="axis_A">
-       <zoom_axis begin="0" n="1" />
+       <zoom_axis index="(0,1)[0 2]" />
      </axis>
    </axis_definition>
@@ -47 +58 @@
        <domain domain_ref="domain_A" />
        <axis axis_ref="axis_A_zoom" />
+     </grid>
+     <grid id="grid_Scalar">
+      <scalar id="scalar_A"/>
      </grid>
    </grid_definition>