Changeset 1681

Timestamp:

Aug 4, 2005, 3:40:49 PM (19 years ago)

Author:

ole

Message:

Played with set_quantity

Location:

inundation/ga/storm_surge/pyvolution

Files:

• domain.py (modified) (4 diffs)
• least_squares.py (modified) (1 diff)
• quantity.py (modified) (5 diffs)
• util.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/domain.py

@@ -141 +141 @@
 
 
-    def set_quantity(self, name, X, location='vertices', indexes = None):
+    def set_quantity(self, name,
+                     X,
+                     location='vertices',
+                     indexes = None):
         """Set values for named quantity
 
@@ -170 +173 @@
               Q is a quantity
               b is either a scalar, a quantity or a compatible array
+              pts file
             location: Where values are to be stored.
                       Permissible options are: vertices, edges, centroid
@@ -180 +184 @@
 
 
-
         """
 
@@ -192 +195 @@
 
         #Set value
-        self.quantities[name].set_values(X, location, indexes = indexes)
+        self.quantities[name].set_values(X,
+                                         location,
+                                         indexes = indexes)
+
 
 

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -890 +890 @@
         
     Optional input:
-        quantity_names:     List of keys into quantities dictionary 
+        quantity_names:     List of keys into the quantities dictionary 
         vertex_coordinates: mx2 array of coordinates (Float)
         triangles:          nx3 array of indices into vertex_coordinates (Int)

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -79 +79 @@
 
 
-    def set_values(self, X, location='vertices', indexes = None):
+    def set_values(self, X,
+                   location='vertices',
+                   indexes = None):
         """Set values for quantity
 
@@ -107 +109 @@
         In any other case, only values for the specified locations
         will be assigned and the others will be left undefined.
+
         """
 
@@ -112 +115 @@
             msg = 'Invalid location: %s' %location
             raise msg
+
+        #FIXME Do we really need 'location'?
 
         if X is None:
@@ -170 +175 @@
                         self.vertex_values[i_vertex,:] = X
 
-        else:
+        elif type(X) in [Numeric.ArrayType, types.ListType]:
             #Use array specific method
             self.set_array_values(X, location, indexes = indexes)
-
+        elif type(X) == types.StringType:
+            #Assume X is a filename
+            self.set_values_from_file(X) #FIXME: More parameters
+
+        
         if location == 'vertices' or location == 'unique vertices':
             #Intialise centroid and edge_values
@@ -383 +392 @@
 
 
+
+    def set_values_from_file(self, filename,
+                             attribute_name = None,
+                             verbose = False):
+        """Set quantity based on arbitrary points in .pts file using least_squares
+
+        attribute_name selects name of attribute present in file.
+        If not specified try to use whatever is available in file.
+        """
+
+        #FIXME location, indices
+
+        
+        import util, least_squares
+
+        points, attributes = util.read_xya(filename)
+
+        if attribute_name is None:
+            names = attributes.keys()
+            attribute_name = names[0]
+
+            
+        if verbose:
+            print 'Using attribute %s from file %s' %(attribute_name, filename)
+            print 'Available attributes: %s' %(names) 
+            
+
+        try:
+            z = attributes[attribute_name]
+        except:
+            msg = 'Could not extract attribute %s from file %s'\
+                  %(attribute_name, filename)
+            raise msg
+        
+
+        #Fit attributes to mesh
+        X = least_squares.fit_to_mesh(self.domain.coordinates,
+                                      self.domain.triangles,
+                                      points,
+                                      z,
+                                      verbose=verbose)
+
+
+
+        #Recursively set value using fitted array
+        print 'shape', X.shape
+        self.set_values(X, location='vertices')  #FIXME, indexes = None):        
+        
+
+
+
     # FIXME have a get_vertex_values as well, so the 'stage' quantity can be
     # set, based on the elevation

inundation/ga/storm_surge/pyvolution/util.py

@@ -138 +138 @@
                   interpolation_points = None, verbose = False):
     """If quantities is not specified, derive them from domain
-    (if that is specified) 
+    (if that is specified)
+
+
+    see get_netcdf_file_function
     """
 
@@ -198 +201 @@
         
 
-    import time, calendar
+    import time, calendar, types
     from config import time_format
     from Scientific.IO.NetCDF import NetCDFFile
@@ -207 +210 @@
     fid = NetCDFFile(filename, 'r')
 
+    if type(quantity_names) == types.StringType:
+        quantity_names = [quantity_names]        
+    
     if quantity_names is None or len(quantity_names) < 1:
         #Get quantities from file
@@ -230 +236 @@
 
     #Decide whether this data has a spatial dimension
+    #FIXME: Let us split this up into two functions: One that reads
+    #sww and one that reads tms (time series only)
     spatial = True
     for quantity in ['x', 'y']:
@@ -344 +352 @@
         attributes = {}
         for key in keys:
-            attributes[key] = fid.variables[key]
+            if key != 'points':
+                attributes[key] = fid.variables[key]
         #Don't close - arrays are needed outside this function,
         #alternatively take a copy here