Changeset 7939

Timestamp:

Aug 13, 2010, 3:35:39 PM (13 years ago)

Author:

steve

Message:

Adding in culvert routines into structures directory

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/generic_domain.py (modified) (2 diffs)
• shallow_water/shallow_water_domain.py (modified) (3 diffs)
• structures (added)
• structures/culvert_class.py (added)
• structures/culvert_polygons.py (added)
• structures/culvert_routines.py (added)
• structures/test_all.py (added)
• structures/test_culvert_class.py (added)
• structures/test_culvert_polygons.py (added)
• structures/test_culvert_routines.py (added)
• structures/test_culvert_routines_box_10pct.py (added)
• structures/test_culvert_routines_box_1pct.py (added)
• structures/test_culvert_routines_pipe_10pct.py (added)
• structures/test_culvert_routines_pipe_1pct.py (added)

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

@@ -1480 +1480 @@
                 self.evolve_one_rk3_step(yieldstep, finaltime)
 
-
             #==========================================
             # Apply other fractional steps
             #==========================================
-            #self.apply_fractional_steps()
+            self.apply_fractional_steps()
 
             #==========================================
@@ -1840 +1839 @@
         msg = 'Method compute_fluxes must be overridden by Domain subclass'
         raise Exception, msg
+
+
+    ##
+    # @brief apply_fractional_step.
+    # Method should be overwritten in subclass, here it does nothing
+    def apply_fractional_steps(self):
+        pass
 
     ##

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

@@ -166 +166 @@
         self.forcing_terms.append(gravity)
 
+
+        self.fractional_step_operators = []
+
         # Stored output
         self.store = True
         self.set_store_vertices_uniquely(False)
-
         self.quantities_to_be_stored = {'elevation': 1, 
                                         'stage': 2, 
@@ -529 +531 @@
             (either from this module or C-extension)"""
         compute_fluxes(self)
+
+
+    def apply_fractional_steps(self):
+        """Loop throughand apply all extra fractional steps"""
+        for operator in self.fractional_step_operators:
+            operator.apply()
 
     def distribute_to_vertices_and_edges(self):
@@ -1132 +1140 @@
     elevation = domain.quantities['elevation']
 
+    #FIXME SR Should avoid allocating memory!
     height = stage.centroid_values - elevation.centroid_values
     elevation = elevation.vertex_values