Changeset 5436 for anuga_core/source/anuga/shallow_water/shallow_water_domain.py

Timestamp:

Jun 25, 2008, 5:57:01 PM (15 years ago)

Author:

ole

Message:

Moved culvert routines into own area

File:

• anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (8 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1527 +1527 @@
                 negative values indicate decreases.
                 Rate can be None at initialisation but must be specified
-                before forcting term is applied (i.e. simulation has started).
+                before forcing term is applied (i.e. simulation has started).
 
     center [m]: Coordinates at center of flow point
@@ -1565 +1565 @@
 
         # Update area if applicable
-        self.area = None        
+        self.exchange_area = None        
         if center is not None and radius is not None:
             assert len(center) == 2
@@ -1571 +1571 @@
             assert polygon is None, msg
 
-            self.area = radius**2*pi
+            self.exchange_area = radius**2*pi
         
         if polygon is not None:
-            self.area = polygon_area(self.polygon)
+            self.exchange_area = polygon_area(self.polygon)
 
 
@@ -1584 +1584 @@
         points = domain.get_centroid_coordinates(absolute=True)
 
-        self.indices = None
+        # Calculate indices in exchange area for this forcing term
+        self.exchange_indices = None
         if self.center is not None and self.radius is not None:
             # Inlet is circular
             
-            self.indices = []
+            self.exchange_indices = []
             for k in range(N):
                 x, y = points[k,:] # Centroid
                 if ((x-self.center[0])**2+(y-self.center[1])**2) < self.radius**2:
-                    self.indices.append(k)
+                    self.exchange_indices.append(k)
                     
         if self.polygon is not None:                    
             # Inlet is polygon
-            self.indices = inside_polygon(points, self.polygon)
+            self.exchange_indices = inside_polygon(points, self.polygon)
             
 
@@ -1621 +1622 @@
 
 
-        if self.indices is None:
+        if self.exchange_indices is None:
             self.update[:] += rate
         else:
             # Brute force assignment of restricted rate
-            for k in self.indices:
+            for k in self.exchange_indices:
                 self.update[k] += rate
 
@@ -1645 +1646 @@
         """Return values for specified quantity restricted to opening 
         """
-        return self.domain.quantities[self.quantity_name].get_values(indices=self.indices)
+        return self.domain.quantities[self.quantity_name].get_values(indices=self.exchange_indices)
     
 
@@ -1651 +1652 @@
         """Set values for specified quantity restricted to opening 
         """
-        self.domain.quantities[self.quantity_name].set_values(val, indices=self.indices)    
+        self.domain.quantities[self.quantity_name].set_values(val, indices=self.exchange_indices)    
 
 
@@ -1811 +1812 @@
         
         if callable(self.rate):
-            _rate = self.rate(t)/self.area
+            _rate = self.rate(t)/self.exchange_area
         else:
-            _rate = self.rate/self.area
+            _rate = self.rate/self.exchange_area
 
         return _rate