Changeset 851 for inundation/ga/storm_surge/pyvolution/generic_boundary_conditions.py

Timestamp:

Feb 8, 2005, 7:07:56 PM (20 years ago)

Author:

ole

Message:

First cut at a spatio-temporal boundary.
Need to improve the test, though.

File:

• inundation/ga/storm_surge/pyvolution/generic_boundary_conditions.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/generic_boundary_conditions.py

@@ -187 +187 @@
         #any tagged boundary later on.
         
-        midpoint_coordinates = zeros( (len(domain.boundary), 2), Float)
+        self.midpoint_coordinates = zeros( (len(domain.boundary), 2), Float)
         boundary_keys = domain.boundary.keys()
+        
+        #Record ordering #FIXME: should this happen in domain.py
+        self.boundary_indices = {} 
+        
         for i, (vol_id, edge_id) in enumerate(boundary_keys):
             
@@ -199 +203 @@
             if edge_id == 1: m = array([(x0 + x2)/2, (y0 + y2)/2])
             if edge_id == 2: m = array([(x1 + x0)/2, (y1 + y0)/2])            
-            midpoint_coordinates[i,:] = m
-        
-        self.midpoint_coordinates = midpoint_coordinates    
+            self.midpoint_coordinates[i,:] = m
+            
+            self.boundary_indices[(vol_id, edge_id)] = i
+        
         
-        self.F = file_function(filename, domain, interpolation_points=midpoint_coordinates)
+        self.F = file_function(filename, domain, 
+                               interpolation_points=self.midpoint_coordinates)
         self.domain = domain
 
         #Test
-        q = self.F(0, 0, 0)
+        q = self.F(0, point_id=0)
 
         d = len(domain.conserved_quantities)
-        msg = 'Values specified in file %s must be a list or an array of length %d' %(filename, d)
+        msg = 'Values specified in file %s must be ' %filename 
+        msg += ' a list or an array of length %d' %d
         assert len(q) == d, msg
 
@@ -226 +233 @@
 
         if vol_id is not None and edge_id is not None:
-            x, y = self.midpoint_coordinates[ vol_id, edge_id ]
-            return self.F(t, x, y)
+            i = self.boundary_indices[ vol_id, edge_id ]
+            return self.F(t, point_id = i)
         else:
-            return self.F(t)
+            return self.F(t) #What should the semantics be?