Changeset 1203 for XIOS/dev/branch_yushan_merged/inputs

Timestamp:

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

Author:

yushan

Message:

prep to merge with trunk @1200

Location:

XIOS/dev/branch_yushan_merged/inputs

Files:

• REMAP/iodef.xml (modified) (2 diffs)
• Unstruct/iodef.xml (modified) (3 diffs)

XIOS/dev/branch_yushan_merged/inputs/REMAP/iodef.xml

@@ -36 +36 @@
       
       <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" enabled=".TRUE."/>
-          <field field_ref="dst_field_regular" name="field_regular" enabled=".TRUE."/>
-          <field field_ref="dst_field_regular_pole_0" name="field_regular_pole_0" enabled=".TRUE." />
-          <field field_ref="dst_field_regular_pole_1" name="field_regular_pole_1" enabled=".TRUE." />
-       </file>
-       <file id="output_dst_curvilinear" name="output_dst_curvilinear" enabled=".TRUE." >
+       <file id="output_regular_pole" name="output_dst_regular" enabled=".FALSE."  >
+          <field field_ref="tmp_field_0" name="field_regular_0" enabled=".FALSE."/>
+          <field field_ref="dst_field_regular" name="field_regular" enabled=".FALSE."/>
+          <field field_ref="dst_field_regular_pole_0" name="field_regular_pole_0" enabled=".FALSE." />
+          <field field_ref="dst_field_regular_pole_1" name="field_regular_pole_1" enabled=".FALSE." />
+       </file>
+       <file id="output_dst_curvilinear" name="output_dst_curvilinear" enabled=".FALSE." >
           <field field_ref="tmp_field_1" operation="instant"/>
        </file>
-       <file id="output_dst_unstructured" name="output_dst_unstructured" enabled=".TRUE." >
+       <file id="output_dst_unstructured" name="output_dst_unstructured" enabled=".FALSE." >
           <field field_ref="tmp_field_2" operation="instant"/>
        </file>
@@ -52 +52 @@
       <file_group id="write_files" >
         <file id="output_2D" name="output_2D" enabled=".TRUE.">
-          <field field_ref="src_field_2D" name="field_src" enabled=".TRUE."/>
-          <field field_ref="src_field_2D_clone" name="field_src_clone" default_value="100000" enabled=".TRUE."/>
-          <field field_ref="src_field_2D" name="field_dst_regular_0"  domain_ref="dst_domain_regular_pole" enabled=".TRUE."/>
+          <field field_ref="src_field_2D" name="field_src" enabled=".FALSE."/>
+          <field field_ref="src_field_2D_clone" name="field_src_clone" default_value="100000" enabled=".FALSE."/>
+          <field field_ref="src_field_2D" name="field_dst_regular_0"  domain_ref="dst_domain_regular_pole" enabled=".FALSE."/>
           <field field_ref="dst_field_2D" name="field_dst_regular_1" enabled=".TRUE." />
-          <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" enabled=".TRUE."/>
-          <field field_ref="dst_field_2D_clone" name="field_dst_regular_3" detect_missing_value=".false." default_value="100000" enabled=".TRUE."/>
-          <field field_ref="dst_field_2D_extract" name="field_dst_regular_4" enabled=".TRUE."/>
+          <field field_ref="dst_field_2D_regular_pole" name="field_dst_regular_2" enabled=".FALSE."/>
+          <field field_ref="dst_field_2D_clone" name="field_dst_regular_3" detect_missing_value=".false." default_value="100000" enabled=".FALSE."/>
+          <field field_ref="dst_field_2D_extract" name="field_dst_regular_4" enabled=".FALSE."/>
         </file> 
-       <file id="output_3D" name="output_3D" enabled=".TRUE.">
+       <file id="output_3D" name="output_3D" enabled=".FALSE.">
           <field field_ref="src_field_3D" name="field_src" />
           <field field_ref="src_field_3D_pression" name="field" />
           <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain" />
-          <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=".TRUE.">
+          <field field_ref="dst_field_3D_interp" name="field_dst_interp_domain_axis" domain_ref="dst_domain_regular_pole" enabled=".FALSE."/>  
+       </file>
+       <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" />
+          <field field_ref="dst_field_4D_extract" name="field_4D_extract" enabled=".FALSE."/>
         </file>
      </file_group>
-     <file_group id="read_files" >
+     <file_group id="read_files" enabled=".FALSE." >
        <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"/>

XIOS/dev/branch_yushan_merged/inputs/Unstruct/iodef.xml

@@ -15 +15 @@
 <!--        <field field_ref="field_A_expand" name="field"/> -->
         <field field_ref="field_A_srf" name="field_A"/>
-        <field field_ref="field_A_srf" name="field_rect" grid_ref="grid_rect"/>
-        <field field_ref="field_A_srf" name="field_rect2" grid_ref="grid_rect2"/>
+        <field field_ref="field_A_srf" name="field_rect" grid_ref="grid_rect" enabled=".FALSE." />
+        <field field_ref="field_A_srf" name="field_rect2" grid_ref="grid_rect2" enabled=".TRUE." />
+        <field field_ref="field_A_srf" name="field_rect3" grid_ref="grid_rect3" enabled=".TRUE."/>
       <!--  <field field_ref="field_A_srf" name="field_curv" grid_ref="grid_curv"/> -->
      </file>
@@ -44 +45 @@
      </domain>
 
-     <domain id="dst_domain_regular_pole2" ni_glo="90" nj_glo="90" type="rectilinear">
+     <domain id="dst_domain_regular_pole2" ni_glo="80" nj_glo="80" type="rectilinear">
        <generate_rectilinear_domain id="domain_regular_pole2"/>
        <interpolate_domain write_weight="false" order="1" renormalize="true"/>       
      </domain>
+
+     <domain id="dst_domain_regular_pole3" ni_glo="80" nj_glo="80" type="rectilinear">
+       <generate_rectilinear_domain id="domain_regular_pole3"/>
+       <interpolate_domain write_weight="false" order="1" renormalize="true"/>       
+       <zoom_domain ibegin="0" ni="65" jbegin="0" nj="65" /> 
+     </domain>
+
 
      <domain id="src_domain_curvilinear_read" type="curvilinear">
@@ -75 +83 @@
        <axis axis_ref="axis_srf" />
      </grid>
+
+     <grid id="grid_rect3">
+       <domain domain_ref="dst_domain_regular_pole3" />
+       <axis axis_ref="axis_srf" />
+     </grid>
+
 
      <grid id="grid_curv">