Changeset 1700

Timestamp:

09/06/19 15:57:28 (5 years ago)

Author:

yushan

Message:

Generic_testcase : test_function update

Location:

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function

Files:

• Makefile (modified) (2 diffs)
• reference/config1 (added)
• reference/config1/result (added)
• reference/config1/result/atm_output_operation.nc (added)
• reference/config1/setup (added)
• reference/config1/setup/context_atm.xml (added)
• reference/config1/setup/context_grid_dynamico.xml (added)
• reference/config1/setup/dynamico_grid.nc (added)
• reference/config1/setup/iodef.xml (added)
• reference/config1/setup/param.def (added)
• reference/config2 (added)
• reference/config2/result (added)
• reference/config2/result/atm_output_operation.nc (added)
• reference/config2/setup (added)
• reference/config2/setup/context_atm.xml (added)
• reference/config2/setup/context_grid_dynamico.xml (added)
• reference/config2/setup/dynamico_grid.nc (added)
• reference/config2/setup/iodef.xml (added)
• reference/config2/setup/param.def (added)
• reference/result (deleted)
• reference/setup (deleted)
• validation.c (added)

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_function/Makefile

@@ -1 +1 @@
 $(RM) = rm -f
 
+all: config1 config2
 
-all: submit check
+config1:
+        make submit
+        make check1
+
+config2:
+        make submit
+        make check2
 
 submit: job.sh context_atm.xml iodef.xml ../../build_prod/bin/generic_testcase.exe
@@ -8 +15 @@
         @mpirun -np 12 ../../build_prod/bin/generic_testcase.exe
 
-reference: atm_output.nc atm_output_operation.nc
-        rm -f reference/result/*
-        rm -f reference/setup/*
-        cp atm_output_operation.nc reference/result
-        cp iodef.xml reference/setup
-        cp context_atm.xml reference/setup
-        cp param.def reference/setup
-        cp context_grid_dynamico.xml reference/setup
-        cp dynamico_grid.nc reference/setup
+
+reference1: atm_output_operation.nc
+        rm -f reference/config1/result/*
+        rm -f reference/config1/setup/*
+        cp atm_output_operation.nc reference/config1/result
+        cp iodef.xml reference/config1/setup
+        cp context_atm.xml reference/config1/setup
+        cp param.def reference/config1/setup
+        cp context_grid_dynamico.xml reference/config1/setup
+        cp dynamico_grid.nc reference/config1/setup
 
 
-check: 
-        cdo diffn atm_output_operation.nc reference/result/atm_output_operation.nc
+reference2: atm_output_operation.nc
+        rm -f reference/config2/result/*
+        rm -f reference/config2/setup/*
+        cp atm_output_operation.nc reference/config2/result
+        cp iodef.xml reference/config2/setup
+        cp context_atm.xml reference/config2/setup
+        cp param.def reference/config2/setup
+        cp context_grid_dynamico.xml reference/config2/setup
+        cp dynamico_grid.nc reference/config2/setup
+
+
+check1: 
+        cdo diffn atm_output_operation.nc reference/config1/result/atm_output_operation.nc | tail -1 > diff.txt
+        @gcc validation.c -o validate.exe
+        @./validate.exe
+
+check2: 
+        cdo diffn atm_output_operation.nc reference/config2/result/atm_output_operation.nc | tail -1 > diff.txt
+        @gcc validation.c -o validate.exe
+        @./validate.exe
+        
 
 clean:
         $(RM) atm_output*
+        $(RM) diff.txt
         $(RM) xios_*
         $(RM) Generic_testcase*
         $(RM) distribute_file_atm_server.dat
         $(RM) graph_data.json
+
+
+#cdo diffn atm_output_operation.nc reference/result/atm_output_operation.nc > diff.txt