Changeset 9285

Timestamp:

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

Author:

davies

Message:

Updates to mass conservation

File:

• trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (4 diffs)

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

@@ -293 +293 @@
         self.call=1 
 
+        # List to store the volumes we computed before
+        self.volume_history=[] 
+        
         # Work arrays [avoid allocate statements in compute_fluxes or extrapolate_second_order]
         self.edge_flux_work=num.zeros(len(self.edge_coordinates[:,0])*3)
@@ -1384 +1387 @@
         else:
             water_volume = receive(0)
-        
+       
+        self.volume_history.append(water_volume) 
         return water_volume
 
@@ -2572 +2576 @@
         """
         from anuga import myid
+
+        if(self.flow_algorithm=='tsunami'):
+            print ' '
+            print 'Warning: Volume computations do not account for changing porosity in tsunami algorithm'
+
         # Compute the volume
         Vol=self.get_water_volume()
@@ -2579 +2588 @@
         
         if(verbose and myid==0):
-            print '    Volume is:', Vol
-            print '    Boundary Flux integral: ', fluxIntegral
-            print '    (rate + inlet) Fractional Step volume integral : ', fracIntegral
-            print '    Volume - (boundary and fractional step inflows):',  Vol- fluxIntegral -fracIntegral
+            print ' '
+            print '    Volume V is:', Vol
+            print '    Boundary Flux integral BF: ', fluxIntegral
+            print '    (rate + inlet) Fractional Step volume integral FS: ', fracIntegral
+            print '    V - BF - FS - InitialVolume :',  Vol- fluxIntegral -fracIntegral - self.volume_history[0]
+            print ' '
 
         if(returnStats):