Changeset 6974

Timestamp:

May 5, 2009, 6:25:49 PM (16 years ago)

Author:

rwilson

Message:

Changes from validation testing.

Location:

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• cmpsww.py (modified) (7 diffs)
• validate.py (modified) (1 diff)

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/cmpsww.py

@@ -74 +74 @@
     filename1 = os.path.basename(file1)
     filename2 = os.path.basename(file2)
-    width = max(len(filename1), len(filename2))
-    filename1 = filename1.rjust(width)
-    filename2 = filename2.rjust(width)
+#    width = max(len(filename1), len(filename2))
+#    filename1 = filename1.rjust(width)
+#    filename2 = filename2.rjust(width)
 
     error = False
@@ -152 +152 @@
             error_msg = ('\nFiles differ in global attributes:\n'
                          '%s: %s,\n'
-                         '%s: %s\n' % (filename1, str(glob_vars1),
-                                     filename2, str(glob_vars2)))
+                         '%s: %s\n' 
+                         % (filename1, str(glob_vars1),
+                            filename2, str(glob_vars2)))
             error = True
 
@@ -179 +180 @@
         if var_names1 != var_names2:
             error_msg += ('\nVariables are not the same between files:\n'
-                          '%s variables= %s,\n'
-                          '%s variables = %s\n'
+                          '%s variables=%s,\n'
+                          '%s variables=%s\n'
                           % (filename1, str(var_names1), filename2, str(var_names2)))
             error = True
@@ -190 +191 @@
     if num_timesteps1 != num_timesteps2:
         error_msg += ('Files have different number of timesteps:\n'
-                      '%s=%d,\n'
-                      '%s=%d\n'
-                      % (filename1, num_timesteps1, filename2, num_timesteps2))
+                      '%s=%s,\n'
+                      '%s=%s\n'
+                      % (filename1, str(num_timesteps1),
+                         filename2, str(num_timesteps2)))
         error = True
 
@@ -208 +210 @@
                           '%s: %s\n'
                           % (var_name, filename1, str(var1_shape),
-                             filename2, str(var2_shape)))
+                                       filename2, str(var2_shape)))
             error = True
 
@@ -241 +243 @@
                         if var1[i] != var2[i]:
                             error_msg += ('\nFiles differ in variable '
-                                          '%s[%d,%d]:\n'
-                                          '%s: %.14f\n'
-                                          '%s: %.14f\n'
+                                              '%s[%d,%d]:\n'
+                                          '%s: %f\n'
+                                          '%s: %f\n'
+                                          'difference=%f\n'
                                           % (var_name, t, i,
                                              filename1, var1[i],
-                                             filename2, var2[i]))
+                                             filename2, var2[i],
+                                             var1[i]-var2[i]))
                             break
                     error = True
@@ -258 +262 @@
                         error_msg += ('\nFiles differ in variable '
                                       '%s[%d]:\n'
-                                      '%s: %.14f\n'
-                                      '%s: %.14f\n'
+                                      '%s: %f\n'
+                                      '%s: %f\n'
+                                      'difference=%f\n'
                                        % (var_name, j,  
                                           filename1, var1[j],
-                                          filename2, var2[j]))
+                                          filename2, var2[j],
+                                          var1[j]-var2[j]))
                         break
                 error = True

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -45 +45 @@
 # these names must be of the form <scene>.sww.<type>.tgz
 # as code below depends upon it.
-Optional_Data_Objects = ('patong.sww.TRIAL.tgz',
-                         'patong.sww.BASIC.tgz',
-                         'patong.sww.FINAL.tgz'
+Optional_Data_Objects = (#'patong.sww.TRIAL.tgz',
+                         #'patong.sww.BASIC.tgz',
+                         'patong.sww.FINAL.tgz',
                         )