Changeset 586 for XIOS/trunk/inputs

Timestamp:

04/01/15 17:53:02 (9 years ago)

Author:

mhnguyen

Message:

Fixing some bugs on writting non-distributed data

+) Implement scalar grid: Allow to send scalar real data
+) Modify the way to compute the mapping of buffer size from one client to a server
+) Fix a bug of writting axis on one_file mode
+) Make some changes in test_new_features.f90 and test_complete.f90

Test
+) On Curie,
+) test_client and test_complete pass and results are correct

Location:

XIOS/trunk/inputs

Files:

• COMPLETE/context_atmosphere.xml (modified) (1 diff)
• Version2/iodef.xml (modified) (4 diffs)

XIOS/trunk/inputs/COMPLETE/context_atmosphere.xml

@@ -17 +17 @@
 
   <axis_definition>
-    <axis id="axis_atm" zoom_size="2" zoom_end="3" />
+    <axis id="axis_atm" zoom_size="2" zoom_end="2" />
   </axis_definition>
 

XIOS/trunk/inputs/Version2/iodef.xml

@@ -6 +6 @@
 
 
-   <field_definition level="1" enabled=".TRUE.">
+   <field_definition level="1" enabled=".FALSE.">
      <field id="field_AA"  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 id="field_Scalar" operation="average" freq_op="3600s" grid_ref="ScalarGrid" />
    </field_definition>
 
@@ -16 +17 @@
    <file_definition type="multiple_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE.">
      <file id="output" name="output">
-        <field field_ref="field_A" />
+<!--        <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 id="output_Axis" name="output_Axis" type="one_file">
+        <field field_ref="field_Axis" />
+     </file>
+     <file id="output_All_Axis" name="output_All_Axis" type="one_file">
+<!--        <field field_ref="field_All_Axis" />-->
+     </file>
+     <file id="output_Scalar" name="output_Scalar" type="one_file">
+<!--        <field field_ref="field_Scalar" />-->
      </file>
    </file_definition>
@@ -50 +56 @@
          <axis axis_ref="axis_C" />
        </grid>
+       <grid id="ScalarGrid">
+       </grid>
      </grid_group>
    </grid_definition>
@@ -68 +76 @@
         <variable_group id="buffer">
             <variable id="optimal_buffer_size" type="string">performance</variable>
-            <variable id="buffer_factor_size" type="double">10.0</variable>
+            <variable id="buffer_factor_size" type="double">1.0</variable>
          </variable_group>