Changeset 1018 for XIOS/trunk/inputs

Timestamp:

01/10/17 13:52:53 (7 years ago)

Author:

mhnguyen

Message:

Improving missing-value processing
If detect_missing_value is activated, then all missing value will be converted to
NaN (Not-a-number) in input of data flow then they will be reconverted to missing value on output

+) Update SourceFilter?, TemporalFilter? and SpatialTransformFilter? with new processing
+) Update all transformations with new processing

Test
+) On Curie
+) Work

File:

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

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -6 +6 @@
    <field_definition level="1" >
     <field_group id="fields_src" operation="instant">
-       <field id="src_field_2D" domain_ref="src_domain"/>
+       <field id="src_field_2D" domain_ref="src_domain" />
        <field id="src_field_2D_clone" domain_ref="src_domain_clone"/>
-       <field id="src_field_3D" domain_ref="src_domain" axis_ref="src_axis"/>       
-       <field id="src_field_3D_pression" grid_ref="src_grid_3D"/>
-       <field id="src_field_4D" grid_ref="grid_4D"/>       
+       <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_pression" grid_ref="src_grid_3D"  />
+       <field id="src_field_4D" grid_ref="src_grid_4D" detect_missing_value=".TRUE." default_value="100000"/>       
     </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_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"/>
       <field id="dst_field_3D_interp" field_ref="src_field_3D" axis_ref="dst_axis"/>       
-      <field id="dst_field_4D_extract" field_ref="src_field_4D" grid_ref="grid_4D_extract"/>      
-      <field id="dst_field_2D_clone" field_ref="src_field_2D_clone" domain_ref="dst_domain"/>
+      <field id="dst_field_4D_extract" field_ref="src_field_4D" grid_ref="dst_grid_4D_extract"/> 
     </field_group>
     <field_group id="read_fields" operation="instant">
@@ -35 +37 @@
         <file id="output_2D" name="output_2D" >
           <field field_ref="src_field_2D" name="field_src" />
-          <field field_ref="src_field_2D" name="field_dst_regular_0"  domain_ref="dst_domain_regular_pole" default_value="10.e+5"/>
+          <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" />
           <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" />
           <field field_ref="dst_field_2D_clone" name="field_dst_regular_3" />
+          <field field_ref="dst_field_2D_extract" name="field_dst_regular_4" />
         </file> 
-       <file id="output_3D" name="output_3D" >
+       <file id="output_3D" name="output_3D" enabled=".TRUE." >
           <field field_ref="src_field_3D" name="field_src" />
           <field field_ref="src_field_3D_pression" name="field" />
@@ -46 +49 @@
           <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" >
+       <file id="output_4D" name="output_4D" enabled=".FALSE.">
           <field field_ref="src_field_4D" name="field_4D" />
           <field field_ref="dst_field_4D_extract" name="field_4D_extract" />
@@ -76 +79 @@
      </file_group>
    </file_definition>
+
+   <scalar_definition>
+    <scalar_group id="scalar_src">
+    </scalar_group>
+    <scalar_group id="scalar_dst">
+     <scalar id="scalar_extract">
+       <reduce_axis operation="sum"/>
+     </scalar>
+    </scalar_group>
+   </scalar_definition>
 
    <axis_definition>
@@ -109 +122 @@
     <domain_group id="domain_dst">
      <domain id="dst_domain">
-       <interpolate_domain write_weight="true" />
+       <interpolate_domain write_weight="false" />
      </domain>
      <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"/>       
-       <zoom_domain ibegin="0" ni="45" jbegin="0" nj="45" />
+       <!-- <zoom_domain ibegin="0" ni="45" jbegin="0" nj="45" /> -->
      </domain>
      <domain id="dst_domain_regular" ni_glo="90" nj_glo="45" type="rectilinear">
@@ -142 +155 @@
         <axis axis_ref="src_axis"/>
       </grid>
-      <grid id="grid_4D">
+      <grid id="src_grid_4D">
         <domain domain_ref="src_domain"/>
         <axis axis_ref="src_axis"/>
@@ -153 +166 @@
         <domain domain_ref="dst_domain_regular"/>
       </grid>
+      <grid id="dst_grid_2D_extract">
+        <domain domain_ref="dst_domain_regular"/>
+        <scalar >          
+          <reduce_axis operation="min"/>
+          <!-- <extract_axis position="2"/> -->
+        </scalar>
+      </grid>
       <grid id="dst_grid_3D">
         <domain domain_ref="src_domain"/>
         <axis axis_ref="dst_axis"/>
       </grid>
-      <grid id="grid_4D_extract">
+      <grid id="dst_grid_4D_extract">
         <domain domain_ref="dst_domain_regular_pole"/>      
         <axis axis_ref="src_axis"/>        
         <scalar >
-          <extract_axis position="1"/>
+          <!-- <extract_axis position="1"/> -->
+          <reduce_axis operation="sum"/>
         </scalar>      
       </grid>