Changeset 2955

Timestamp:

May 24, 2006, 11:39:56 AM (19 years ago)

Author:

nick

Message:

update pt hedland
geospatial_data object updated
updated polygon.py to allow numeric arrays

Files:

• inundation/geospatial_data/geospatial_data.py (modified) (1 diff)
• inundation/geospatial_data/test_geospatial_data.py (modified) (1 diff)
• inundation/utilities/polygon.py (modified) (4 diffs)
• production/onslow_2006/export_results.py (modified) (1 diff)
• production/pt_hedland_2006/project.py (modified) (3 diffs)
• production/pt_hedland_2006/run_pt_hedland.py (modified) (4 diffs)

inundation/geospatial_data/geospatial_data.py

@@ -333 +333 @@
                 raise IOError, msg
             except IOError, e:
-                fd.close()    
+                fd.close()  
                 # Catch this to add an error message
                 msg = 'Could not open file or incorrect file format %s:%s' %(file_name, e)

inundation/geospatial_data/test_geospatial_data.py

@@ -514 +514 @@
 0.0 1.0 0.0 10.0\n\
 1.0 0.0 10.4 40.0\n\
-#geo\n\
+#geocrap\n\
 56\n\
-1.1\n\
-1.0\n")
-
+56.6\n\
+3\n"
+)
         file.close()
         try:

inundation/utilities/polygon.py

@@ -401 +401 @@
     return abs(poly_area/2)
 
-def plot_polygons(polygons,
-                  figname,
-                  verbose = False):
+def plot_polygons(polygons, figname, verbose=False):
     
     """ Take list of polygons and plot.
@@ -422 +420 @@
 
     assert type(polygons) == list,\
-               'polygon must be a list'
-
+               'input must be a list of polygons'
+               
     ion()
     hold(True)
@@ -431 +429 @@
     miny = 1e10
     maxy = 0.0
-    for i in range(len(polygons)):
-        x, y = poly_xy(polygons[i])  
+    
+    for polygon in polygons:
+        x, y = poly_xy(polygon)  
         if min(x) < minx: minx = min(x)
         if max(x) > maxx: maxx = max(x)
@@ -449 +448 @@
     return vec
 
-def poly_xy(poly):
+def poly_xy(polygon, verbose=False):
     """ this is used within plot_polygons so need to duplicate
         the first point so can have closed polygon in plot
     """
 
-    assert type(poly[0]) == list,\
-               'polygon must be a list of points'
-    
-    x = []
-    y = []
-    n = len(poly)
-    firstpt = poly[0]
-    for i in range(n):
-        thispt = poly[i]
-        x.append(thispt[0])
-        y.append(thispt[1])
-
-    x.append(firstpt[0])
-    y.append(firstpt[1])
+    if verbose: print 'Checking input to poly_xy'
+
+    try:
+        polygon = ensure_numeric(polygon, Float)
+    except NameError, e:
+        raise NameError, e
+    except:
+        msg = 'Polygon %s could not be converted to Numeric array' %(str(polygon))
+        raise msg
+
+    x = polygon[:,0]
+    y = polygon[:,1]
+    x = concatenate((x, [polygon[0,0]]), axis = 0)
+    y = concatenate((y, [polygon[0,1]]), axis = 0)
     
     return x, y
+    
+#    x = []
+#    y = []
+#    n = len(poly)
+#    firstpt = poly[0]
+#    for i in range(n):
+#        thispt = poly[i]
+#        x.append(thispt[0])
+#        y.append(thispt[1])
+
+#    x.append(firstpt[0])
+#    y.append(firstpt[1])
+    
+#    return x, y
 
 class Polygon_function:

production/onslow_2006/export_results.py

@@ -7 +7 @@
 from os import sep
 
-time_dir = "20060426_004517"
+time_dir = "20060426_004129"
 directory = project.outputdir
 name = directory + time_dir +sep + "source"

production/pt_hedland_2006/project.py

@@ -130 +130 @@
 d3 = [552686.0, 7871580.0]
 #d4 = [604415.81, 7733013.56]
-d4 = [630000.0, 7733013.56]
+d4 = [638000.0, 7733013.56]
 #d5 = [656561.15, 7732615.11]
-d5 = [657000.0, 7732615.11]
+d5 = [662000.0, 7732615.11]
 #d6 = [708940.32, 7750510.33]
-d6 = [682000.0, 7740510.33]
+d6 = [690000.0, 7740510.33]
 
 polyAll = [d0, d1, d2, d3, d4, d5, d6]
@@ -149 +149 @@
 #Are there other significant features?
 j0 = [670000, 7760000]
-j1 = [630000, 7745000]
+j1 = [633000, 7745000]
 j2 = [665000, 7743000]
 j3 = [690000, 7755000]
@@ -155 +155 @@
 poly_region = [j0, j1, j2, j3]
 
-coast_buffer_file = datadir+'buff_poly_pts_test.xya'
+coast_buffer_file = datadir+'pts2ascii_test.xya'
 G = Geospatial_data(file_name=coast_buffer_file,delimiter=' ')
-poly_coast = G.get_data_points()
+poly_coast = list(G.get_data_points())
 #print 'get_data_points()',G.get_data_points()
+#print 'get_',poly_region
 
 
+

production/pt_hedland_2006/run_pt_hedland.py

@@ -74 +74 @@
 
 #used to catch screen output to file
-sys.stdout = Screen_Catcher(screen_output_name)
-sys.stderr = Screen_Catcher(screen_error_name)
+#sys.stdout = Screen_Catcher(screen_output_name)
+#sys.stderr = Screen_Catcher(screen_error_name)
 
 
@@ -122 +122 @@
 interior_regions = [[project.poly_pt_hedland, pt_hedland_res],
                     [project.poly_coast, coast_res]]
+#                    [project.poly_region, region_res]]
 
 print 'number of interior regions', len(interior_regions)
@@ -137 +138 @@
         count += 1
 
-#figname = 'pt_hedland_polys'
-#plot_polygons([project.polyAll,project.poly_pt_hedland,project.poly_region],
-#              figname,
-#              verbose = True)
+figname = 'pt_hedland_polys'
+print'pt_hedland_polys'
+#plot_polygons([project.polyAll, project.poly_pt_hedland, project.poly_region],
+plot_polygons([project.poly_coast],
+              figname,
+              verbose = True)
 
 if count == 0:
@@ -148 +151 @@
     print 'check %s in production directory' %figname
     import sys; sys.exit()
-    
+
 print 'start create mesh from regions'
 from caching import cache