Changeset 5253

Timestamp:

Apr 30, 2008, 11:44:10 AM (17 years ago)

Author:

duncan

Message:

Addition to URS_points_needed_to_file so it can do the Northern hemisphere.

Location:

anuga_core/source/anuga

Files:

• geospatial_data/geospatial_data.py (modified) (1 diff)
• shallow_water/data_manager.py (modified) (10 diffs)
• shallow_water/test_data_manager.py (modified) (3 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -902 +902 @@
     if data_points is not None and not points_are_lats_longs:
         msg = """Data points are specified yet latitude and
-        longitude are also specified!"""
+        longitude are also specified."""
         raise ValueError, msg
     
     if points_are_lats_longs:
         if data_points is None:
-            msg = """Data points are not specified !"""
+            msg = """Data points are not specified."""
             raise ValueError, msg
         lats_longs = ensure_numeric(data_points)
-
         latitudes = ravel(lats_longs[:,0:1])
         longitudes = ravel(lats_longs[:,1:])
         
     if latitudes is None and longitudes is None:
-        msg = """Latitudes and Longitudes are not."""
+        msg = """Latitudes and Longitudes are not specified."""
         raise ValueError, msg
     
     if latitudes is None:
-        msg = """Longitudes are specified yet latitudes aren't!"""
+        msg = """Longitudes are specified yet latitudes aren't."""
         raise ValueError, msg
     
     if longitudes is None:
-        msg = """Latitudes are specified yet longitudes aren't!"""
+        msg = """Latitudes are specified yet longitudes aren't."""
         raise ValueError, msg
     

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4420 +4420 @@
                               grid_spacing, 
                               lat_amount, long_amount,
+                              isSouthernHemisphere=True,
                               export_csv=False, use_cache=False,
                               verbose=False):
     """
+    Given the info to replicate the URS grid and a polygon output
+    a file that specifies the cloud of boundary points for URS.
+    
+    Note: The polygon cannot cross zones or hemispheres.
+    
     file_name - name of the urs file produced for David.
     boundary_polygon - a list of points that describes a polygon.
@@ -4429 +4435 @@
 
      This is info about the URS model that needs to be inputted.
-     If you do not, default values will be used, which may be incorrect.
+     
     ll_lat - lower left latitude, in decimal degrees
     ll-long - lower left longitude, in decimal degrees
@@ -4441 +4447 @@
     geo = URS_points_needed(boundary_polygon, zone, ll_lat, ll_long,
                             grid_spacing, 
-                            lat_amount, long_amount,use_cache, verbose)
+                            lat_amount, long_amount, isSouthernHemisphere,
+                            use_cache, verbose)
     if not file_name[-4:] == ".urs":
         file_name += ".urs"
-    geo.export_points_file(file_name)
+    geo.export_points_file(file_name, isSouthHemisphere=isSouthernHemisphere)
     if export_csv:
         if file_name[-4:] == ".urs":
@@ -4452 +4459 @@
 def URS_points_needed(boundary_polygon, zone, ll_lat,
                       ll_long, grid_spacing, 
-                      lat_amount, long_amount,
+                      lat_amount, long_amount, isSouthHemisphere=True,
                       use_cache=False, verbose=False):
     args = (boundary_polygon,
-                      zone)
-    kwargs = {'ll_lat': ll_lat,
-              'll_long': ll_long,
-              'grid_spacing': grid_spacing,
-              'lat_amount': lat_amount,
-              'long_amount': long_amount}  
+            zone, ll_lat,
+            ll_long, grid_spacing, 
+            lat_amount, long_amount, isSouthHemisphere)
+    kwargs = {}  
     if use_cache is True:
         try:
@@ -4475 +4480 @@
                   compression=False)
     else:
-        #I was getting 'got multiple values for keyword argument' errors
-        #geo = apply(_URS_points_needed, args, kwargs)
-        geo = _URS_points_needed(boundary_polygon,
-                                 zone, ll_lat,
-                                 ll_long, grid_spacing, 
-                                 lat_amount, long_amount)
+        geo = apply(_URS_points_needed, args, kwargs)
 
     return geo
@@ -4487 +4487 @@
                       zone, ll_lat,
                       ll_long, grid_spacing, 
-                      lat_amount, long_amount):
-    """
-
+                      lat_amount, long_amount,
+                       isSouthHemisphere):
+    """
     boundary_polygon - a list of points that describes a polygon.
                       The last point is assumed ot join the first point.
@@ -4507 +4507 @@
     # List of segments.  Each segment is two points.
     segs = [i and [a[i-1], a[i]] or [a[len(a)-1], a[0]] for i in range(len(a))]
-
     # convert the segs to Lat's and longs.
     
@@ -4516 +4515 @@
     for seg in segs:
         points_lat_long = points_needed(seg, ll_lat, ll_long, grid_spacing, 
-                      lat_amount, long_amount, zone)
+                      lat_amount, long_amount, zone, isSouthHemisphere)
         lat_long_set |= ImmutableSet(points_lat_long)
-    #print "lat_long_set",lat_long_set 
+    if lat_long_set == ImmutableSet([]):
+        msg = """URS region specified and polygon does not overlap."""
+        raise ValueError, msg
+
+    # Warning there is no info in geospatial saying the hemisphere of
+    # these points.  There should be.
     geo = Geospatial_data(data_points=list(lat_long_set),
                               points_are_lats_longs=True)
@@ -4524 +4528 @@
     
 def points_needed(seg, ll_lat, ll_long, grid_spacing, 
-                  lat_amount, long_amount, zone):
-    """
+                  lat_amount, long_amount, zone,
+                  isSouthHemisphere):
+    """
+    seg is one point, in UTM
     return a list of the points, in lats and longs that are needed to
     interpolate any point on the segment.
@@ -4532 +4538 @@
     #print "zone",zone 
     geo_reference = Geo_reference(zone=zone)
-    #print "seg",seg 
     geo = Geospatial_data(seg,geo_reference=geo_reference)
-    seg_lat_long = geo.get_data_points(as_lat_long=True)
-    #print "seg_lat_long", seg_lat_long
+    seg_lat_long = geo.get_data_points(as_lat_long=True,
+                                       isSouthHemisphere=isSouthHemisphere)
     # 1.415 = 2^0.5, rounded up....
     sqrt_2_rounded_up = 1.415

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6144 +6144 @@
 
 
-    def Xtest_URS_points_needed_poly2(self):
+    def test_URS_points_needed_poly2(self):
         # Values used for 2004 validation work
         # domain in northern hemisphere zone 47        
@@ -6169 +6169 @@
                                   GRID_SPACING,
                                   LAT_AMOUNT, LONG_AMOUNT,
+                                  isSouthernHemisphere=False,
                                   verbose=self.verbose) 
         
@@ -7561 +7562 @@
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_get_flow_through_cross_section')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs_ungridded_holeII')
+    #suite = unittest.makeSuite(Test_Data_Manager,'Xtest')