Changeset 1729 for XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function

Timestamp:

10/03/19 16:28:14 (5 years ago)

Author:

yushan

Message:

GENERIC_TESTCASE : Each configuration is considered now as an independent test

Location:

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function

Files:

• CMakeLists.txt (modified) (1 diff)
• context_atm.xml (modified) (2 diffs)
• iodef.xml (modified) (1 diff)
• job_irene.sh (modified) (1 diff)
• job_jz.sh (added)
• run_sub_test.sh (added)
• setup.py (added)
• test_average (deleted)
• test_maximum (deleted)
• test_minimum (deleted)
• test_sum (deleted)

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function/CMakeLists.txt

@@ +1 @@
+##############################
+# file generated by setup.py #
+#      DO NOT modify         #
+##############################
+
 cmake_minimum_required(VERSION 2.8.12.2)
 
 project(generic_testcase)
 
+find_package(PythonInterp REQUIRED)
 
 enable_testing()
 
-add_subdirectory(test_average)
-add_subdirectory(test_maximum)
-add_subdirectory(test_minimum)
-add_subdirectory(test_sum)
+add_test( NAME test_function_config0
+          COMMAND ${PYTHON_EXECUTABLE}
+          ${CMAKE_CURRENT_BINARY_DIR}/run_test_0.py
+          test_function_config0)
 
-add_custom_target("subreport")
-add_custom_command(TARGET "subreport" 
-        POST_BUILD 
-        COMMAND rm -f subreport.txt
-        COMMAND rm -f subreport.html
-        COMMAND cat */report.txt > subreport.txt
-        COMMAND cat */report.html > subreport.html)
+add_test( NAME test_function_config1
+          COMMAND ${PYTHON_EXECUTABLE}
+          ${CMAKE_CURRENT_BINARY_DIR}/run_test_1.py
+          test_function_config1)
+
+add_test( NAME test_function_config2
+          COMMAND ${PYTHON_EXECUTABLE}
+          ${CMAKE_CURRENT_BINARY_DIR}/run_test_2.py
+          test_function_config2)
+
+add_test( NAME test_function_config3
+          COMMAND ${PYTHON_EXECUTABLE}
+          ${CMAKE_CURRENT_BINARY_DIR}/run_test_3.py
+          test_function_config3)
+

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function/context_atm.xml

@@ -364 +364 @@
   <file_definition  type="one_file" >
     
-    <file id="atm_output1" output_freq="1ts" type="one_file" enabled="true">
-       <field id="id_field2D" field_ref="field2D" enabled="true"/>
-       <field id="id_field3D" field_ref="field3D" enabled="true"/>
+
+     <file id="atm_output" output_freq="4ts" enabled="true" >
+       
+       <field field_ref="field2D" operation="average" enabled="true"/>
+       <field field_ref="field3D" operation="average" enabled="false"/>
+       <field field_ref="pressure" operation="average" enabled="false"/>
+       <field field_ref="field3D_recv" operation="average" enabled="false"/>
+       <field field_ref="field3D_resend" operation="average" enabled="false"/>
+       
+       <!-- <field field_ref="field_X" operation="average" enabled="true"/>
+       <field field_ref="field_Y" operation="average" enabled="true"/>
+       <field field_ref="field_Z" operation="average" enabled="true"/>
+       <field field_ref="field_XY" operation="average" enabled="true"/>
+       <field field_ref="field_XYZ" operation="average" enabled="true"/>
+       <field field_ref="field_XZ" operation="average" enabled="true"/>
+       <field field_ref="field_YZ" operation="average" enabled="true"/>
+       
+       <field field_ref="field_zoom_vert" operation="average" enabled="true"/>
+       <field field_ref="field_zoom_vert_sum" operation="average" enabled="true"/> -->
+       
     </file>
 
-     <file id="atm_output" output_freq="4ts" enabled="true">
-       <field id="field2D_ave" field_ref="field2D" operation="average" enabled="true"/>
-       <field id="field2D_max" field_ref="field2D" operation="maximum" enabled="true"/>
-       <field id="field2D_min" field_ref="field2D" operation="minimum" enabled="true"/>
-       <field id="field2D_sum" field_ref="field2D" operation="accumulate" enabled="true"/>
-
-       <field id="field3D_ave" field_ref="field3D" operation="average" enabled="true"/>
-       <field id="field3D_max" field_ref="field3D" operation="maximum" enabled="true"/>
-       <field id="field3D_min" field_ref="field3D" operation="minimum" enabled="true"/>
-       <field id="field3D_sum" field_ref="field3D" operation="accumulate" enabled="true"/>
+
+    <file id="atm_output_ensemble" output_freq="4ts" enabled="false">
+       <field field_ref="field2D_W" operation="average" />
+       <field field_ref="field3D_W" operation="average" />
+       <field field_ref="pressure_W" operation="average" />
+       <field field_ref="field3D_recv_W" operation="average" />
+       <field field_ref="field3D_resend_W" operation="average" />
+
+       <field field_ref="field_XW" operation="average" enabled="false" />
+       <field field_ref="field_YW" operation="average" enabled="false" />
+       <field field_ref="field_XYW" operation="average" enabled="false" />
+       <field field_ref="field_ZW" operation="average" enabled="false" />
+       <field field_ref="field_XYZW" operation="average" enabled="false" />
+       <field field_ref="field_XZW" operation="average" enabled="false" />
+       <field field_ref="field_YZW" operation="average" enabled="false" />
     </file>
 
@@ -393 +415 @@
        <field field_ref="other_field_YZ" enabled="false"/>
     </file>
-
-    <file id="atm_output_W" output_freq="1ts" enabled="false">
-       <field field_ref="field3D_W" enabled="true"/>
-       <field field_ref="field2D_W" enabled="true"/> 
-       <field field_ref="field_XW" enabled="true"/>
-       <field field_ref="field_YW" enabled="true"/>
-       <field field_ref="field_XYW" enabled="true"/>
-       <field field_ref="field_ZW" enabled="true"/>
-       <field field_ref="field_XYZW" enabled="true"/>
-       <field field_ref="field_XZW" enabled="true"/>
-       <field field_ref="field_YZW" enabled="true"/>
-    </file>
     
 

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function/iodef.xml

@@ -46 +46 @@
     <variable_definition>
       <variable_group id="buffer">
-        <variable id="min_buffer_size" type="int">10000000</variable>
-        <variable id="optimal_buffer_size" type="string">performance</variable>
-        <variable id="buffer_factor_size" type="double">0.8</variable> 
+  <variable id="min_buffer_size" type="int">10000000</variable>
+  <variable id="optimal_buffer_size" type="string">performance</variable>
+  <variable id="buffer_factor_size" type="double">0.8</variable> 
       </variable_group>
 
       <variable_group id="parameters" >
-        <variable id="using_server" type="bool">xios::usingSrv2</variable>
+        <variable id="using_server" type="bool">true</variable>
         <variable id="info_level" type="int">100</variable>
         <variable id="print_file" type="bool">true</variable>
-        <variable id="using_server2" type="bool">false</variable>
+        <variable id="using_server2" type="bool">xios::usingSrv2</variable>
         <variable id="ratio_server2" type="int">xios::ratioSrv2</variable>
         <variable id="number_pools_server2" type="int">xios::nbplSrv2</variable>

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function/job_irene.sh

@@ -48 +48 @@
 #ccc_mprun tau_exec -io ../../bin/test_send.exe
 #ddt -start -n 8 ../buile_intelmpi/bin/test_omp.exe
-
+python setup.py
 cmake .
 make test
-make subreport