Changeset 2262 for inundation/pyvolution/quantity.py

Timestamp:

Jan 20, 2006, 11:04:18 AM (19 years ago)

Author:

ole

Message:

Fixed missing geo reference in set_quantity and added tests

File:

• inundation/pyvolution/quantity.py (modified) (12 diffs)

inundation/pyvolution/quantity.py

@@ -167 +167 @@
                    quantity = None,   # Another quantity
                    function = None,   # Callable object: f(x,y)
-                   points = None, values = None, #Input for least squares
+                   points = None, values = None, data_georef = None, #Input for least squares
                    filename = None, attribute_name = None, #Input from file
                    alpha = None,
@@ -201 +201 @@
           If points is specified, values is an array of length N containing
           attribute values for each point.
+
+        data_georef:
+          If points is specified, geo_reference applies to each point.        
           
         filename:
@@ -305 +308 @@
             assert values is not None, msg
             self.set_values_from_points(points, values, alpha,
-                                        location, indices, verbose,
-                                        use_cache)
+                                        location, indices,
+                                        data_georef = data_georef,
+                                        verbose = verbose,
+                                        use_cache = use_cache)
         elif filename is not None:
             self.set_values_from_file(filename, attribute_name, alpha,
-                                      location, indices, verbose,
-                                      use_cache)
+                                      location, indices,
+                                      verbose = verbose,
+                                      use_cache = use_cache) 
         else:
             raise 'This can\'t happen :-)'
@@ -513 +519 @@
         #FIXME: Should check that function returns something sensible and
         #raise a meaningfull exception if it returns None for example
+
+        #FIXME: Should supply absolute coordinates
 
         from Numeric import take
@@ -546 +554 @@
 
     def set_values_from_points(self, points, values, alpha,
-                               location, indices, verbose, use_cache):
+                               location, indices,
+                               data_georef = None,
+                               verbose = False,
+                               use_cache = False):
         """Set quantity values from arbitray data points using least squares
         """
@@ -553 +564 @@
         from util import ensure_numeric
         from least_squares import fit_to_mesh
+        from coordinate_transforms.geo_reference import Geo_reference
+        
 
         points = ensure_numeric(points, Float)
@@ -565 +578 @@
         triangles = self.domain.triangles
 
+
+        #Take care of georeferencing
+        if data_georef is None:
+            data_georef = Geo_reference()
+
+
+        mesh_georef = self.domain.geo_reference
+
+        #print mesh_georef
+        #print data_georef
+        #print points
+            
+
+        #Call least squares method            
+        args = (coordinates, triangles, points, values)
+        kwargs = {'data_origin': data_georef.get_origin(),
+                  'mesh_origin': mesh_georef.get_origin(),
+                  'alpha': alpha,
+                  'verbose': verbose}
+
+        #print kwargs
+        
         if use_cache is True:
             try:
@@ -573 +608 @@
                 raise msg
 
-            args = (coordinates, triangles, points, values)
-            kwargs = {'alpha': alpha, 'verbose': verbose}
             vertex_attributes = cache(fit_to_mesh,
                                       args, kwargs,
                                       verbose = verbose)
         else:
-            vertex_attributes = fit_to_mesh(coordinates,
-                                            triangles,
-                                            points,
-                                            values,
-                                            alpha = alpha,
-                                            verbose = verbose)
-
-
+
+            vertex_attributes = apply(fit_to_mesh,
+                                      args, kwargs)
+            
+        #Call underlying method using array values    
         self.set_values_from_array(vertex_attributes,
                                    location, indices, verbose)
@@ -595 +625 @@
 
     def set_values_from_file(self, filename, attribute_name, alpha,
-                             location, indices, verbose, use_cache):
+                             location, indices,
+                             verbose = False,
+                             use_cache = False):
         """Set quantity based on arbitrary points in .pts file
         using least_squares attribute_name selects name of attribute
@@ -602 +634 @@
         """
 
+        from load_mesh.loadASCII import import_points_file
 
         from types import StringType
@@ -609 +642 @@
 
         #Read from (NetCDF) file
-        from load_mesh.loadASCII import import_points_file
         points_dict = import_points_file(filename)
         points = points_dict['pointlist']
@@ -634 +666 @@
 
 
-        #Call least squares method
+        #Take care of georeferencing
+        if points_dict.has_key('geo_reference') and \
+               points_dict['geo_reference'] is not None:
+            data_georef = points_dict['geo_reference']
+        else:
+            data_georef = None
+
+
+        #Call underlying method for points
         self.set_values_from_points(points, z, alpha,
-                                    location, indices, verbose, use_cache)
+                                    location, indices,
+                                    data_georef = data_georef,
+                                    verbose = verbose,
+                                    use_cache = use_cache)