Changeset 6916

Timestamp:

Apr 28, 2009, 1:12:22 PM (15 years ago)

Author:

rwilson

Message:

Changed some reporting messages.

File:

• branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/cmpsww.py (modified) (5 diffs)

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/cmpsww.py

@@ -113 +113 @@
         dim2_shape = fid2.dimensions.get(dim, None)
         if dim1_shape and dim2_shape and dim1_shape != dim2_shape:
-            error_msg += ('File %s has %s dimension of size %s, '
-                          'file %s has that dimension of size %s\n'
+            error_msg += ("File %s has '%s' dimension of size %s,\n"
+                          "file %s has that dimension of size %s\n"
                           % (file1, dim, str(dim1_shape),
                              file2, str(dim2_shape)))
@@ -177 +177 @@
         variables = var_names1
 
-    if error:
-        fid1.close()
-        fid2.close()
-        raise RuntimeError, error_msg
+##    if error:
+##        fid1.close()
+##        fid2.close()
+##        raise RuntimeError, error_msg
 
     # get size of time dimension
@@ -190 +190 @@
         error = True
 
-    if error:
-        fid1.close()
-        fid2.close()
-        raise RuntimeError, error_msg
+##    if error:
+##        fid1.close()
+##        fid2.close()
+##        raise RuntimeError, error_msg
 
     num_timesteps = num_timesteps1[0]
@@ -241 +241 @@
                 var2 = num.array(fid2.variables[var_name][i,:])
                 if not num.allclose(var1, var2):
-                    error_msg += ('Files differ in variable %s data:\n'
-                                  '%s: %s\n'
-                                  '%s: %s\n'
-                                  % (glob_name, file1, str(var1),
-                                                file2, str(var1)))
+                    for j in xrange(len(var1)):
+                        if abs(var1[j] - var2[j]) > epsilon:
+                            error_msg += ('Files differ in variable %s[%d,%d]:\n'
+                                          '%s: %s\n'
+                                          '%s: %s\n'
+                                          % (glob_name, i, j,
+                                             file1, str(var1[j]),
+                                             file2, str(var1[j])))
+                            break
                     error = True
         else:
@@ -252 +256 @@
             var2 = num.array(fid2.variables[var_name][:])
             if not num.allclose(var1, var2):
-                error_msg += ('Files differ in variable %s:\n'
-                              '%s: %s,\n'
-                              '%s: %s\n'
-                              % (var_name, file1, str(var1),
-                                           file2, str(var2)))
-                error = True
-
-    if error:
-        fid1.close()
-        fid2.close()
-        raise RuntimeError, error_msg
-
-    #####
-    # All OK, close files and signal EQUAL
+                for j in xrange(len(var1)):
+                    if abs(var1[j] - var2[j]) > epsilon:
+                        error_msg += ('Files differ in variable %s[%d]:\n'
+                                      '%s: %s\n'
+                                      '%s: %s\n'
+                                       % (glob_name, j,
+                                          file1, str(var1[j]),
+                                          file2, str(var1[j])))
+                        break
+                error = True
+
+    #####
+    # close files and signal OK or EROR
     #####
 
     fid1.close()
     fid2.close()
+
+    if error:
+        raise RuntimeError, error_msg
 
     return