Changeset 7746

Timestamp:

May 25, 2010, 2:54:14 PM (14 years ago)

Author:

hudson

Message:

Upgraded validation to ANUGA 1.2

File:

• anuga_validation/circular_island/run_circular.py (modified) (2 diffs)

anuga_validation/circular_island/run_circular.py

@@ -10 +10 @@
 from anuga.shallow_water import Domain
 from anuga.shallow_water import Reflective_boundary
-from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary
+from anuga.shallow_water import Transmissive_momentum_set_stage_boundary
 from anuga.shallow_water import Dirichlet_boundary, Time_boundary
-from anuga.shallow_water.data_manager import get_maximum_inundation_data, start_screen_catcher, copy_code_files
-from anuga.abstract_2d_finite_volumes.util import file_function, sww2csv_gauges,csv2timeseries_graphs
+from anuga.utilities.file_utils import copy_code_files
+from anuga.shallow_water.data_manager import get_maximum_inundation_data
+from anuga.abstract_2d_finite_volumes.util import file_function, \
+                            sww2csv_gauges, csv2timeseries_graphs
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.utilities.polygon import read_polygon
 from math import cos,pi,sin,tan
 import numpy as num
-from anuga.shallow_water.data_manager import csv2dict
+from anuga.shallow_water.data_manager import load_csv_as_dict as csv2dict
 from time import localtime, strftime, gmtime
 from anuga.utilities.system_tools import get_user_name, get_host_name
@@ -41 +43 @@
 #output_dir = anuga_dir+'outputs'+sep+'20080222_062917_res_0.0025_nbartzis'+sep
 copy_code_files(output_dir,__file__)
-
-start_screen_catcher(output_dir)
 
 def get_xy(x=0,y=0,r=1,angle=1):