Changeset 7640

Timestamp:

Feb 26, 2010, 3:06:27 PM (15 years ago)

Author:

ole

Message:

Started on timeseries comparison for Patong validation.

Location:

anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• compare_model_timeseries.py (added)
• project.py (modified) (1 diff)
• validate.py (modified) (2 diffs)

anuga_validation/automated_validation_tests/patong_beach_validation/project.py

@@ -189 +189 @@
 muxhome = home # FIXME (Ole): Get rid off
 
+    
 # check various directories/files that must exist
 anuga_folder = join(home, state, scenario_folder, 'anuga')

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -48 +48 @@
 # 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'
+#                        )
+Optional_Data_Objects = ('patong.sww.TRIAL.tgz',)
 
 # path to the local data directory
@@ -346 +347 @@
     # compare SWW files here and there
     new_output_sww = os.path.join(output_directory, expected_sww)
-    cmd = 'python cmpsww.py %s %s > cmpsww.stdout' % (local_sww, new_output_sww)
+    #cmd = 'python cmpsww.py %s %s > cmpsww.stdout' % (local_sww, new_output_sww)
+    cmd = 'python compare_model_timeseries.py %s %s > compare_model_timeseries.stdout' % (local_sww, new_output_sww)
     log.debug("check_that_output_is_as_expected: doing '%s'" % cmd)
     res = os.system(cmd)