Changeset 2216

Timestamp:

09/06/21 12:11:21 (3 years ago)

Author:

jderouillat

Message:

Add a check of array shape before checking differences in COUPLING test suite

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/step2.py (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/step2.py

@@ -99 +99 @@
                                 res_interp = res.variables[var]
                                 res_array = res_interp[:]
-                                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**-3 ):
-                                    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**-3 ):
-                                    validated = -1
+                                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")