Changeset 9548

Timestamp:

Jan 29, 2015, 6:03:10 PM (9 years ago)

Author:

steve

Message:

Resoving some more module names

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/file_function.py (modified) (1 diff)
• fit_interpolate/test/test_fit.py (modified) (6 diffs)
• shallow_water/forcing.py (modified) (3 diffs)
• shallow_water/test/test_data_manager.py (modified) (1 diff)

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

@@ -123 +123 @@
     if use_cache is True:
         try:
-            from caching import cache
+            from anuga.caching import cache
         except:
             msg = 'Caching was requested, but caching module'+\

trunk/anuga_core/source/anuga/fit_interpolate/test/test_fit.py

@@ -859 +859 @@
 
     def test_fit_to_mesh_file2domain(self):
-        from load_mesh.loadASCII import import_mesh_file, \
+        from anuga.load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
         import tempfile
@@ -917 +917 @@
 
     def test_fit_to_mesh_file3(self):
-        from load_mesh.loadASCII import import_mesh_file, \
+        from anuga.load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
         import tempfile
@@ -972 +972 @@
 
     def test_fit_to_mesh_fileII(self):
-        from load_mesh.loadASCII import import_mesh_file, \
+        from anuga.load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
         import tempfile
@@ -1026 +1026 @@
 
     def test_fit_to_mesh_file_errors(self):
-        from load_mesh.loadASCII import import_mesh_file, export_mesh_file
+        from anuga.load_mesh.loadASCII import import_mesh_file, export_mesh_file
         import tempfile
         import os
@@ -1067 +1067 @@
 
     def test_fit_to_mesh_file_errorsII(self):
-        from load_mesh.loadASCII import import_mesh_file, export_mesh_file
+        from anuga.load_mesh.loadASCII import import_mesh_file, export_mesh_file
         import tempfile
         import os
@@ -1100 +1100 @@
 
     def test_fit_to_mesh_file_errorsIII(self):
-        from load_mesh.loadASCII import import_mesh_file, export_mesh_file
+        from anuga.load_mesh.loadASCII import import_mesh_file, export_mesh_file
         import tempfile
         import os

trunk/anuga_core/source/anuga/shallow_water/forcing.py

@@ -9 +9 @@
 """
 
+from warnings import warn
+import numpy as num
+from copy import copy
 
 from anuga.abstract_2d_finite_volumes.neighbour_mesh import segment_midpoints
@@ -17 +20 @@
                                     polygon_area
 from anuga.geospatial_data.geospatial_data import ensure_geospatial
-
-from warnings import warn
-import numpy as num
 from anuga.file.netcdf import NetCDFFile
 from anuga.config import netcdf_mode_r, netcdf_mode_w, netcdf_mode_a
-from copy import copy
+
 
 def check_forcefield(f):
@@ -938 +938 @@
     """
 
-    from utilities.numerical_tools import gradient
+    from anuga.utilities.numerical_tools import gradient
     from anuga.config import rho_a, rho_w, eta_w
 

trunk/anuga_core/source/anuga/shallow_water/test/test_data_manager.py

@@ -563 +563 @@
         """
 
-        import time, os, config
+        import time, os
 
         self.domain.set_name('synctest')