Changeset 6918 for anuga_validation

Timestamp:

Apr 28, 2009, 3:09:17 PM (16 years ago)

Author:

rwilson

Message:

Changes to cmpsww.py error reporting.

Location:

anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• cmpsww.py (modified) (17 diffs)
• validate.py (modified) (10 diffs)

anuga_validation/automated_validation_tests/patong_beach_validation/cmpsww.py

@@ -21 +21 @@
 #####
 
+# allowable 'slop' when testing two float values
+epsilon = 1.0e-9
+
 # Global attributes that should exist and be same in both files
 # Don't have to have all of these, and we don't care about others.
 expect_global_attributes = ['smoothing', 'vertices_are_stored_uniquely',
-                            'order', 'revision_number', 'starttime',
+                            'order', 'starttime',
                             'xllcorner', 'yllcorner',
                             'zone', 'false_easting', 'false_northing',
@@ -45 +48 @@
                       'volumes': ('number_of_volumes', 'number of vertices'),
                       'time': ('number_of_timesteps',),
-                      'stage': ('numbers_in_range',),
+                      'stage': ('number_of_timesteps', 'numbers_of_points',),
                       'stage_range': ('numbers_in_range',),
                       'xmomentum': ('number_of_timesteps', 'number_of_points'),
@@ -69 +72 @@
     # split out the filenames and check they exist
     (file1, file2) = files
+    filename1 = os.path.basename(file1)
+    filename2 = os.path.basename(file2)
+    width = max(len(filename1), len(filename2))
+    filename1 = filename1.rjust(width)
+    filename2 = filename2.rjust(width)
 
     error = False
@@ -76 +84 @@
         fid1 = NetCDFFile(file1, netcdf_mode_r)
     except:
-        error_msg += "File '%s' can't be opened?\n" % file1
+        error_msg += "\nFile '%s' can't be opened?\n" % file1
         error = True
 
@@ -82 +90 @@
         fid2 = NetCDFFile(file2, netcdf_mode_r)
     except:
-        error_msg += "File '%s' can't be opened?\n" % file2
+        error_msg += "\nFile '%s' can't be opened?\n" % file2
         error = True
         fid1.close()
@@ -88 +96 @@
     if error:
         raise RuntimeError, error_msg
+
+    if globals is None:
+        globals = expect_global_attributes
 
     #####
@@ -96 +107 @@
     for key in expected_dimensions:
         if key not in fid1.dimensions.keys():
-            error_msg += ("File %s doesn't contain dimension '%s'\n"
-                          % (file1, key))
+            error_msg += ("\nFile %s doesn't contain dimension '%s'\n"
+                          % (filename1, key))
             error = True
         if key not in fid2.dimensions.keys():
-            error_msg += ("File %s doesn't contain dimension '%s'\n"
-                          % (file2, key))
+            error_msg += ("\nFile %s doesn't contain dimension '%s'\n"
+                          % (filename2, key))
             error = True
 
@@ -109 +120 @@
         dim1_shape = fid1.dimensions.get(dim, None)
         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'
-                          % (file1, dim, str(dim1_shape),
-                             file2, str(dim2_shape)))
+        if dim1_shape != dim2_shape:
+            error_msg += ("\nFile %s has '%s' dimension of size %s,\n"
+                          "file %s has that dimension of size %s\n"
+                          % (filename1, dim, str(dim1_shape),
+                             filename2, str(dim2_shape)))
             error = True
 
@@ -120 +131 @@
         for glob in globals:
             if glob not in dir(fid1):
-                error_msg += ("Global attribute '%s' isn't in file %s\n"
-                              % (glob, file1))
+                error_msg += ("\nGlobal attribute '%s' isn't in file %s\n"
+                              % (glob, filename1))
                 error = True
             if glob not in dir(fid2):
-                error_msg += ("Global attribute '%s' isn't in file %s\n"
-                              % (glob, file2))
+                error_msg += ("\nGlobal attribute '%s' isn't in file %s\n"
+                              % (glob, filename2))
                 error = True
     else:
