Changeset 4284

Timestamp:

Feb 27, 2007, 4:48:19 PM (18 years ago)

Author:

duncan

Message:

added caching to ungridded urs2sww

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4383 +4383 @@
 
     ### PRODUCING THE POINTS NEEDED FILE ###
-def URS_points_needed_to_file(file_name, boundary_polygon, ll_lat, ll_long,
-                              grid_spacing, 
-                      lat_amount, long_amount, zone=None):
+LL_LAT = -50.0
+LL_LONG = 80.0
+GRID_SPACING = 1.0/60.0
+LAT_AMOUNT = 4800
+LONG_AMOUNT = 3600
+def URS_points_needed_to_file(file_name, boundary_polygon,
+                              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,
+                              verbose=False):
     """
     file_name - name of the urs file produced for David.
@@ -4400 +4408 @@
     """
     geo = URS_points_needed(boundary_polygon, ll_lat, ll_long, grid_spacing, 
-                      lat_amount, long_amount, zone=zone)
+                      lat_amount, long_amount, zone, use_cache, verbose)
     if not file_name[-4:] == ".urs":
         file_name += ".urs"
     geo.export_points_file(file_name)
-    
-def URS_points_needed(boundary_polygon, ll_lat=-50.0,
-                      ll_long=80.0, grid_spacing=1.0/60.0, 
-                      lat_amount=4800, long_amount=3600, zone=None):
+    if export_csv:
+        if file_name[-4:] == ".urs":
+            file_name = file_name[:-4] + ".csv"
+        geo.export_points_file(file_name)
+
+def URS_points_needed(boundary_polygon, 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)
+    kwargs = {'ll_lat': ll_lat,
+              'll_long': ll_long,
+              'grid_spacing': grid_spacing,
+              'lat_amount': lat_amount,
+              'long_amount': long_amount,
+              'zone': zone}  
+    if use_cache is True:
+        try:
+            from anuga.caching import cache
+        except:
+            msg = 'Caching was requested, but caching module'+\
+                  'could not be imported'
+            raise msg
+
+
+        geo = cache(_URS_points_needed,
+                  args, kwargs,
+                  verbose=verbose,
+                  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, ll_lat,
+                      ll_long, grid_spacing, 
+                      lat_amount, long_amount,
+                      zone)
+
+    return geo    
+def _URS_points_needed(boundary_polygon, ll_lat=LL_LAT,
+                      ll_long=LL_LONG, grid_spacing=GRID_SPACING, 
+                      lat_amount=LAT_AMOUNT, long_amount=LONG_AMOUNT,
+                      zone=None):
     """
 

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -5459 +5459 @@
         self.delete_mux(files)
         os.remove( base_name + '.sww')
+    
+    def cache_test_URS_points_needed_and_urs_ungridded2sww(self):
+        
+        ll_lat = -21.5
+        ll_long = 114.5
+        grid_spacing = 1./60.
+        lat_amount = 30
+        long_amount = 30
+        time_step_count = 2
+        time_step = 400
+        tide = -200000
+
+        boundary_polygon = [[250000,7660000],[270000,7650000],
+                             [280000,7630000],[250000,7630000]]
+        geo=URS_points_needed(boundary_polygon,
+                              ll_lat, ll_long, grid_spacing, 
+                              lat_amount, long_amount, use_cache=True,
+                              verbose=True)
         
     def visual_test_URS_points_needed_and_urs_ungridded2sww(self):
@@ -5495 +5513 @@
 if __name__ == "__main__":
     #suite = unittest.makeSuite(Test_Data_Manager,'davids_test_points_urs_ungridded2sww')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs_ungridded2swwII')
+    #suite = unittest.makeSuite(Test_Data_Manager,'cache_test_URS_points_needed_and_urs_ungridded2sww')
     #suite = unittest.makeSuite(Test_Data_Manager,'visual_test_URS_points_needed_and_urs_ungridded2sww')
     suite = unittest.makeSuite(Test_Data_Manager,'test')