Changeset 2218

Timestamp:

09/06/21 16:38:42 (3 years ago)

Author:

jderouillat

Message:

Update trunk test suite with the same protocol that on COUPLING

Location:

XIOS/trunk/xios_test_suite

Files:

• COMPILE/compile_irene (modified) (1 diff)
• COMPILE/compile_jeanzay (modified) (1 diff)
• ENV/irene.env (modified) (1 diff)
• ENV/jeanzay.env (modified) (1 diff)
• TEST_SUITE/step1.py (modified) (1 diff)
• TEST_SUITE/step2.py (modified) (3 diffs)
• TEST_SUITE/test_domain_algo/context_atm.xml (modified) (2 diffs)

XIOS/trunk/xios_test_suite/COMPILE/compile_irene

@@ -1 +1 @@
 #!/bin/bash
 
-set -x 
+#set -x 
 
 export revision=$(svn info --show-item revision .. 2>&1)

XIOS/trunk/xios_test_suite/COMPILE/compile_jeanzay

@@ -1 +1 @@
 #!/bin/bash
-set -x 
+#set -x 
 export revision=$(svn info --show-item revision .. 2>&1)
 python config_compile.py

XIOS/trunk/xios_test_suite/ENV/irene.env

@@ -1 @@
-module load subversion
-module load cmake
-module load python3/3.7.5
+module load subversion    2>&1
+module load cmake         2>&1
+module load python3/3.7.5 2>&1
+module load cdo/1.9.5     2>&1
 
 CHMOD() { chmod --quiet ug+rwX,o+rX "$@" ;}

XIOS/trunk/xios_test_suite/ENV/jeanzay.env

@@ -1 @@
-module load subversion
-module load cmake
-module load python/3.7.5
-module load cdo
+module load subversion   2>&1
+module load cmake        2>&1
+module load python/3.7.5 2>&1
+module load cdo/1.9.8    2>&1
 
 CHMOD() { setfacl -m u::rwX,u:rpsl565:rwX,u:rpsl954:rwX,u:rgzi016:rwX,g::r-X,o::r-X,m::rwX "$@" ;}

XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py

@@ -197 +197 @@
                 config_name.append(mystr)
             #print(mystr)
+            if ( os.path.isdir( test_folder+"/CONFIG_"+mystr ) ) :
+                OSinfo("rm -rf "+test_folder+"/CONFIG_"+mystr)
             OSinfo("mkdir -p "+test_folder+"/CONFIG_"+mystr)
             OSinfo("cp build_"+arch+"_"+mode+"/bin/generic_testcase.exe "+test_folder+"/CONFIG_"+mystr)

XIOS/trunk/xios_test_suite/TEST_SUITE/step2.py

@@ -7 +7 @@
 import copy
 
+import netCDF4
+from netCDF4 import Dataset
+import numpy as np
 
 mode=os.getenv("mode")
@@ -18 +21 @@
 def OSinfo(runthis):
     red = lambda text: '\033[0;31m' + text + '\033[0m'
-    osstdout = subprocess.Popen(runthis, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
-    theInfo = osstdout.communicate()[0].strip()
-    if osstdout.returncode!=0:
+    osstdout = subprocess.Popen(runthis, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+    theInfo, theErr = osstdout.communicate()
+    if theErr:
         print(red(runthis+" FAILED"))
-        print(theInfo)
+        print(theErr)
         sys.exit()
 
@@ -72 +75 @@
                 for checkfile in checkfiles:
                     if os.path.exists(config+"/"+checkfile) and os.path.exists("reference/ref_"+config+"/"+checkfile):
-                        OSinfo("cdo -W diffn "+config+"/"+checkfile+" "+"reference/ref_"+config+"/"+checkfile+" | > diff.txt")
-                        if os.stat("diff.txt").st_size==0:
-                            report.write(folder_name+" "+folder_name+"@"+config_name+" "+folder_name+"@"+config_name+"@"+checkfile+" "+str(1)+"\n")
-                    elif os.path.exists(config+"/"+checkfile):
+                        #OSinfo("cdo -W diffn "+config+"/"+checkfile+" "+"reference/ref_"+config+"/"+checkfile+"  2>&1 |grep -v 'Found more than one time variable'|grep -v 'cdo diffn: Processed'|grep -v 'cdo    diffn: Processed'|grep -v 'Time variable >time_counter< not found!' > diff_"+checkfile+".txt")
+                        #if os.stat("diff_"+checkfile+".txt").st_size==0: # if no diff -> set 0
+                        #    report.write(folder_name+" "+folder_name+"@"+config_name+" "+folder_name+"@"+config_name+"@"+checkfile+" "+str(1)+"\n")
+                        #else: # if cdo diffn returns diff -> set -1
+                        #    report.write(folder_name+" "+folder_name+"@"+config_name+" "+folder_name+"@"+config_name+"@"+checkfile+" "+str(-1)+"\n")
+                        ref = Dataset( "reference/ref_"+config+"/"+checkfile )
+                        res = Dataset( config+"/"+checkfile )
+                        validated = 1
+                        for var in res.variables:
+                            if (not (var.startswith('lon_'))) and (not (var.startswith('lat_'))) and (not (var.startswith('time_'))) and (not (var.startswith('atm__'))):
+                                ref_interp = ref.variables[var]
+                                ref_array = ref_interp[:]
+                                res_interp = res.variables[var]
+                                res_array = res_interp[:]
+                                if (res_array.shape == ref_array.shape):
+                                    diff = np.zeros_like( ref_array )
+                                    np.divide(ref_array-res_array,ref_array,diff,where=(ref_array[:]>10**-15))
+                                    if ( np.max(np.abs(diff)) >  1*10**-9 ):
+                                        validated = -1
+                                    diff = np.zeros_like( ref_array )
+                                    np.divide(ref_array-res_array,res_array,diff,where=(ref_array[:]>10**-15))
+                                    if ( np.max(np.abs(diff)) >  1*10**-9 ):
+                                        validated = -1
+                                else:
+                                        validated = -1
+                        report.write(folder_name+" "+folder_name+"@"+config_name+" "+folder_name+"@"+config_name+"@"+checkfile+" "+str(validated)+"\n")
+
+                    elif os.path.exists(config+"/"+checkfile): # if no ref file -> set 0
                         report.write(folder_name+" "+folder_name+"@"+config_name+" "+folder_name+"@"+config_name+"@"+checkfile+" "+str(0)+"\n")
+                    elif os.path.exists("reference/ref_"+config+"/"+checkfile): # if no output file -> set -2
+                        report.write(folder_name+" "+folder_name+"@"+config_name+" "+folder_name+"@"+config_name+"@"+checkfile+" "+str(-2)+"\n")
+
                    
 

XIOS/trunk/xios_test_suite/TEST_SUITE/test_domain_algo/context_atm.xml

@@ -7 +7 @@
     <domain id="domain" />
     <domain id="other_domain" />
-    <domain id="square_domain" ni_glo="36" nj_glo="36" type="rectilinear"/>
+    <domain id="square_domain" ni_glo="34" nj_glo="38" type="rectilinear"/>
   </domain_definition>
 
@@ -73 +73 @@
       <domain domain_ref="square_domain">
       <generate_rectilinear_domain lon_start="-175"/>
-      <interpolate_domain />
+      <interpolate_domain order="1" />
       </domain> 
     </grid>