Changeset 3085 for inundation/fit_interpolate

Timestamp:

Jun 5, 2006, 5:03:48 PM (19 years ago)

Author:

ole

Message:

Moved pyvolution.mesh.py to pyvolution.test_mesh.py in order to avoid confusion with pmesh.

Location:

inundation/fit_interpolate

Files:

• general_fit_interpolate.py (modified) (1 diff)
• interpolate.py (modified) (1 diff)
• test_fit.py (modified) (3 diffs)

inundation/fit_interpolate/general_fit_interpolate.py

@@ -25 +25 @@
 
 from caching.caching import cache
-from pyvolution.mesh import Mesh
+from pyvolution.neighbour_mesh import Mesh
 from utilities.sparse import Sparse, Sparse_CSR
 from utilities.cg_solve import conjugate_gradient, VectorShapeError

inundation/fit_interpolate/interpolate.py

@@ -25 +25 @@
 
 from caching.caching import cache
-from pyvolution.mesh import Mesh
+from pyvolution.neighbour_mesh import Mesh
 from utilities.sparse import Sparse, Sparse_CSR
 from utilities.cg_solve import conjugate_gradient, VectorShapeError

inundation/fit_interpolate/test_fit.py

@@ -10 +10 @@
 
 from fit import *
+from pyvolution.neighbour_mesh import Mesh
 from utilities.sparse import Sparse, Sparse_CSR
 from coordinate_transforms.geo_reference import Geo_reference
@@ -199 +200 @@
 
     def test_fit_and_interpolation(self):
-        from mesh import Mesh
 
         a = [0.0, 0.0]
@@ -366 +366 @@
         coordinate system as defined by origin.
         """
-        from mesh import Mesh
 
         #Setup mesh used to represent fitted function