Changeset 1725 for XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_domain_algo

Timestamp:

09/26/19 17:13:09 (5 years ago)

Author:

yushan

Message:

Generic_testcase : Update for Jean-Zay

Location:

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_domain_algo

Files:

• checkfile.def (modified) (1 diff)
• context_atm.xml (modified) (1 diff)
• run_sub_test.sh (modified) (2 diffs)
• user_params.def (modified) (1 diff)

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

@@ -1 @@
-#atm_output_1.nc
 
 atm_output.nc
+
+atm_output_expand.nc
+
+
+atm_output_extract.nc
+
+atm_output_interpolate.nc
+
+atm_output_zoom.nc

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

@@ -388 +388 @@
     <file id="atm_output" output_freq="1ts" type="one_file" enabled="true">
        <!-- <field id="id_fieldXY" field_ref="field_XY" operation="once" enabled="true"/> -->
-       <field id="id_fieldX" field_ref="field_X" operation="once" enabled="true"/>
-    </file>
-
-     <file id="atm_output_zoom" output_freq="1ts" enabled="true">
-       <field id="fieldX_zoomX" field_ref="field_X" grid_ref="grid_X_zoom" operation="once" enabled="true"/>
-       <!-- <field id="fieldXY_zoomX" field_ref="field_XY" grid_ref="grid_XY_zoom_X" operation="once" enabled="true"/>
-       <field id="fieldXY_zoomY" field_ref="field_XY" grid_ref="grid_XY_zoom_Y" operation="once" enabled="true"/> -->
+       <field field_ref="field_X" operation="instant" enabled="true"/>
+    </file>
+
+    <file id="atm_output_expand" output_freq="1ts" enabled="true">
+       <field field_ref="field_X" operation="instant" enabled="true"/>
+    </file>
+
+    <file id="atm_output_extract" output_freq="1ts" enabled="true">
+       <field field_ref="field_X" operation="instant" enabled="true"/>
+    </file>
+
+    <file id="atm_output_interpolate" output_freq="1ts" enabled="true">
+       <field field_ref="field_X" operation="instant" enabled="true"/>
+    </file>
+
+    <file id="atm_output_zoom" output_freq="1ts" enabled="true">
+       <field field_ref="field_X" operation="instant" enabled="true"/>
     </file>
 

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

@@ -35 +35 @@
 touch report.html
 > report.html
-echo "<p> </p> " >> report.html
-echo "<p> </p> " >> report.html
+echo "<br> " >> report.html
+echo "<br> " >> report.html
+echo "<br> " >> report.html
 echo "<p>testing  <font color="blue">domain</font> algorithms...</p>" >> report.html 
-echo "<p> </p> " >> report.html
+echo "<br> " >> report.html
 
 nb_config=$(python sub_config1.py 2>&1)                                                                                                                    
@@ -54 +55 @@
 
 nb_proc=$(python sub_config2.py 2>&1) 
+nb_jz=$(($nb_proc-1))
 
-if [$machine_name == irene]
+if [[ ($machine_name == irene) ]]
 then
     ccc_mprun -n $nb_proc ../../build_prod/bin/generic_testcase.exe
+elif [[($machine_name == ada)]]
+then
+    echo "Testing on ADA"
+    mpirun -np $nb_proc ../../build_prod/bin/generic_testcase.exe
+elif [[($machine_name == jeanzay)]]
+then
+    echo "Testing on Jean-Zay" 
+    # touch srun.conf
+    # > srun.conf
+    # echo "0-"$nb_jz " ../../build_prod/bin/generic_testcase.exe">> srun.conf
+    # srun --mpi=pmi2 -K1 --multi-prog -m cyclic ./srun.conf 
+    srun -n $nb_proc --mpi=pmi2 ../../build_prod/bin/generic_testcase.exe
 else
-    mpirun -np $nb_proc ../../build_prod/bin/generic_testcase.exe
+    echo "other machine"
 fi
 

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_domain_algo/user_params.def

@@ -12 +12 @@
 
 NumberServers = 2, 4
-UsingServer2 = 'false', 'true'
+UsingServer2 = 'true', 'false'
 ATMdomain = 'lmdz'