Changeset 9281

Timestamp:

Aug 5, 2014, 12:11:23 PM (11 years ago)

Author:

davies

Message:

Adding fractional_step_volume_influx to track mass addition by operators

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/generic_domain.py (modified) (1 diff)
• operators/rate_operators.py (modified) (2 diffs)
• operators/test_rate_operators.py (modified) (9 diffs)
• structures/inlet_operator.py (modified) (1 diff)
• structures/test_inlet_operator.py (modified) (4 diffs)

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

@@ -184 +184 @@
         # Create an empty list for fractional step operators
         self.fractional_step_operators = []
-
+        self.fractional_step_volume_influx=0.
 
 

trunk/anuga_core/source/anuga/operators/rate_operators.py

@@ -79 +79 @@
         # Mass tracking
         self.local_rate=0.
-        self.rate_integral=0. 
+        #self.volume_added=self.domain.fractional_step_volume_influx
 
     def __call__(self):
@@ -139 +139 @@
                 self.stage_c[indices] = num.maximum(self.stage_c[indices] \
                        + factor*rate*timestep, self.elev_c[indices])
-
-        self.rate_integral=self.rate_integral+self.local_rate
+        # Update mass inflows from fractional steps
+        self.domain.fractional_step_volume_influx+=self.local_rate
 
     def get_non_spatial_rate(self, t=None):

trunk/anuga_core/source/anuga/operators/test_rate_operators.py

@@ -87 +87 @@
         assert num.allclose(domain.quantities['xmomentum'].centroid_values, 0.0)
         assert num.allclose(domain.quantities['ymomentum'].centroid_values, 0.0)
-        assert num.allclose(operator.rate_integral, factor*domain.timestep*(rate*domain.areas[indices]).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, factor*domain.timestep*(rate*domain.areas[indices]).sum())
 
  
@@ -149 +149 @@
         assert num.allclose(domain.quantities['xmomentum'].centroid_values, 0.0)
         assert num.allclose(domain.quantities['ymomentum'].centroid_values, 0.0)
-        assert num.allclose(operator.rate_integral, factor*domain.timestep*(rate*domain.areas[indices]).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, factor*domain.timestep*(rate*domain.areas[indices]).sum())
 
 
@@ -271 +271 @@
         assert num.allclose(domain.quantities['xmomentum'].centroid_values, 0.0)
         assert num.allclose(domain.quantities['ymomentum'].centroid_values, 0.0)
-        assert num.allclose(operator.rate_integral, ((d-1.)*domain.areas[indices]).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, ((d-1.)*domain.areas[indices]).sum())
 
 
@@ -301 +301 @@
         assert num.allclose(domain.quantities['xmomentum'].centroid_values, 0.0)
         assert num.allclose(domain.quantities['ymomentum'].centroid_values, 0.0)
-        assert num.allclose(operator.rate_integral, (d*domain.areas[indices]).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, (d*domain.areas[indices]).sum())
 
 
@@ -373 +373 @@
         assert num.allclose(domain.quantities['xmomentum'].centroid_values, 0.0)
         assert num.allclose(domain.quantities['ymomentum'].centroid_values, 0.0)
-        assert num.allclose(operator.rate_integral, ((d-1.)*domain.areas[indices]).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, ((d-1.)*domain.areas[indices]).sum())
 
         domain.set_starttime(30.0)
@@ -560 +560 @@
         assert num.allclose(Q_ex_all, Q_all)
         assert num.allclose(Q_ex_full, Q_full)
-        assert num.allclose(operator.rate_integral, ((d-1.)*domain.areas).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, ((d-1.)*domain.areas).sum())
 
     def test_rate_operator_functions_spatial_indices(self):
@@ -639 +639 @@
         assert num.allclose(domain.quantities['ymomentum'].centroid_values, 0.0)
         assert num.allclose(Q_ex, Q)
-        assert num.allclose(operator.rate_integral, ((d-1.)*domain.areas[indices]).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, ((d-1.)*domain.areas[indices]).sum())
 
 
@@ -719 +719 @@
         assert num.allclose(domain.quantities['ymomentum'].centroid_values, 0.0)
         assert num.allclose(Q_ex, Q)
-        assert num.allclose(operator.rate_integral, ((d-1.)*domain.areas[indices]).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, ((d-1.)*domain.areas[indices]).sum())
 
 
@@ -800 +800 @@
         assert num.allclose(domain.quantities['ymomentum'].centroid_values, 0.0)
         assert num.allclose(Q_ex, Q)
-        assert num.allclose(operator.rate_integral, ((d-1.)*domain.areas[indices]).sum())
+        assert num.allclose(domain.fractional_step_volume_influx, ((d-1.)*domain.areas[indices]).sum())
 
 if __name__ == "__main__":

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

@@ -82 +82 @@
         if volume >= 0.0 :
             self.inlet.set_stages_evenly(volume)
+            self.domain.fractional_step_volume_influx+=volume
             if self.velocity is not None:
                 depths = self.inlet.get_depths()
                 self.inlet.set_xmoms(self.inlet.get_xmoms()+depths*self.velocity[0])
                 self.inlet.set_ymoms(self.inlet.get_ymoms()+depths*self.velocity[1])
-                
         elif current_volume + volume >= 0.0 :
             depth = (current_volume + volume)/total_area
             self.inlet.set_depths(depth)
+            self.domain.fractional_step_volume_influx+=volume
         else: #extracting too much water!
             self.inlet.set_depths(0.0)
+            self.domain.fractional_step_volume_influx-=current_volume
             self.applied_Q = current_volume/timestep
 

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

@@ -126 +126 @@
 
         assert numpy.allclose((Q1+Q2)*finaltime, vol1-vol0, rtol=1.0e-8) 
+        assert numpy.allclose((Q1+Q2)*finaltime, domain.fractional_step_volume_influx, rtol=1.0e-8) 
 
 
@@ -172 +173 @@
 
         assert numpy.allclose((Q1)*finaltime, vol1-vol0, rtol=1.0e-8)
+        assert numpy.allclose((Q1)*finaltime, domain.fractional_step_volume_influx, rtol=1.0e-8) 
 
 
@@ -235 +237 @@
         
         assert numpy.allclose(13.5, vol1-vol0, rtol=1.0e-8) 
+        assert numpy.allclose(vol1-vol0, domain.fractional_step_volume_influx, rtol=1.0e-8) 
                 
     def test_inlet_variable_Q_default(self):
@@ -296 +299 @@
 
         assert numpy.allclose(31.5, vol1-vol0, rtol=1.0e-8)
+        assert numpy.allclose(vol1-vol0, domain.fractional_step_volume_influx, rtol=1.0e-8) 
 
 # =========================================================================