Changeset 8235

Timestamp:

Oct 25, 2011, 3:11:37 PM (13 years ago)

Author:

steve

Message:

Added in update_special condition for sudi

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/generic_domain.py (modified) (8 diffs)
• shallow_water/shallow_water_domain.py (modified) (2 diffs)
• structures/inlet.py (modified) (1 diff)
• structures/testing_update_special_condition.py (added)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -1308 +1308 @@
         self.number_of_first_order_steps = 0
 
+        # Update centroid values of conserved quantites to satisfy
+        # special conditions
+        self.update_special_conditions()
+
         # Update ghosts to ensure all centroid values are available
         self.update_ghosts()
@@ -1427 +1431 @@
         self.update_conserved_quantities()
 
+
+        # Update special conditions
+        self.update_special_conditions()
+
         # Update ghosts
         self.update_ghosts()
@@ -1456 +1464 @@
         # Update centroid values of conserved quantities
         self.update_conserved_quantities()
+
+        # Update special conditions
+        self.update_special_conditions()
 
         # Update ghosts
@@ -1493 +1504 @@
         self.saxpy_conserved_quantities(0.5, 0.5)
 
+        # Update special conditions
+        self.update_special_conditions()
+
         # Update ghosts
         self.update_ghosts()
@@ -1523 +1537 @@
         # Update conserved quantities
         self.update_conserved_quantities()
+
+        # Update special conditions
+        self.update_special_conditions()
 
         # Update ghosts
@@ -1560 +1577 @@
         self.saxpy_conserved_quantities(0.25, 0.75)
 
+
+        # Update special conditions
+        self.update_special_conditions()
+
         # Update ghosts
         self.update_ghosts()
@@ -1593 +1614 @@
         self.saxpy_conserved_quantities(2.0/3.0, 1.0/3.0)
 
+
+        # Update special conditions
+        self.update_special_conditions()
+        
         # Update ghosts
         self.update_ghosts()
@@ -1806 +1831 @@
                 Q_cv =  self.quantities[q].centroid_values
                 num.put(Q_cv, Idg, num.take(Q_cv, Idf, axis=0))
+
+    def update_special_conditions(self):
+        """There may be a need to change the values of the conserved 
+        quantities to satisfy special conditions at the very lowest level
+        the fluid flow calculation
+        """
+        
+        pass
+
 
     def update_other_quantities(self):

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -240 +240 @@
         self.optimised_gradient_limiter = optimised_gradient_limiter
         self.use_centroid_velocities = use_centroid_velocities       
+
+
+    def update_special_conditions(self):
+
+        my_update_special_conditions(self)
+
 
 
@@ -1483 +1489 @@
     return wet_friction
 
+def my_update_special_conditions(domain):
+
+    pass
 
 

trunk/anuga_core/source/anuga/structures/inlet.py

@@ -14 +14 @@
         self.domain = domain
         self.domain_bounding_polygon = self.domain.get_boundary_polygon()
-        self.line = line
+        self.line = num.asarray(line, 'f')
         self.verbose = verbose