Changeset 3085 for inundation/pyvolution

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/pyvolution

Files:

• domain.py (modified) (1 diff)
• least_squares.py (modified) (1 diff)
• neighbour_mesh.py (moved) (moved from inundation/pyvolution/mesh.py)
• quantity.py (modified) (1 diff)
• test_least_squares.py (modified) (7 diffs)
• test_mesh.py (modified) (6 diffs)

inundation/pyvolution/domain.py

@@ -8 +8 @@
 """
 
-from pyvolution.mesh import Mesh
+from pyvolution.neighbour_mesh import Mesh
 from pyvolution.generic_boundary_conditions import Boundary
 from pyvolution.generic_boundary_conditions import File_boundary

inundation/pyvolution/least_squares.py

@@ -25 +25 @@
 #from general_mesh import General_mesh
 from Numeric import zeros, array, Float, Int, transpose, concatenate, ArrayType, NewAxis
-from pyvolution.mesh import Mesh
+from pyvolution.neighbour_mesh import Mesh
 
 from Numeric import dot, zeros, take, compress, array, Float, Int, transpose, concatenate, ArrayType

inundation/pyvolution/quantity.py

@@ -20 +20 @@
     def __init__(self, domain, vertex_values=None):
 
-        from pyvolution.mesh import Mesh
+        from pyvolution.neighbour_mesh import Mesh
         from Numeric import array, zeros, Float
 

inundation/pyvolution/test_least_squares.py

@@ -8 +8 @@
 
 from pyvolution.least_squares import *
+from pyvolution.neighbour_mesh import Mesh
+
 from Numeric import allclose, array, transpose
 
@@ -819 +821 @@
 
     def test_fit_and_interpolation(self):
-        from mesh import Mesh
 
         a = [0.0, 0.0]
@@ -912 +913 @@
         using another set of points.
         """
-        from mesh import Mesh
-
 
         #Setup mesh used to represent fitted function
@@ -1003 +1002 @@
         """
         
-        from mesh import Mesh
-
-
         #Setup mesh used to represent discontinuous function
         a = [0.0, 0.0]
@@ -1288 +1284 @@
         coordinate system as defined by origin.
         """
-        from mesh import Mesh
 
         #Setup mesh used to represent fitted function
@@ -1824 +1819 @@
         using another set of points.
         """
-        from mesh import Mesh
-
 
         #Setup mesh used to represent fitted function
@@ -1869 +1862 @@
         Check that exceedance in fitted values are caught.
         """
-        from mesh import Mesh
-
 
         #Setup mesh used to represent fitted function

inundation/pyvolution/test_mesh.py

@@ -10 +10 @@
 from math import sqrt
 
-from mesh import *
+from neighbour_mesh import *
 from mesh_factory import rectangular
 from config import epsilon
@@ -710 +710 @@
     def test_boundary_polygon(self):
         from mesh_factory import rectangular
-        from mesh import Mesh
+        #from mesh import Mesh
         from Numeric import zeros, Float
 
@@ -730 +730 @@
 
     def test_boundary_polygon_II(self):
-        from mesh import Mesh
         from Numeric import zeros, Float
         
@@ -770 +769 @@
         """
 
-        from mesh import Mesh
         from Numeric import zeros, Float
 
@@ -811 +809 @@
         """
 
-        from mesh import Mesh
         from Numeric import zeros, Float
         from mesh_factory import rectangular        
@@ -855 +852 @@
         
         """
-        from mesh import Mesh
         from Numeric import zeros, Float