Changeset 6912

Timestamp:

Apr 28, 2009, 11:53:56 AM (16 years ago)

Author:

rwilson

Message:

Changes to debugging level of many statements.

File:

• branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate.py (modified) (7 diffs)

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -270 +270 @@
 
     # modify project.py template
-    log.info('Creating %s version of project.py' % vtype)
+    log.debug("Creating '%s' version of project.py" % vtype)
     fd = open('project.py.template', 'r')
     project = fd.readlines()
@@ -287 +287 @@
 
     # run the simulation, produce SWW file
-    log.info('Running run_model.py')
+    log.debug('Running run_model.py')
     cmd = 'python run_model.py > %s' % RUNMODEL_STDOUT
     log.debug("run_simulation: doing '%s'" % cmd)
@@ -339 +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.')
@@ -346 +347 @@
         cmp_error = fd.readlines()
         fd.close()
-        log.critical('\n' + ''.join(cmp_error))
+        log.critical(''.join(cmp_error))
 
 
@@ -354 +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)
@@ -426 +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('#' * 50)
+    log.critical('#' * 72)
     log.critical("Running Patong '%s' validation ..." % vtype)
     if run_simulation(vtype, odo):
@@ -436 +430 @@
         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' % (stop_time - start_time))
 
 # clean up