Changeset 775 for XIOS/trunk/inputs

Timestamp:

11/02/15 11:46:25 (8 years ago)

Author:

mhnguyen

Message:

Implementing the reading of attributes of an axis from a file

+) 3d grid can be read directly from a file
+) Clean some redundant codes
+) Add new attribute declaration that allows to output only desired attributes

Test
+) On Curie
+) test_remap passes and result is correct

Location:

XIOS/trunk/inputs

Files:

• REMAP/iodef.xml (modified) (5 diffs)
• Version2/iodef.xml (modified) (1 diff)

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -8 +8 @@
    <field_definition level="1" >
      <field id="src_field" operation="instant" domain_ref="src_domain"/>
-     <field id="dst_field" operation="instant" field_ref="src_field" domain_ref="dst_domain"/>
-     <field id="tmp_field" operation="instant" domain_ref="src_domain_regular"/>
+<!--     <field id="dst_field" operation="instant" field_ref="src_field" domain_ref="dst_domain"/>-->
+     <field id="tmp_field" operation="instant" domain_ref="src_domain_regular_tmp"/>
+     <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" />
      <field id="dst_field_regular" operation="instant" field_ref="tmp_field" domain_ref="dst_domain_regular" read_access="true"/>
-     <field id="dst_field_regular_pole" operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole" read_access="true"/>
+<!--     <field id="dst_field_regular_pole" operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole" read_access="true"/>-->
    </field_definition>
 
@@ -17 +18 @@
    <file_definition type="one_file" par_access="collective" output_freq="1ts" output_level="10" enabled=".TRUE.">
      <file id="output" name="output">
-        <field field_ref="src_field" name="field" />
+<!--        <field field_ref="src_field" name="field" />-->
      </file>
      <file id="output_dst" name="output_dst" type="one_file">
-        <field field_ref="dst_field" name="field" />
+<!--        <field field_ref="dst_field" name="field" />-->
      </file>
      <file id="out_dst_regular_pole" name="out_dst_regular_pole" type="one_file">
-        <field field_ref="dst_field_regular_pole" name="field" />
+<!--        <field field_ref="dst_field_regular_pole" name="field" />-->
      </file>
      <file id="output_dst_regular" name="output_dst_regular" type="one_file">
         <field field_ref="dst_field_regular" name="field" />
      </file>
+     <file id="output_dst_curvilinear" name="output_dst_curvilinear" type="one_file">
+        <field field_ref="tmp_field_1" operation="instant"/>
+     </file>
+
      <file id="output_src_regular" name="output_src_regular" mode="read" type="multiple_file">
-        <field id="src_field_regular" name="field" domain_ref="src_domain_regular" operation="instant"/>
+<!--        <field id="src_field_regular" name="field" domain_ref="src_domain_regular" operation="instant"/>-->
      </file>
-     <file id="output_src_regular_tmp" name="output_src_regular_tmp">
-<!--        <field field_ref="tmp_field"/>-->
+     <file id="output_src_regular_tmp" name="output_src_regular_tmp" mode="read" type="one_file">
+        <field id="src_field_regular_tmp" name="field" domain_ref="src_domain_regular_tmp" operation="instant"/>
+     </file>
+
+     <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" type="one_file">
+<!--        <field id="src_field_curvilinear" name="field_A" domain_ref="src_domain_curvilinear" axis_ref="src_axis_curvilinear" operation="instant"/>-->
+        <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/>
      </file>
    </file_definition>
@@ -38 +48 @@
 
    <axis_definition>
+     <axis id="src_axis_curvilinear" />
    </axis_definition>
 
@@ -49 +60 @@
        <interpolate_domain/>
      </domain>
-     <domain id="dst_domain_regular" domain_src="src_domain_regular" ni_glo="90" nj_glo="45" type="rectilinear">
+<!--     <domain id="dst_domain_regular" domain_src="src_domain_regular" ni_glo="90" nj_glo="45" type="rectilinear">-->
+     <domain id="dst_domain_regular" domain_src="src_domain_regular_tmp" ni_glo="90" nj_glo="45" type="rectilinear">
        <generate_rectilinear_domain />
        <interpolate_domain/>
@@ -56 +68 @@
        <generate_rectilinear_domain lat_start="-90" lat_end="90" lon_start="2" lon_end="360" />
      </domain>
+     <domain id="src_domain_regular_tmp" type="rectilinear">
+       <generate_rectilinear_domain />
+     </domain>
+     <domain id="src_domain_curvilinear" type="rectilinear">
+       <generate_rectilinear_domain />
+     </domain>
    </domain_definition>
+
+  <grid_definition>
+    <grid id="src_grid_curvilinear">
+      <domain domain_ref="src_domain_curvilinear"/>
+      <axis axis_ref="src_axis_curvilinear" />
+    </grid>
+  </grid_definition>
   </context>
-
 
   <context id="xios">

XIOS/trunk/inputs/Version2/iodef.xml

@@ -33 +33 @@
 <!--        <field field_ref="field_Axis_transformed_Interpolated" />-->
      </file>
-     <file id="output_Domain_transformed_interpolated" name="output_Domain_transformed_interpolated">
-<!--        <field field_ref="field_Domain_transformed_Interpolated" />-->
+     <file id="output_Domain_transformed_interpolated" name="output_Domain_transformed_interpolated" type="one_file">
+        <field field_ref="field_Domain_transformed_Interpolated" />
      </file>
      <file id="output_Scalar" name="output_Scalar" type="one_file">