Changeset 1749

Timestamp:

Aug 24, 2005, 10:20:32 AM (18 years ago)

Author:

ole

Message:

Comments

Location:

inundation

Files:

• pyvolution/quantity.py (modified) (7 diffs)
• pyvolution/test_quantity.py (modified) (1 diff)
• wiki/future_directions.txt (modified) (1 diff)

inundation/pyvolution/quantity.py

@@ -88 +88 @@
                      points = None, values = None, #Input for least squares
                      filename = None, attribute_name = None, #Input from file
-                     alpha = None, 
-                     location = None,
+                     alpha = None,
+                     indices = None,
+                     location = None, #Really needed
                      verbose = None):
         
@@ -96 +97 @@
         numeric:
         
-          Compatible list, Numeric array (see below) or constant
+          Compatible list, Numeric array (see below) or constant.
+          If callable it will treated as a function for convenience and
+          backwards compatibility
 
         quantity:
@@ -102 +105 @@
           Another quantity (compatible quantity, e.g. obtained as a
           linear combination of quantities)
-
 
         function:
@@ -125 +127 @@
                
           
-          
         location: Where values are to be stored.
                   Permissible options are: vertices, edges, centroids
-                  Default is "vertices"
+                  Default is 'vertices'
 
         In case of location == 'centroids' the dimension values must
@@ -140 +141 @@
         specified points
 
-        If indexex is not 'unique vertices' Indexes is the set of element ids
+        If location is not 'unique vertices' Indices is the set of element ids
         that the operation applies to.
-        If indexex is 'unique vertices' Indexes is the set of vertex ids
+        If location is 'unique vertices' Indices is the set of vertex ids
         that the operation applies to.
-
 
         If selected location is vertices, values for centroid and edges
@@ -185 +185 @@
         that the operation applies to.
 
-
-        If selected location is vertices, values for centroid and edges
+        If selected location is 'vertices', values for centroid and edges
         will be assigned interpolated values.
         In any other case, only values for the specified locations
@@ -193 +192 @@
         """
 
-        if location not in ['vertices', 'centroids', 'edges', 'unique vertices']:
+        if location not in ['vertices', 'centroids', 'edges',
+                            'unique vertices']:
             msg = 'Invalid location: %s' %location
             raise msg
 
-        #FIXME Do we really need 'location'?
 
         if X is None:

inundation/pyvolution/test_quantity.py

@@ -907 +907 @@
         indexes = [1,5]
         quantity.set_values(value,
-                                  location = 'unique vertices',
-                                  indexes = indexes)
+                            location = 'unique vertices',
+                            indexes = indexes)
         #print "quantity.centroid_values",quantity.centroid_values
         assert allclose(quantity.vertex_values[0], [0,7,0])

inundation/wiki/future_directions.txt

@@ -50 +50 @@
   Could code be cast in terms of lat/lons?
   make sure that georeferencing is used consistently (domain, pmesh, sww files, ...) (Duncan)  
+  Test that least_squares correctly reconciles different georefs. (See Karratha) 
 
 Least_squares, (Duncan)