Changeset 7967

Timestamp:

Aug 23, 2010, 9:15:04 AM (13 years ago)

Author:

steve

Message:

Commits from session with Nariman

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/generic_domain.py (modified) (3 diffs)
• shallow_water/forcing.py (modified) (1 diff)
• shallow_water/shallow_water_domain.py (modified) (1 diff)

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

@@ -171 +171 @@
             self.quantities[name] = Quantity(self)
 
-        # Create an empty list for explicit forcing terms
+        # Create an empty list for forcing terms
         self.forcing_terms = []
+
+        # Create an empty list for fractional step operators
+        self.fractional_step_operators = []
 
         # Setup the ghost cell communication
@@ -497 +500 @@
 
         return self.time + self.starttime
+
+
+    ##
+    # @brief Get current timestep.
+    # @return The curent timestep (seconds).
+    def get_timestep(self):
+        """et current timestep (seconds)."""
+
+        return self.timestep
 
     ##
@@ -1842 +1854 @@
 
     ##
-    # @brief apply_fractional_step.
-    # Method should be overwritten in subclass, here it does nothing
+    # @brief apply_fractional_steps.
+    # Goes through all fractional step operators and updates centroid values of
+    # conserved quantities over a timestep 
     def apply_fractional_steps(self):
-        pass
+        for operator in self.fractional_step_operators:
+            operator()
+
+    ##
+    # @brief set_fractional_step_operator.
+    # Add a fractional step operator to list of operators
+    def set_fractional_step_operator(self,operator):
+
+        self.fractional_step_operators.append(operator)
 
     ##

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

@@ -356 +356 @@
         if self.polygon is not None:
             # Inlet is polygon
-            inlet_region = 'polygon=%s' % (self.polygon) 
             self.exchange_indices = inside_polygon(points, self.polygon)
 

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

@@ -532 +532 @@
         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):