Changeset 567 for XIOS/trunk/inputs/Version2

Timestamp:

03/10/15 10:49:02 (9 years ago)

Author:

mhnguyen

Message:

Implementing a grid formed by only one axis or group of axis

+) Add several new attributes to axis. From now on, each axis can be distributed on client side
+) Modify mask of grid to make it more flexible to different dimension
+) Fix some bugs relating to calculation of local data index on client
+) Clean some redundant codes

Test
+) On Curie, only test_new_features.f90
+) Test cases:

• Grid composed of: 1 domain and 1 axis, 3 axis, 1 axis
• Mode: Attached and connected
• No of client-server: 6-2(Connected), 2 (Attached)

+) All tests passed and results are correct

File:

• XIOS/trunk/inputs/Version2/iodef.xml (modified) (4 diffs)

XIOS/trunk/inputs/Version2/iodef.xml

@@ -6 +6 @@
 
 
-   <field_definition level="1" enabled=".FALSE.">
+   <field_definition level="1" enabled=".TRUE.">
 <!--     <field id="field_A"  operation="average" freq_op="3600s" domain_ref="domain_A"  axis_ref="axis_A" />-->
      <field id="field_A"  operation="average" freq_op="3600s" grid_ref="grid_A" />
+     <field id="field_Axis"  operation="average" freq_op="3600s" grid_ref="grid_Axis" />
+     <field id="field_All_Axis" operation="average" freq_op="3600s" grid_ref="grid_All_Axis" />
    </field_definition>
 
@@ -16 +18 @@
         <field field_ref="field_A" />
      </file>
+     <file id="output_Axis" name="output_Axis">
+        <field field_ref="field_Axis" />
+        <field field_ref="field_All_Axis" />
+     </file>
    </file_definition>
 
 
    <axis_definition>
-     <axis id="axis_A" zoom_size="2" zoom_end="2"/>
-     <axis id="axis_B" zoom_size="2" zoom_end="3" />
+     <axis id="axis_A" />
+     <axis id="axis_B" />
+     <axis id="axis_C" zoom_size="2" zoom_end="2" />
+     <axis id="axis_D" zoom_size="2" zoom_end="3"/>
    </axis_definition>
 
@@ -32 +40 @@
        <grid id="grid_A">
          <domain domain_ref="domain_A" />
+         <axis axis_ref="axis_C" />
+       </grid>
+       <grid id="grid_Axis">
+         <axis axis_ref="axis_D" />
+       </grid>
+       <grid id="grid_All_Axis">
          <axis axis_ref="axis_A" />
-       <!--       <axis axis_ref="axis_A" />-->
-<!--       <domain id="domain_A" />-->
-<!--       <axis axis_ref="axis_B" />-->
-      <!--       <axis id="axis_A" />-->
-<!--       <axis id="axis_B" />-->
+         <axis axis_ref="axis_B" />
+         <axis axis_ref="axis_C" />
        </grid>
      </grid_group>
@@ -57 +68 @@
         <variable_group id="buffer">
             <variable id="optimal_buffer_size" type="string">performance</variable>
-            <variable id="buffer_factor_size" type="double">1.0</variable>
+            <variable id="buffer_factor_size" type="double">10.0</variable>
          </variable_group>