Changeset 2351

Timestamp:

Feb 7, 2006, 5:14:55 PM (19 years ago)

Author:

ole

Message:

Minor bug fix

Location:

inundation

Files:

• pmesh/create_mesh.py (modified) (5 diffs)
• utilities/polygon.py (modified) (3 diffs)

inundation/pmesh/create_mesh.py

@@ -2 +2 @@
 """
 
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Assume that the root AnuGA dir (inundation) is included in your pythonpath
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#FIXME (DSG): move the coordinate transforms package to the root AnuGA dir 
-#from coordinate_transforms.geo_reference import Geo_reference
 from coordinate_transforms.redfearn import redfearn
-
 
 def convert_points_from_latlon_to_utm(polygon, refzone=None):
@@ -25 +20 @@
 
     return points, zone    
-
 
 
@@ -102 +96 @@
     """
 
-    #from pmesh.mesh import Mesh
     from mesh import Mesh
     from coordinate_transforms.redfearn import redfearn
-    from pyvolution.util import populate_polygon
+    from utilities.polygon import populate_polygon
     
-
-    #Make georef
-    #FIXME: Pass in geo or create automatically somehow
-    #import project
-    #refzone = project.refzone  #FIXME
-    #mesh_origin = project.mesh_origin
-    #geo = Geo_reference(xllcorner = mesh_origin[1],  #From dem
-    #                    yllcorner = mesh_origin[2],
-    #                    zone = refzone)
-
-
-   
-    #print "***********************"
-    #print "geo ref", geo
-    #print "***********************"
-    
-    #m = Mesh(geo_reference=geo)
     m = Mesh()
-
 
 
@@ -141 +116 @@
         excluded_polygons = []        
         for P, res in interior_regions:
-            polygon = convert_points_from_latlon_to_utm(P, refzone)            
+            polygon, _ = convert_points_from_latlon_to_utm(P, refzone)            
             excluded_polygons.append( polygon )
     else:
@@ -158 +133 @@
     if interior_regions is not None:    
         for P, res in interior_regions:
-            polygon = convert_points_from_latlon_to_utm(P, refzone)                        
+            polygon, _ = convert_points_from_latlon_to_utm(P, refzone)                        
             region_dict = create_region(polygon, None, refzone)
 

inundation/utilities/polygon.py

@@ -58 +58 @@
         polygon = ensure_numeric(polygon, Float)
     except:
-        msg = 'Polygon could not be converted to Numeric array'
+        msg = 'Polygon %s could not be converted to Numeric array' %(str(polygon))
         raise msg
 
@@ -70 +70 @@
 
     indices, count = separate_points_by_polygon(points, polygon,
-                                                closed, verbose)
+                                                closed=closed,
+                                                verbose=verbose)
 
     if one_point:
@@ -111 +112 @@
 
     indices, count = separate_points_by_polygon(points, polygon,
-                                                closed, verbose)
+                                                closed=closed,
+                                                verbose=verbose)
 
     if one_point: