Changeset 1734 for XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo

Timestamp:

10/04/19 17:36:51 (5 years ago)

Author:

yushan

Message:

GENERIC_TESTCASE : check all .nc files by default. Generate Cmake files from python scripts (user_config.py, setup.py). Add scripts for copy to/from compressed reference stored in /gpfswork/rech/psl/rpsl954 (Jean-Zay and Irene).

Location:

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo

Files:

• checkfile.def (modified) (1 diff)
• context_atm.xml (modified) (3 diffs)
• iodef.xml (deleted)
• run_sub_test.sh (modified) (5 diffs)
• setup.py (modified) (2 diffs)

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo/checkfile.def

@@ -1 @@
-
+all
 atm_output_zoom.nc
 #atm_output_inverse.nc

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

@@ -35 +35 @@
     </axis>
 
+    <axis id="domain_Y_inverse" axis_ref="domain_Y">
+        <inverse_axis />
+    </axis>
+
   </axis_definition>
 
@@ -68 +72 @@
     <grid id="grid_Y">
       <axis axis_ref="domain_Y" />
+    </grid>
+
+    <grid id="grid_Y_inverse">
+      <axis axis_ref="domain_Y_inverse" />
     </grid>
 
@@ -391 +399 @@
      <file id="atm_output_zoom" output_freq="1ts" enabled="true">
        <field field_ref="field_XY" grid_ref="grid_XY_zoom_Y" operation="instant" enabled="true"/>
+       <!-- <field field_ref="field_Y" grid_ref="grid_Y_inverse" operation="instant" enabled="true"/> -->
      </file>
 

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo/run_sub_test.sh

@@ -11 +11 @@
 cp ../default_param.py default_param.py
 
-cp ../iodef.xml iodef.xml
 
 # Black        0;30     Dark Gray     1;30
@@ -23 +22 @@
 
 
-mv iodef.xml iodef.xml.bkp
 
 nb_proc=$(python sub_config.py 2>&1) 
@@ -29 +27 @@
 machine_name=jeanzay
 
-echo $nb_proc
+# echo $nb_proc
 if [[ ($machine_name == irene) ]]
 then
@@ -46 +44 @@
             echo "execution failed"
             rm -f iodef.xml
-            mv iodef.xml.bkp iodef.xml
             rm -f user_param.py
             rm -f default_param.py
             rm -f sub_config.py
+            rm -f sub_check.py
             exit 1234
     fi
@@ -57 +55 @@
 fi
 
-python sub_check.py
+check_output=$(python sub_check.py 2>&1 >/dev/null)
+if [[ "$check_output" -ne 0 ]]
+then
+    echo "check.py failed"
+    rm -f iodef.xml
+    rm -f user_param.py
+    rm -f default_param.py
+    rm -f sub_config.py
+    rm -f sub_check.py
+    exit 1
+else
+    echo "check.py OK"
+fi
+
 
 rm -f iodef.xml
-mv iodef.xml.bkp iodef.xml
 rm -f user_param.py
 rm -f default_param.py
 rm -f sub_config.py
+rm -f sub_check.py

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo/setup.py

@@ -121 +121 @@
         dirpath = os.getcwd()
         foldername = os.path.basename(os.getcwd())
-        print(foldername)
 
 
@@ -137 +136 @@
                 g.write("import os\n")
                 g.write("import sys\n")
+                g.write("import subprocess\n")
                 g.write("def main():\n")
                 g.write("       os.system(\'rm -f user_param.py\')\n")