Changeset 900 for inundation/ga/storm_surge/pyvolution

Timestamp:

Feb 16, 2005, 2:57:02 PM (20 years ago)

Author:

ole

Message:

Fiddle

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (2 diffs)
• generic_boundary_conditions.py (modified) (3 diffs)
• util.py (modified) (9 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1036 +1036 @@
 
     #Get NetCDF data
+    if verbose: print 'Reading files %s_*.nc' %basefilename
     file_h = NetCDFFile(basefilename + '_ha.nc', 'r') #Wave amplitude (cm)
     file_u = NetCDFFile(basefilename + '_ua.nc', 'r') #Velocity (x) (cm/s)
@@ -1079 +1080 @@
     longitudes = longitudes[lmin:lmax]
     times = times[jmin:jmax]
-    
+
+    if verbose: print 'cropping'
     amplitudes = file_h.variables['HA'][jmin:jmax, kmin:kmax, lmin:lmax]
     xspeed = file_u.variables['UA'][jmin:jmax, kmin:kmax, lmin:lmax]

inundation/ga/storm_surge/pyvolution/generic_boundary_conditions.py

@@ -176 +176 @@
     """
 
-
-    def __init__(self, filename, domain):
+    def __init__(self, filename, domain, verbose = False):
         import time
         from Numeric import array, zeros, Float
@@ -192 +191 @@
         #we don't know which ones at this stage since this object can be attached to 
         #any tagged boundary later on.
-        
+
+        if verbose: print 'Find midpoint coordinates of entire boundary'
         self.midpoint_coordinates = zeros( (len(domain.boundary), 2), Float)
         boundary_keys = domain.boundary.keys()
@@ -213 +213 @@
             self.boundary_indices[(vol_id, edge_id)] = i
         
-        
+
+        if verbose: print 'Initialise file_function'
         self.F = file_function(filename, domain, 
-                               interpolation_points=self.midpoint_coordinates)
+                               interpolation_points=self.midpoint_coordinates,
+                               verbose = verbose)
         self.domain = domain
 

inundation/ga/storm_surge/pyvolution/util.py

@@ -81 +81 @@
     
 
-def file_function(filename, domain=None, quantities = None, interpolation_points = None):
+def file_function(filename, domain=None, quantities = None, interpolation_points = None, verbose = False):
     """If domain is specified, don't specify quantites as they are automatically derived
     """
@@ -105 +105 @@
     #FIXME: Maybe these can be merged later on
     if line[:3] == 'CDF':
-        return File_function_NetCDF(filename, domain, quantities, interpolation_points)
+        return File_function_NetCDF(filename, domain, quantities, interpolation_points, verbose = verbose)
     else:
         return File_function_ASCII(filename, domain, quantities, interpolation_points)    
@@ -133 +133 @@
     """
     
-    def  __init__(self, filename, domain=None, quantities=None, interpolation_points=None):
+    def  __init__(self, filename, domain=None, quantities=None, interpolation_points=None, verbose = False):
         """Initialise callable object from a file.
 
@@ -142 +142 @@
         """
 
+        #FIXME: Check that model origin is the same as file's origin
+        #(both in UTM coordinates)
+        #If not - modify those from file to match domain
+        
         import time, calendar
         from config import time_format
@@ -147 +151 @@
 
         #Open NetCDF file
+        if verbose: print 'Reading', filename
         fid = NetCDFFile(filename, 'r')
 
@@ -192 +197 @@
 
         #Read all data in and produce values for desired data points at each timestep 
-        self.spatial_interpolation(interpolation_points) 
+        self.spatial_interpolation(interpolation_points, verbose = verbose) 
         fid.close()
 
-    def spatial_interpolation(self, interpolation_points):
+    def spatial_interpolation(self, interpolation_points, verbose = False):
         """For each timestep in fid: read surface, interpolate to desired points 
         and store values for use when object is called.
@@ -209 +214 @@
 
         #Get variables
+        if verbose: print 'Get varibles'
         x = fid.variables['x'][:]
         y = fid.variables['y'][:]
@@ -242 +248 @@
 
             #Build interpolator
+            if verbose: print 'Build interpolation matrix'
             x = reshape(x, (len(x),1))
             y = reshape(y, (len(y),1))                
@@ -250 +257 @@
                                      point_coordinates = P,
                                      alpha = 0, 
-                                     verbose = False)
-
-            
+                                     verbose = verbose)
+
+
+            if verbose: print 'Interpolate'
             for i, t in enumerate(self.T):
                 #Interpolate quantities at this timestep
+                print ' time step %d of %d' %(i, len(self.T))
                 for name in self.quantities:
                     self.values[name][i, :] =\