Changeset 4184

Timestamp:

Jan 19, 2007, 4:26:57 PM (18 years ago)

Author:

duncan

Message:

small fixes

Location:

anuga_core/source/anuga

Files:

• coordinate_transforms/test_geo_reference.py (modified) (1 diff)
• fit_interpolate/fit.py (modified) (2 diffs)
• fit_interpolate/test_fit.py (modified) (2 diffs)

anuga_core/source/anuga/coordinate_transforms/test_geo_reference.py

@@ -8 +8 @@
 from geo_reference import *
 from Numeric import allclose,array
+
+# Ignore these warnings, since we still want to test .xya code.
+import warnings
+warnings.filterwarnings(action = 'ignore',
+                        message='.xya format is deprecated.  Please use .txt.',
+                        category=DeprecationWarning)
+
+warnings.filterwarnings(action = 'ignore',
+                        message='Text file format is moving to comma se',
+                        category=DeprecationWarning)
+
 
 class geo_referenceTestCase(unittest.TestCase):

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -261 +261 @@
         #      self.mesh.get_boundary_polygon()
 
-        # Why are these global?
-        self.inside_poly_indices, self.outside_poly_indices  = \
+        inside_poly_indices, outside_poly_indices  = \
                      in_and_outside_polygon(point_coordinates,
                                             self.mesh.get_boundary_polygon(),
@@ -270 +269 @@
 
         
-        n = len(self.inside_poly_indices)
+        n = len(inside_poly_indices)
         if verbose: print 'Building fitting matrix from %d points' %n        
         #Compute matrix elements for points inside the mesh
-        for k, i in enumerate(self.inside_poly_indices):
+        for k, i in enumerate(inside_poly_indices):
             #For each data_coordinate point
             if verbose and k%((n+10)/10)==0: print 'Doing %d of %d' %(k, n)

anuga_core/source/anuga/fit_interpolate/test_fit.py

@@ -254 +254 @@
 
 
-        fileName = tempfile.mktemp(".xya")
+        fileName = tempfile.mktemp(".txt")
         file = open(fileName,"w")
-        file.write(" elevation \n\
+        file.write(" x, y, elevation \n\
 -2.0, 2.0, 0.\n\
 -1.0, 1.0, 0.\n\
@@ -270 +270 @@
  3.0,  1.0 , 4.\n")
         file.close()
-
+        print "fileName",fileName 
         geo = Geospatial_data(fileName)
         fileName_pts = tempfile.mktemp(".pts")