Changeset 4318

Timestamp:

Mar 23, 2007, 3:35:36 PM (18 years ago)

Author:

duncan

Message:

bug fix in new urs2sww

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (6 diffs)
• test_data_manager.py (modified) (4 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4400 +4400 @@
 LAT_AMOUNT = 4800
 LONG_AMOUNT = 3600
-def URS_points_needed_to_file(file_name, boundary_polygon,
+def URS_points_needed_to_file(file_name, boundary_polygon, zone,
                               ll_lat=LL_LAT, ll_long=LL_LONG,
                               grid_spacing=GRID_SPACING, 
                               lat_amount=LAT_AMOUNT, long_amount=LONG_AMOUNT,
-                              zone=None, export_csv=False, use_cache=False,
+                              export_csv=False, use_cache=False,
                               verbose=False):
     """
@@ -4419 +4419 @@
     Don't add the file extension.  It will be added.
     """
-    geo = URS_points_needed(boundary_polygon, ll_lat, ll_long, grid_spacing, 
-                      lat_amount, long_amount, zone, use_cache, verbose)
+    geo = URS_points_needed(boundary_polygon, zone, ll_lat, ll_long,
+                            grid_spacing, 
+                      lat_amount, long_amount,use_cache, verbose)
     if not file_name[-4:] == ".urs":
         file_name += ".urs"
@@ -4429 +4430 @@
         geo.export_points_file(file_name)
 
-def URS_points_needed(boundary_polygon, ll_lat=LL_LAT,
+def URS_points_needed(boundary_polygon, zone, ll_lat=LL_LAT,
                       ll_long=LL_LONG, grid_spacing=GRID_SPACING, 
                       lat_amount=LAT_AMOUNT, long_amount=LONG_AMOUNT,
-                      zone=None, use_cache=False, verbose=False):
-    args = (boundary_polygon)
+                      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': zone}  
+              'long_amount': long_amount}  
     if use_cache is True:
         try:
@@ -4456 +4457 @@
         #I was getting 'got multiple values for keyword argument' errors
         #geo = apply(_URS_points_needed, args, kwargs)
-        geo = _URS_points_needed(boundary_polygon, ll_lat,
+        geo = _URS_points_needed(boundary_polygon,
+                      zone, ll_lat,
                       ll_long, grid_spacing, 
-                      lat_amount, long_amount,
-                      zone)
+                      lat_amount, long_amount)
 
     return geo    
-def _URS_points_needed(boundary_polygon, ll_lat=LL_LAT,
+def _URS_points_needed(boundary_polygon,
+                      zone, ll_lat=LL_LAT,
                       ll_long=LL_LONG, grid_spacing=GRID_SPACING, 
-                      lat_amount=LAT_AMOUNT, long_amount=LONG_AMOUNT,
-                      zone=None):
+                      lat_amount=LAT_AMOUNT, long_amount=LONG_AMOUNT):
     """
 
@@ -4488 +4489 @@
 
     # convert the segs to Lat's and longs.
-    if zone is None:
-        # Assume the zone of the segments is the same as the lower left
-        # corner of the lat long data
-        zone, _, _ = redfearn(ll_lat, ll_long)
+    
+    # Don't assume the zone of the segments is the same as the lower left
+    # corner of the lat long data!!  They can easily be in different zones
+    
     lat_long_set = ImmutableSet()
     for seg in segs:
@@ -5029 +5030 @@
 
 #-------------------------------------------------------------
-if __name__ == "__main__":
-    points=Urs_points('urs2sww_test/o_velocity-e-mux')
-    for i in points:
-        print 'i',i
+if __name__ == "__main__":    
         pass
 

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -5198 +5198 @@
         lat_amount = 30
         long_amount = 30
+        zone = 50
 
         boundary_polygon = [[250000,7660000],[280000,7660000],
                              [280000,7630000],[250000,7630000]]
-        geo=URS_points_needed(boundary_polygon,
+        geo=URS_points_needed(boundary_polygon, zone, 
                               ll_lat, ll_long, grid_spacing, 
                               lat_amount, long_amount)
@@ -5676 +5677 @@
         time_step = 400
         tide = -200000
+        zone = 50
 
         boundary_polygon = [[250000,7660000],[280000,7660000],
                              [280000,7630000],[250000,7630000]]
-        geo=URS_points_needed(boundary_polygon,
+        geo=URS_points_needed(boundary_polygon, zone,
                               ll_lat, ll_long, grid_spacing, 
                               lat_amount, long_amount)
@@ -5699 +5701 @@
         time_step = 400
         tide = -200000
+        zone = 50
 
         boundary_polygon = [[250000,7660000],[270000,7650000],
                              [280000,7630000],[250000,7630000]]
-        geo=URS_points_needed(boundary_polygon,
+        geo=URS_points_needed(boundary_polygon, zone,
                               ll_lat, ll_long, grid_spacing, 
                               lat_amount, long_amount, use_cache=True,
@@ -5717 +5720 @@
         time_step = 400
         tide = -200000
+        zone = 50
 
         boundary_polygon = [[250000,7660000],[270000,7650000],
                              [280000,7630000],[250000,7630000]]
-        geo=URS_points_needed(boundary_polygon,
+        geo=URS_points_needed(boundary_polygon, zone,
                               ll_lat, ll_long, grid_spacing, 
                               lat_amount, long_amount)