@@ -139 +150 @@
         # now check attribute lists are same
         if glob_vars1 != glob_vars2:
-            error_msg = ('Files differ in global attributes:\n'
+            error_msg = ('\nFiles differ in global attributes:\n'
                          '%s: %s,\n'
-                         '%s: %s\n' % (file1, str(glob_vars1),
-                                     file2, str(glob_vars2)))
-            error = True
-        globals = glob_vars1
+                         '%s: %s\n' % (filename1, str(glob_vars1),
+                                     filename2, str(glob_vars2)))
+            error = True
 
     # get variables to test
@@ -150 +160 @@
         for var in variables:
             if var not in fid1.variables.keys():
-                error_msg += ("Variable '%s' isn't in file %s\n"
-                              % (var, file1))
+                error_msg += ("\nVariable '%s' isn't in file %s\n"
+                              % (var, filename1))
                 error = True
             if var not in fid2.variables.keys():
-                error_msg += ("Variable '%s' isn't in file %s\n"
-                              % (var, file2))
+                error_msg += ("\nVariable '%s' isn't in file %s\n"
+                              % (var, filename2))
                 error = True
     else:
@@ -168 +178 @@
     
         if var_names1 != var_names2:
-            error_msg += ('Variables are not the same between files: '
-                          '%s variables= %s, '
+            error_msg += ('\nVariables are not the same between files:\n'
+                          '%s variables= %s,\n'
                           '%s variables = %s\n'
-                          % (file1, str(var_names1), file2, str(var_names2)))
+                          % (filename1, str(var_names1), filename2, str(var_names2)))
             error = True
         variables = var_names1
-
-    if error:
-        fid1.close()
-        fid2.close()
-        raise RuntimeError, error_msg
 
     # get size of time dimension
@@ -184 +189 @@
     num_timesteps2 = fid2.variables['time'].shape
     if num_timesteps1 != num_timesteps2:
-        error_msg += ('Files have different number of timesteps: %s=%d, %s=%d\n'
-                      % (file1, num_timesteps1, file2, num_timesteps2))
+        error_msg += ('Files have different number of timesteps:\n'
+                      '%s=%d,\n'
+                      '%s=%d\n'
+                      % (filename1, num_timesteps1, filename2, num_timesteps2))
         error = True
-
-    if error:
-        fid1.close()
-        fid2.close()
-        raise RuntimeError, error_msg
 
     num_timesteps = num_timesteps1[0]
@@ -205 +207 @@
                           '%s: %s,\n'
                           '%s: %s\n'
-                          % (var_name, file1, str(var1_shape),
-                             file2, str(var2_shape)))
-            error = True
-            continue
+                          % (var_name, filename1, str(var1_shape),
+                             filename2, str(var2_shape)))
+            error = True
 
     if error:
@@ -221 +222 @@
     # check values of global attributes
     for glob_name in globals:
-        g1 = getattr(fid1, glob_name)
-        g2 = getattr(fid2, glob_name)
-        if g1 != g2:
-            error_msg += ("Files differ in global '%s': "
-                          "%s: '%s', "
+        if getattr(fid1, glob_name) != getattr(fid2, glob_name):
+            error_msg += ("\nFiles differ in global '%s':\n"
+                          "%s: '%s',\n"
                           "%s: '%s'\n"
-                          % (glob_name, file1, str(g1), file2, str(g2)))
+                          % (glob_name, filename1, str(g1), filename2, str(g2)))
             error = True
 
@@ -235 +234 @@
         if (len(var_dims) > 1) and (var_dims[0] == 'number_of_timesteps'):
             # time series, check by timestep block
