Changeset 8451 for trunk

Timestamp:

Jun 20, 2012, 9:48:35 PM (12 years ago)

Author:

steve

Message:

Allow removal of limit Q>0 for inlet_operator

File:

• trunk/anuga_core/source/anuga_parallel/parallel_inlet_operator.py (modified) (2 diffs)

trunk/anuga_core/source/anuga_parallel/parallel_inlet_operator.py

@@ -90 +90 @@
         # Only the master proc calculates the volume
 
+        current_volume = self.inlet.get_global_total_water_volume()
+
         if self.myid == self.master_proc:
             timestep = self.domain.get_timestep()
@@ -99 +101 @@
             volume = 0.5*(Q1+Q2)*timestep
 
-            assert 0.5*(Q1+Q2) >= 0.0, 'Q < 0: Water to be removed from an inlet!'
+            assert current_volume + volume >= 0.0 , 'Requesting too much water to be removed from an inlet!'
 
             #print "Volume to be removed from Inlet = " + str(volume)