Changeset 821 for XIOS/trunk/inputs

Timestamp:

02/10/16 14:35:03 (8 years ago)

Author:

mhnguyen

Message:

Making some improvements of transformation algorithm

+) Correct the way to enlisting transformations in an element (domain, axis)
+) Optimize generic transformation to make sure temporary grid to be created on demand
+) Update some mpi tag to prevent conflict
+) Correct some minor stuffs
+) Update documents

Test
+) On Curie
+) all test pass

Location:

XIOS/trunk/inputs

Files:

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

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -64 +64 @@
        <generate_rectilinear_domain id="domain_regular_pole"/>
        <interpolate_domain/>
-<!--       <zoom_domain id="zoom_0" ibegin="0" ni="180" jbegin="0" nj="90"/>-->
+       <zoom_domain id="zoom_0" ibegin="0" ni="90" jbegin="0" nj="90"/>
      </domain>
      <domain id="dst_domain_regular" ni_glo="90" nj_glo="45" type="rectilinear">

XIOS/trunk/inputs/Unstruct/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" enabled=".TRUE.">
+   <field_definition level="1" enabled=".TRUE." default_value="1000">
      <field id="field_A_srf"  operation="average" freq_op="3600s" grid_ref="grid_A"/>
    </field_definition>
 
-   <file_definition type="one_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE.">
+   <file_definition type="one_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE." >
      <file id="output" name="output">
-        <field field_ref="field_A_srf" name="field_A_srf" />
+        <field field_ref="field_A_srf" name="field_A_srf"/>
      </file>
    </file_definition>

XIOS/trunk/inputs/Version2/iodef.xml

@@ -22 +22 @@
      </file>
      <file id="output_Axis" name="output_Axis" type="one_file">
-<!--        <field field_ref="field_Axis" />-->
+        <field field_ref="field_Axis" />
+     </file>
+     <file id="output_Two_Axis" name="output_Two_Axis" type="one_file">
+        <field field_ref="field_Two_Axis" />
      </file>
      <file id="output_All_Axis" name="output_All_Axis" type="one_file">
-<!--        <field field_ref="field_All_Axis" />-->
+        <field field_ref="field_All_Axis" />
      </file>
      <file id="output_Axis_transformed" name="output_Axis_transformed" type="one_file">
-<!--        <field field_ref="field_Axis_transformed" />-->
+        <field field_ref="field_Axis_transformed" />
      </file>
      <file id="output_Axis_transformed_interpolated" name="output_Axis_transformed_interpolated">
-<!--        <field field_ref="field_Axis_transformed_Interpolated" />-->
+        <field field_ref="field_Axis_transformed_Interpolated" />
      </file>
      <file id="output_Domain_transformed_interpolated" name="output_Domain_transformed_interpolated" type="one_file">
@@ -46 +49 @@
      <axis id="axis_C" />
      <axis id="axis_D" />
-     <axis id="axis_E" axis_ref="axis_A">
-       <inverse_axis />
-     </axis>
-     <axis id="axis_F" axis_ref="axis_B">
-        <inverse_axis />
-        <zoom_axis zoom_begin="0" zoom_size="4" />
-        <inverse_axis />
-     </axis>
-     <axis id="axis_G" axis_ref="axis_D">
+     <axis id="axis_E">
        <interpolate_axis type="polynomial" order="3"/>
      </axis>
-     <axis id="axis_H" axis_ref="axis_C">
-<!--       <inverse_axis />-->
-<!--       <zoom_axis zoom_begin="0" zoom_size="1" />-->
+     <axis id="axis_F" axis_ref="axis_C">
+        <inverse_axis />
+        <zoom_axis begin="0" n="4" />
+        <inverse_axis />
      </axis>
    </axis_definition>
@@ -65 +61 @@
    <domain_definition>
      <domain id="domain_A" />
-     <domain id="domain_A_zoom" domain_ref="domain_A">
-<!--       <zoom_domain zoom_ibegin="1" zoom_ni="3" zoom_jbegin="0" zoom_nj="2"/>-->
-       <zoom_domain zoom_ibegin="1" zoom_ni="9" zoom_jbegin="0" zoom_nj="2"/>
-<!--       <zoom_domain zoom_ibegin="0" zoom_ni="2" zoom_jbegin="0" zoom_nj="2"/>-->
-     </domain>
-     <domain id="domain_A_transformed" domain_src="domain_A">
-<!--       <interpolate_from_file_domain file="" />-->
+     <domain id="domain_A_transformed">
        <generate_rectilinear_domain />
      </domain>
@@ -95 +85 @@
        </grid>
        <grid id="grid_Axis_tranformed">
-<!--         <domain domain_ref="domain_A" />-->
-         <domain domain_ref="domain_A_zoom" />
-         <axis axis_ref="axis_H" />
-<!--         <axis axis_ref="axis_E" />-->
-<!--         <axis axis_ref="axis_F" />-->
+         <domain domain_ref="domain_A" />
+         <axis axis_ref="axis_F" />
        </grid>
        <grid id="grid_Domain_tranformed_Interpolated">
          <domain domain_ref="domain_A_transformed" />
-         <axis axis_ref="axis_H" />
+         <axis axis_ref="axis_C" />
        </grid>
        <grid id="grid_Axis_tranformed_Interpolated">
-         <axis axis_ref="axis_G" />
+         <axis axis_ref="axis_E" />
        </grid>
        <grid id="ScalarGrid">