Changeset 6223

Timestamp:

Jan 21, 2009, 4:37:45 PM (16 years ago)

Author:

ole

Message:

Various cleanup

Location:

anuga_core/source/anuga

Files:

• fit_interpolate/interpolate.py (modified) (2 diffs)
• utilities/polygon.py (modified) (4 diffs)

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -794 +794 @@
 
         if verbose is True:
-            print 'Interpolation_function: thinning'
+            print 'Interpolation_function: thinning by %d' % time_thinning
 
             
@@ -915 +915 @@
                 self.precomputed_values[name] = num.zeros((p, m), num.Float)
 
+            if verbose is True:
+                print 'Build interpolator'
+
+                
             # Build interpolator
-            if verbose:
-                if triangles is not None and vertex_coordinates is not None:
+            if triangles is not None and vertex_coordinates is not None:
+                if verbose:                
                     msg = 'Building interpolation matrix from source mesh '
                     msg += '(%d vertices, %d triangles)' \
                            % (vertex_coordinates.shape[0],
                               triangles.shape[0])
-                elif triangles is None and vertex_coordinates is not None:
-                    msg = 'Building interpolation matrix from source points'
+                    print msg
                 
-                print msg
-
-            # FIXME(Ole): This one is no longer needed for STS files
-            interpol = Interpolate(vertex_coordinates,
-                                   triangles,
-                                   verbose=verbose)
+                # This one is no longer needed for STS files
+                interpol = Interpolate(vertex_coordinates,
+                                       triangles,
+                                       verbose=verbose)                
+                
+            elif triangles is None and vertex_coordinates is not None:
+                if verbose:
+                    msg = 'Interpolation from STS file'
+                    print msg
+
+
 
             if verbose:

anuga_core/source/anuga/utilities/polygon.py

@@ -661 +661 @@
     """
 
-    def __init__(self, regions, default=0.0, geo_reference=None):
+    def __init__(self,
+                 regions,
+                 default=0.0,
+                 geo_reference=None):
 
         try:
@@ -702 +705 @@
         for polygon, value in regions:
             P = geo_reference.change_points_geo_ref(polygon)
-            self.regions.append( (P, value) )
+            self.regions.append((P, value))
 
 
@@ -714 +717 @@
         assert len(y) == N
 
-        points = num.concatenate( (num.reshape(x, (N, 1)),
-                                   num.reshape(y, (N, 1))), axis=1 )
+        points = num.concatenate((num.reshape(x, (N, 1)),
+                                  num.reshape(y, (N, 1))), axis=1)
 
         if callable(self.default):
@@ -735 +738 @@
                     z[i] = value
 
+        if len(z) == 0:
+            msg = 'Warning: points provided to Polygon function did not fall within'
+            msg += 'its regions'
+            msg += 'x in [%.2f, %.2f], y in [%.2f, %.2f]' % (min(x), max(x),
+                                                             min(y), max(y))
+            print msg
+
+            
         return z