Changeset 2407 for inundation/pyvolution/data_manager.py

Timestamp:

Feb 14, 2006, 5:19:29 PM (19 years ago)

Author:

ole

Message:

Pushed caching into conversion functions and beautified the Sydney scenario

File:

• inundation/pyvolution/data_manager.py (modified) (4 diffs)

inundation/pyvolution/data_manager.py

@@ -1074 +1074 @@
 
 
-def dem2pts(basename_in, basename_out=None, verbose=False,
+def dem2pts(basename_in, basename_out=None, 
             easting_min=None, easting_max=None,
-            northing_min=None, northing_max=None):
+            northing_min=None, northing_max=None,
+            use_cache=False, verbose=False,):
     """Read Digitial Elevation model from the following NetCDF format (.dem)
 
@@ -1093 +1094 @@
     points:  (Nx2) Float array
     elevation: N Float array
+    """
+
+
+
+    kwargs = {'basename_out': basename_out,  
+              'easting_min': easting_min,
+              'easting_max': easting_max,
+              'northing_min': northing_min,
+              'northing_max': northing_max,
+              'verbose': verbose}
+
+    if use_cache is True:
+        from caching import cache
+        result = cache(_dem2pts, basename_in, kwargs,
+                       dependencies = [basename_in + '.dem'],
+                       verbose = verbose)
+
+    else:
+        result = apply(_dem2pts, [basename_in], kwargs)
+        
+    return result
+
+
+def _dem2pts(basename_in, basename_out=None, verbose=False,
+            easting_min=None, easting_max=None,
+            northing_min=None, northing_max=None):
+    """Read Digitial Elevation model from the following NetCDF format (.dem)
+
+    Internal function. See public function dem2pts for details.    
     """
 
@@ -1831 +1861 @@
 
 
-
 def convert_dem_from_ascii2netcdf(basename_in, basename_out = None,
-                                  verbose=False):
-    """Read Digitial Elevation model from the following ASCII format (.asc)
+                                  use_cache = False,
+                                  verbose = False):
+    """Read Digitial Elevation model from the following ASCII format (.asc)    
 
     Example:
@@ -1864 +1894 @@
     Yshift        10000000.0000000000
     Parameters
+    """
+
+
+
+    kwargs = {'basename_out': basename_out, 'verbose': verbose}
+
+    if use_cache is True:
+        from caching import cache
+        result = cache(_convert_dem_from_ascii2netcdf, basename_in, kwargs,
+                       dependencies = [basename_in + '.asc'],
+                       verbose = verbose)
+
+    else:
+        result = apply(_convert_dem_from_ascii2netcdf, [basename_in], kwargs)
+        
+    return result
+
+    
+    
+
+
+
+def _convert_dem_from_ascii2netcdf(basename_in, basename_out = None,
+                                  verbose = False):
+    """Read Digitial Elevation model from the following ASCII format (.asc)
+
+    Internal function. See public function convert_dem_from_ascii2netcdf for details.
     """