Changeset 3769

Timestamp:

Oct 13, 2006, 12:24:30 PM (18 years ago)

Author:

ole

Message:

Changed references to convert_points_from_latlon_to_utm to the new convert_from_latlan_to_utm as introduced in changeset:3739

Location:

anuga_work/production

Files:

• broome_2006/project.py (modified) (1 diff)
• hobart_2006/project.py (modified) (2 diffs)
• onslow_2006/make_gauges.py (modified) (2 diffs)
• onslow_2006/plot_data_extent.py (modified) (1 diff)
• onslow_2006/project.py (modified) (1 diff)
• sydney_2006/project.py (modified) (9 diffs)

anuga_work/production/broome_2006/project.py

@@ -6 +6 @@
 #from anuga.utilities.polygon import read_polygon
 import sys
-from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.pmesh.create_mesh import convert_from_latlon_to_utm
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 from time import localtime, strftime

anuga_work/production/hobart_2006/project.py

@@ -8 +8 @@
 from time import localtime, strftime, gmtime
 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area
-from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_points_from_latlon_to_utm
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.coordinate_transforms.redfearn import convert_from_latlon_to_utm
 
 if sys.platform == 'win32':
@@ -139 +140 @@
 d2 = [north, east]
 d3 = [north, west]
-polyAll2, zone = convert_points_from_latlon_to_utm([d0, d1, d2, d3])
+polyAll2, zone = convert_from_latlon_to_utm([d0, d1, d2, d3])
 refzone = zone
 

anuga_work/production/onslow_2006/make_gauges.py

@@ -7 +7 @@
 from anuga.utilities.polygon import poly_xy, is_inside_polygon
 from Numeric import arange
-from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.pmesh.create_mesh import convert_from_latlon_to_utm
 
 x_bound, y_bound = poly_xy(project.polyAll)
@@ -19 +19 @@
 p2 = [MOST_north, MOST_east]
 p3 = [MOST_north, MOST_west]
-MOSTpoly, zone = convert_points_from_latlon_to_utm([p0, p1, p2, p3])
+MOSTpoly, zone = convert_from_latlon_to_utm([p0, p1, p2, p3])
 
 MOSTymax = 0

anuga_work/production/onslow_2006/plot_data_extent.py

@@ -1 +1 @@
 from pylab import *
 from anuga.geospatial_data.geospatial_data import *
-from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.pmesh.create_mesh import convert_from_latlon_to_utm
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 from os import sep

anuga_work/production/onslow_2006/project.py

@@ -8 +8 @@
 import sys
 
-from anuga.coordinate_transforms.redfearn import convert_points_from_latlon_to_utm
+from anuga.coordinate_transforms.redfearn import convert_from_latlon_to_utm
 
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees

anuga_work/production/sydney_2006/project.py

@@ -8 +8 @@
 import sys
 
-from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.pmesh.create_mesh import convert_from_latlon_to_utm
                 
 
@@ -92 +92 @@
 p3 = [north, west]
     
-polygonall, zone = convert_points_from_latlon_to_utm([p0, p1, p2, p3])
+polygonall, zone = convert_from_latlon_to_utm([p0, p1, p2, p3])
 refzone = zone
 
@@ -122 +122 @@
 dp12 = [dsouth2, deast2]
 dp34 = [dnorth, deast2]
-diffpolygonall, zone = convert_points_from_latlon_to_utm([dp0, dp1, dp2, dp3, dp4, dp5, dp6, dp7])
+diffpolygonall, zone = convert_from_latlon_to_utm([dp0, dp1, dp2, dp3, dp4, dp5, dp6, dp7])
 # used for new tests 4 April 2006 (ensure slump contained in domain)
-diffpolygonall2, zone = convert_points_from_latlon_to_utm([dp0, dp1, dp12, dp34, dp4, dp5, dp6, dp7])
+diffpolygonall2, zone = convert_from_latlon_to_utm([dp0, dp1, dp12, dp34, dp4, dp5, dp6, dp7])
 
 # clipping used for look at increasingly finer resolution
@@ -389 +389 @@
 k142 = [harbour_15x, harbour_15y]
 
-harbour_polygon_2, zone = convert_points_from_latlon_to_utm([k02, k112, k122, k12, k22, k62, k72, k82, k102, k42, k52]) #worked
+harbour_polygon_2, zone = convert_from_latlon_to_utm([k02, k112, k122, k12, k22, k62, k72, k82, k102, k42, k52]) #worked
 assert zone == refzone
 
@@ -426 +426 @@
 j92 = [bb_10x, bb_10y]
 
-botanybay_polygon_2, zone = convert_points_from_latlon_to_utm([j92, j12, j22, j62, j82, j72, j42]) # worked
+botanybay_polygon_2, zone = convert_from_latlon_to_utm([j92, j12, j22, j62, j82, j72, j42]) # worked
 
 
@@ -450 +450 @@
 hp2 = [hnorth, heast]
 hp3 = [hnorth, hwest]
-polygon_h, zone = convert_points_from_latlon_to_utm([hp0, hp1, hp2, hp3])
+polygon_h, zone = convert_from_latlon_to_utm([hp0, hp1, hp2, hp3])
 
 #Interior regions - the Harbour - take 1
@@ -470 +470 @@
 k3 = [harbour_north, harbour_west]    
 
-harbour_polygon, zone = convert_points_from_latlon_to_utm([k0, k1, k2, k3])
+harbour_polygon, zone = convert_from_latlon_to_utm([k0, k1, k2, k3])
 
 # setting up problem area for doing just around Botany Bay
@@ -482 +482 @@
 bp2 = [bnorth, beast]
 bp3 = [bnorth, bwest]
-polygon_bb, zone = convert_points_from_latlon_to_utm([bp0, bp1, bp2, bp3])
+polygon_bb, zone = convert_from_latlon_to_utm([bp0, bp1, bp2, bp3])
 
 #Interior region - Botany Bay - take 1
@@ -495 +495 @@
 j3 = [botanybay_north, botanybay_west]    
 
-botanybay_polygon, zone = convert_points_from_latlon_to_utm([j0, j1, j2, j3])
+botanybay_polygon, zone = convert_from_latlon_to_utm([j0, j1, j2, j3])
 assert zone == refzone