Changeset 3514 for inundation-numpy-branch/fit_interpolate

Timestamp:

Aug 21, 2006, 4:10:14 PM (19 years ago)

Author:

duncan

Message:

Hi all,
I'm doing a change in the anuga structure, moving the code to

\anuga_core\source\anuga

After you have done an svn update, the PYTHONPATH has to be changed to;
PYTHONPATH = anuga_core/source/

This is part of changes required to make installation of anuga quicker and reducing the size of our sandpits.

If any imports are broken, try fixing them. With adding anuga. to them for example. If this seems to have really broken things, email/phone me.

Cheers
Duncan

Location:

inundation-numpy-branch/fit_interpolate

Files:

• benchmark_least_squares.py (modified) (1 diff)
• interpolate.py (modified) (3 diffs)
• test_interpolate.py (modified) (2 diffs)

inundation-numpy-branch/fit_interpolate/benchmark_least_squares.py

@@ -21 +21 @@
 from random import seed, random
 
-from pyvolution.least_squares import Interpolation
+from anuga.pyvolution.least_squares import Interpolation
 from pmesh.mesh import Mesh
 

inundation-numpy-branch/fit_interpolate/interpolate.py

@@ -23 +23 @@
      ArrayType, allclose, take, NewAxis
 
-from pyvolution.mesh import Mesh
-from utilities.sparse import Sparse, Sparse_CSR
-from utilities.cg_solve import conjugate_gradient, VectorShapeError
+from anuga.pyvolution.mesh import Mesh
+from anuga.utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
 from coordinate_transforms.geo_reference import Geo_reference
-from pyvolution.quad import build_quadtree
-from utilities.numerical_tools import ensure_numeric
-from utilities.polygon import inside_polygon
+from anuga.pyvolution.quad import build_quadtree
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.utilities.polygon import inside_polygon
 
 from search_functions import search_tree_of_vertices
@@ -394 +394 @@
 
 
-        from util import mean, ensure_numeric
+        from anuga.pyvolution.util import mean, ensure_numeric
         from config import time_format
         import types
@@ -526 +526 @@
         from math import pi, cos, sin, sqrt
         from Numeric import zeros, Float
-        from util import mean        
+        from anuga.pyvolution.util import mean        
 
         if self.spatial is True:

inundation-numpy-branch/fit_interpolate/test_interpolate.py

@@ -20 +20 @@
 from coordinate_transforms.geo_reference import Geo_reference
 from shallow_water import Domain, Transmissive_boundary #, mean
-from util import mean
-from data_manager import get_dataobject
+from anuga.pyvolution.util import mean
+from anuga.pyvolution.data_manager import get_dataobject
 
 def distance(x, y):
@@ -623 +623 @@
         #Check basic interpolation of one quantity using averaging
         #(no interpolation points or spatial info)
-        from util import mean        
+        from anuga.pyvolution.util import mean        
         I = Interpolation_interface(time, [mean(Q[0,:]),
                                           mean(Q[1,:]),