Changeset 7796

Timestamp:

Jun 7, 2010, 10:22:46 AM (14 years ago)

Author:

hudson

Message:

ANUGA core modified to fix errors with new API modules not being found.

Location:

trunk/anuga_core/source/anuga

Files:

• __init__.py (modified) (3 diffs)
• abstract_2d_finite_volumes/test_region.py (modified) (4 diffs)
• damage_modelling/test_inundation_damage.py (modified) (1 diff)
• file/sww.py (modified) (1 diff)
• file_conversion/sww2dem.py (modified) (1 diff)
• fit_interpolate/test_interpolate.py (modified) (1 diff)

trunk/anuga_core/source/anuga/__init__.py

@@ -44 +44 @@
                                             pmesh_to_domain_instance
 
+
+from anuga.utilities.system_tools import file_length
+
+from anuga.utilities.file_utils import copy_code_files
+
+from anuga.geometry.polygon import read_polygon, Polygon_function
+from anuga.caching import cache
 
 #-----------------------------
@@ -83 +90 @@
 from anuga.file_conversion.file_conversion import sww2obj, dat2obj, \
                     timefile2netcdf, tsh2sww, urs2sww
-from anuga.file_conversion.urs2nc import urs2nc 
+from anuga.file_conversion.urs2nc import urs2nc  
+from anuga.file_conversion.urs2sts import urs2sts
 from anuga.file_conversion.dem2pts import dem2pts                    
 from anuga.file_conversion.esri2sww import esri2sww   
@@ -89 +97 @@
 from anuga.file_conversion.asc2dem import asc2dem     
 from anuga.file_conversion.ferret2sww import ferret2sww     
-from anuga.file_conversion.dem2dem import dem2dem 
+from anuga.file_conversion.dem2dem import dem2dem
+
 
 #-----------------------------

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_region.py

@@ -129 +129 @@
         """get values based on triangle lists."""
 
-        from mesh_factory import rectangular
-        from shallow_water import Domain
-
         #Create basic mesh
         points, vertices, boundary = rectangular(1, 3)
@@ -160 +157 @@
         get values based on triangle lists.
         """
-        from mesh_factory import rectangular
-        from shallow_water import Domain
 
         #Create basic mesh
@@ -190 +185 @@
         """Get values based on triangle lists."""
 
-        from mesh_factory import rectangular
-        from shallow_water import Domain
-
         #Create basic mesh
         points, vertices, boundary = rectangular(1, 3)
@@ -227 +219 @@
         get values based on triangle lists.
         """
-        from mesh_factory import rectangular
-        from shallow_water import Domain
 
         #Create basic mesh

trunk/anuga_core/source/anuga/damage_modelling/test_inundation_damage.py

@@ -16 +16 @@
 from anuga.file.sww import SWW_file
 from anuga.shallow_water.shallow_water_domain import Domain
+from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
+     import Transmissive_boundary
 
 import numpy as num

trunk/anuga_core/source/anuga/file/sww.py

@@ -1039 +1039 @@
     
     from Scientific.IO.NetCDF import NetCDFFile
-    from anuga.shallow_water_domain.shallow_water import Domain
+    from anuga.shallow_water.shallow_water_domain import Domain
 
     # initialise NaN.

trunk/anuga_core/source/anuga/file_conversion/sww2dem.py

@@ -473 +473 @@
                 basename_out = sww_file + '_' + quantity + '_' + extra_name_out
 
-            file_out = sww2dem(dir+sep+sww_file, dir+sep+basename_out,
+            file_out = sww2dem(dir+os.sep+sww_file, dir+os.sep+basename_out,
                                quantity,
                                reduction,

trunk/anuga_core/source/anuga/fit_interpolate/test_interpolate.py

@@ -1747 +1747 @@
         ######################
         # Boundary conditions
-        B = Transmissive_boundary(domain)
+        B = anuga.Transmissive_boundary(domain)
         domain.set_boundary( {'exterior': B})