-            for i in xrange(num_timesteps):
-                var1 = num.array(fid1.variables[var_name][i,:])
-                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 t in xrange(num_timesteps):
+                var1 = num.array(fid1.variables[var_name][t,:])
+                var2 = num.array(fid2.variables[var_name][t,:])
+                if var1 != var2:
+                    for i in xrange(len(var1)):
+                        if var1[i] != var2[i]:
+                            error_msg += ('\nFiles differ in variable '
+                                          '%s[%d,%d]:\n'
+                                          '%s: %.14f\n'
+                                          '%s: %.14f\n'
+                                          % (var_name, t, i,
+                                             filename1, var1[i],
+                                             filename2, var2[i]))
+                            break
                     error = True
         else:
@@ -250 +254 @@
             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 += ('\nFiles differ in variable '
+                                      '%s[%d]:\n'
+                                      '%s: %.14f\n'
+                                      '%s: %.14f\n'
+                                       % (var_name, j,  
+                                          filename1, var1[j],
+                                          filename2, var2[j]))
+                        break
+                error = True
+
+    #####
+    # close files and signal OK or ERROR
     #####
 
     fid1.close()
     fid2.close()
+
+    if error:
+        raise RuntimeError, error_msg
 
     return

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -164 +164 @@
             (res, auth) = get_remote_from_mirrors(obj_digest, remote_digest, auth, mirrors)
             if res:
-                if not files_same(local_data_digest, remote_data_digest):
+                if not files_same(local_digest, remote_digest):
                     # digests differ, refresh object
                     shutil.move(remote_digest, local_digest)
@@ -270 +270 @@
 
     # modify project.py template
+    log.debug("Creating '%s' version of project.py" % vtype)
     fd = open('project.py.template', 'r')
     project = fd.readlines()
@@ -286 +287 @@
 
     # run the simulation, produce SWW file
+    log.debug('Running run_model.py')
     cmd = 'python run_model.py > %s' % RUNMODEL_STDOUT
     log.debug("run_simulation: doing '%s'" % cmd)
@@ -337 +339 @@
     res = os.system(cmd)
     log.debug("check_that_output_is_as_expected: res=%d" % res)
+    log.critical()
     if res == 0:
         log.info('Simulation results are as expected.')
@@ -344 +347 @@
         cmp_error = fd.readlines()
         fd.close()
-        log.critical('\n' + ''.join(cmp_error))
+        log.critical(''.join(cmp_error))
 
 
@@ -352 +355 @@
     log.debug('teardown: called')
     
-##    # clear all data objects from local data directory
-##    for data_object in Local_Data_Objects:
-##        obj_path = os.path.join(Local_Data_Directory, data_object)
-##        if os.path.isfile(obj_path):
-##            os.remove(obj_path)
-##        else:
-##            shutil.rmtree(obj_path, ignore_errors=True)
-
     # remove remote directory and stdout capture file
     shutil.rmtree(Remote_Data_Directory, ignore_errors=True)
@@ -375 +370 @@
 log.console_logging_level = log.INFO
 log.log_logging_level = log.DEBUG
+log_filename = log.log_filename
+
 setup()
 
@@ -380 +377 @@
 
 msg = '''
-This validation requires a working internet connection to refresh it's files.
+This validation requires a working internet connection to refresh its files.
 You may still run this validation without an internet connection if you have the
 required files.
@@ -422 +419 @@
 # now run what simulations we can and check output is as expected
 for odo in Optional_Data_Objects:
+    start_time = time.time()
     (_, vtype, _) = odo.rsplit('.', 2)
     vtype = vtype.lower()
+    log.critical('#' * 72)
     log.critical("Running Patong '%s' validation ..." % vtype)
     if run_simulation(vtype, odo):
@@ -430 +429 @@
         (expected_sww, _) = valid_sww.rsplit('.', 1)
         check_that_output_is_as_expected(expected_sww, valid_sww)
+    shutil.move(log_filename, '%s.%s' % (log_filename, vtype))
+    stop_time = time.time()
+    log.critical("'%s' validation took %.1fs" % (vtype, stop_time - start_time))
 
 # clean up