Changeset 1064 for XIOS/trunk/inputs/REMAP/iodef.xml

Timestamp:

03/02/17 10:42:39 (7 years ago)

Author:

mhnguyen

Message:

Auto-distribution of unstructured grid read from a file.

+ Unstructured grid read from a file is now distributed automatically among clients if there is
no distribution information provided.
+ Attributes of grid can be setup: From model (highest priority), from file (reading), or auto-generation (lowest priority).
If an attribute can be setup by several ways, it will be setup by one with the higher priority.

Test
+ On Curie
+ Tests pass

File:

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

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -5 +5 @@
    <calendar type="Gregorian" start_date="2012-03-01 15:00:00" time_origin="2012-02-28 15:00:00 + 1d" />
    <field_definition level="1" >
-    <field_group id="fields_src" operation="instant">
+    <field_group id="fields_src" operation="instant" default_value="100000">
        <field id="src_field_2D" domain_ref="src_domain" />
-       <field id="src_field_2D_clone" domain_ref="src_domain_clone"/>
+       <field id="src_field_2D_clone" domain_ref="src_domain_clone" detect_missing_value=".TRUE." />
        <field id="src_field_3D" domain_ref="src_domain" axis_ref="src_axis"  />
-       <field id="src_field_3D_clone" grid_ref="src_grid_3D" detect_missing_value=".TRUE." default_value="100000" />       
+       <field id="src_field_3D_clone" grid_ref="src_grid_3D" detect_missing_value=".TRUE."  />       
        <field id="src_field_3D_pression" grid_ref="src_grid_3D"  />
-       <field id="src_field_4D" grid_ref="src_grid_4D" detect_missing_value=".TRUE." default_value="100000"/>       
+       <field id="src_field_4D" grid_ref="src_grid_4D" detect_missing_value=".TRUE." />       
     </field_group>
     <field_group  id="fields_dst">
       <field id="dst_field_2D" field_ref="src_field_2D" domain_ref="dst_domain"/>
       <field id="dst_field_2D_regular_pole" field_ref="src_field_2D" domain_ref="dst_domain_regular_pole"/>
-      <field id="dst_field_2D_clone" field_ref="src_field_2D_clone" domain_ref="dst_domain"/>
+      <field id="dst_field_2D_clone" field_ref="src_field_2D_clone" domain_ref="dst_domain_regular_pole"  expr="@this" operation="average" detect_missing_value=".true."/>
       <field id="dst_field_2D_extract" field_ref="src_field_3D_clone" grid_ref="dst_grid_2D_extract"/>
       <field id="dst_field_3D" field_ref="src_field_3D" grid_ref="dst_grid_3D"/>
@@ -23 +23 @@
     </field_group>
     <field_group id="read_fields" operation="instant">
-<!--       <field id="tmp_field_0" domain_ref="src_domain_regular_read"/>
-      <field id="tmp_field_clone" field_ref="tmp_field_0"/>
+      <field id="tmp_field_0" domain_ref="src_domain_regular_read"/>      
       <field id="tmp_field_1" grid_ref="src_grid_curvilinear_read" />
       <field id="tmp_field_2" grid_ref="src_grid_unstructured_read" />
+      <field id="tmp_field_clone" field_ref="tmp_field_0"/>
       <field id="dst_field_regular" field_ref="tmp_field_2" grid_ref="dst_grid_regular"/>      
       <field id="dst_field_regular_pole_0" field_ref="tmp_field_0" domain_ref="dst_domain_regular_pole"/>
-      <field id="dst_field_regular_pole_1" field_ref="tmp_field_clone" domain_ref="dst_domain_regular_pole"/> -->
+      <field id="dst_field_regular_pole_1" field_ref="tmp_field_clone" domain_ref="dst_domain_regular_pole"/>
     </field_group> 
    </field_definition>
@@ -37 +37 @@
         <file id="output_2D" name="output_2D" >
           <field field_ref="src_field_2D" name="field_src" />
+          <field field_ref="src_field_2D_clone" name="field_src_clone" />
           <field field_ref="src_field_2D" name="field_dst_regular_0"  domain_ref="dst_domain_regular_pole" />
           <field field_ref="dst_field_2D" name="field_dst_regular_1" />
@@ -49 +50 @@
           <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain_axis" domain_ref="dst_domain_regular_pole"/>  
        </file>
-       <file id="output_4D" name="output_4D" enabled=".FALSE.">
+       <file id="output_4D" name="output_4D" enabled=".TRUE.">
           <field field_ref="src_field_4D" name="field_4D" />
           <field field_ref="dst_field_4D_extract" name="field_4D_extract" />
@@ -55 +56 @@
      </file_group>
      <file_group id="read_files" >
-<!--        <file id="output_src_regular" name="output_src_regular" mode="read" >
+       <file id="output_src_regular" name="output_src_regular" mode="read" >
           <field id="src_field_regular" name="field" grid_ref="src_grid_regular_read" operation="instant"/>
        </file>
@@ -63 +64 @@
        <file id="output_src_unstructured" name="output_src_unstructured" mode="read" >
           <field id="src_field_unstructured" name="field" grid_ref="src_grid_unstructured_read" operation="instant"/>
-       </file> -->
+       </file>
       </file_group>
-     <file_group id="read_then_write_files" enabled=".FALSE.">
-<!--        <file id="output_regular_pole" name="output_dst_regular" >
+     <file_group id="read_then_write_files" enabled=".TRUE.">
+       <file id="output_regular_pole" name="output_dst_regular" >
+          <field field_ref="tmp_field_0" name="field_regular_0" />
           <field field_ref="dst_field_regular" name="field_regular" />
           <field field_ref="dst_field_regular_pole_0" name="field_regular_pole_0" />
@@ -76 +78 @@
        <file id="output_dst_unstructured" name="output_dst_unstructured" >
           <field field_ref="tmp_field_2" operation="instant"/>
-       </file> -->
+       </file>
      </file_group>
    </file_definition>
@@ -94 +96 @@
       <axis id="src_axis" positive="down" />
       <axis id="nq" positive="down" />
-      <axis id="src_axis_curvilinear_read" />
+      <axis id="src_axis_curvilinear_read" positive="down" />
     </axis_group>
     <axis_group id="axis_dst">
@@ -113 +115 @@
       </domain>
       <domain id="src_domain_unstructured_read" type="unstructured">
+        <generate_rectilinear_domain/>
       </domain>
     </domain_group>
@@ -126 +129 @@
      <domain id="dst_domain_regular_pole" ni_glo="90" nj_glo="45" type="rectilinear">
        <generate_rectilinear_domain id="domain_regular_pole"/>
-       <interpolate_domain write_weight="false"/>       
+       <interpolate_domain write_weight="false" order="1" renormalize="true"/>       
        <!-- <zoom_domain ibegin="0" ni="45" jbegin="0" nj="45" /> -->
      </domain>