Changeset 7750

Timestamp:

May 25, 2010, 9:06:45 PM (15 years ago)

Author:

hudson

Message:

Updated validation suite to work with new API - confirmed that Patong passes.

Location:

anuga_validation/automated_validation_tests

Files:

• UQ_runup_2006/run_dam.py (modified) (2 diffs)
• patong_beach_validation/run_model.py (modified) (1 diff)
• patong_beach_validation/validate_patong_scenario.py (modified) (1 diff)
• urs_mux_files_validation/run_Bf.py (modified) (1 diff)

anuga_validation/automated_validation_tests/UQ_runup_2006/run_dam.py

@@ -22 +22 @@
 from anuga.fit_interpolate.interpolate import interpolate_sww2csv, \
      file_function
-from anuga.abstract_2d_finite_volumes.util import start_screen_catcher, \
-     copy_code_files
-from anuga.shallow_water.data_manager import csv2dict
+from anuga.utilities.file_utils import copy_code_files, load_csv_as_dict
 from numerical_tools import  err  
 
@@ -94 +92 @@
 
     # Load actual experimental results
-    actual,title_index_dic = csv2dict(project.actual_filename)
+    actual,title_index_dic = load_csv_as_dict(project.actual_filename)
     
     gauge_locations = [[0.4,0.2]]

anuga_validation/automated_validation_tests/patong_beach_validation/run_model.py

@@ -38 +38 @@
 from anuga.utilities.system_tools import file_length
 
-from anuga.shallow_water.data_manager import start_screen_catcher
-from anuga.shallow_water.data_manager import copy_code_files
+from anuga.utilities.file_utils import copy_code_files
 from anuga.shallow_water.data_manager import urs2sts
 from anuga.utilities.polygon import read_polygon, Polygon_function

anuga_validation/automated_validation_tests/patong_beach_validation/validate_patong_scenario.py

@@ -52 +52 @@
             raise Exception(msg)
             
-        if mem < 8000000:
+        if mem < 2000000:
             msg = 'Insufficient memory to run Patong beach validation. '
             msg += 'Got %i need at least 8GB. ' % mem

anuga_validation/automated_validation_tests/urs_mux_files_validation/run_Bf.py

@@ -22 +22 @@
 import numpy as num
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
-from anuga.abstract_2d_finite_volumes.util import start_screen_catcher, copy_code_files, sww2timeseries, get_data_from_file
+from anuga.utilities.file_utils import copy_code_files
+from anuga.abstract_2d_finite_volumes.util import sww2timeseries, get_data_from_file
 # Application specific imports