Changeset 3616

Timestamp:

Sep 18, 2006, 5:37:19 PM (18 years ago)

Author:

ole

Message:

Got Karratha running again.

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py (modified) (2 diffs)
• anuga_core/source/anuga/coordinate_transforms/redfearn.py (modified) (2 diffs)
• anuga_core/source/anuga/coordinate_transforms/test_redfearn.py (modified) (3 diffs)
• anuga_core/source/anuga/pmesh/mesh_interface.py (modified) (3 diffs)
• anuga_work/production/karratha_2006 (added)

anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py

@@ -726 +726 @@
         str += 'Mesh statistics:\n'
         str += '  Number of triangles = %d\n' %self.number_of_elements
-        str += '  Extent:\n'
+        str += '  Extent [m]:\n'
         str += '    x in [%f, %f]\n' %(min(x), max(x))
         str += '    y in [%f, %f]\n' %(min(y), max(y))
-        str += '  Areas:\n'
+        str += '  Areas [m^2]:\n'
         str += '    A in [%f, %f]\n' %(min(areas), max(areas))
         str += '    number of distinct areas: %d\n' %(len(areas))        
@@ -764 +764 @@
                 
                       
-        str += 'Boundary:\n'
-        str += '  Number of boundary segments == %d\n' %(len(self.boundary))
-        str += '  Boundary tags == %s\n' %self.get_boundary_tags()  
+        str += '  Boundary:\n'
+        str += '    Number of boundary segments == %d\n' %(len(self.boundary))
+        str += '    Boundary tags == %s\n' %self.get_boundary_tags()  
         str += '------------------------------------------------\n'
         

anuga_core/source/anuga/coordinate_transforms/redfearn.py

@@ -178 +178 @@
     Output
 
-    zone:   UTM zone for converted points
     points: List of converted points
+    zone:   Common UTM zone for converted points
 
 
@@ -205 +205 @@
 
 
-    return old_geo.get_zone(), utm_points
+    return utm_points, old_geo.get_zone()
 
 

anuga_core/source/anuga/coordinate_transforms/test_redfearn.py

@@ -229 +229 @@
         
         points = [[lat_gong, lon_gong], [lat_2, lon_2]]
-        zone, points = convert_points_from_latlon_to_utm(points)
+        points, zone = convert_points_from_latlon_to_utm(points)
 
         assert allclose(points[0][0], 308728.009)
@@ -255 +255 @@
 
         try:
-            zone, points = convert_points_from_latlon_to_utm(points)            
+            points, zone = convert_points_from_latlon_to_utm(points)           
         except ANUGAError:
             pass
@@ -277 +277 @@
 
         try:
-            zone, points = convert_points_from_latlon_to_utm(points)                        
+            points, zone = convert_points_from_latlon_to_utm(points)           
         except ANUGAError:
             pass

anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -65 +65 @@
     # check the segment indexes - throw an error if they are out of bounds
     #(DSG) Yes!
+
     
     #In addition I reckon the polygons could be of class Geospatial_data 
@@ -73 +74 @@
     #Note, Both poly's have the same geo_ref, therefore don't take into account
     # geo_ref
+
+    # Simple check
+    bounding_polygon = ensure_numeric(bounding_polygon, Float)
+    msg = 'Bounding polygon must be a list of points or an Nx2 array'
+    assert len(bounding_polygon.shape) == 2, msg
+    assert bounding_polygon.shape[1] == 2, msg    
+
+
+    # 
     if interior_regions is not None:        
         # Test that all the interior polygons are inside the bounding_poly
@@ -88 +98 @@
     # Resolve geo referencing        
     if mesh_geo_reference is None:
-        bounding_polygon = ensure_numeric(bounding_polygon, Float)
         xllcorner = min(bounding_polygon[:,0])
         yllcorner = min(bounding_polygon[:,1])