Changeset 9222

Timestamp:

Jun 27, 2014, 10:09:30 AM (11 years ago)

Author:

steve

Message:

changed get_total_volume to get_water_volume in shallow_water_domain

Location:

trunk/anuga_core

Files:

• source/anuga/shallow_water/shallow_water_domain.py (modified) (3 diffs)
• validation_tests/analytical_exact/trapezoidal_channel/numerical_channel_floodplain.py (modified) (1 diff)

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

@@ -1295 +1295 @@
 
 
-    def get_total_volume(self):
+    def get_water_volume(self):
     
         from anuga import myid, numprocs, send, receive, barrier
@@ -1309 +1309 @@
             
         if myid == 0:
-            total_volume = volume
+            water_volume = volume
             for i in range(1,numprocs):
                 remote_volume = receive(i)
-                total_volume = total_volume + remote_volume
+                water_volume = water_volume + remote_volume
         else:
             send(volume,0)
@@ -1320 +1320 @@
         if myid == 0:
             for i in range(1,numprocs):
-                send(total_volume,i)
+                send(water_volume,i)
         else:
-            total_volume = receive(0)
-        
-        return total_volume
+            water_volume = receive(0)
+        
+        return water_volume
 
 

trunk/anuga_core/validation_tests/analytical_exact/trapezoidal_channel/numerical_channel_floodplain.py

@@ -183 +183 @@
     
 #     if numpy.allclose(t,0.0):
-#         exact_volume = domain.get_total_volume()
+#         exact_volume = domain.get_water_volume()
 #     else:
 #         exact_volume = exact_volume + Qin*10.0
-#         
-#     total_volume= domain.get_total_volume()
-    
-    
-    #if myid == 0 and verbose: print anuga.indent,'total volume - exact_volume ', total_volume - exact_volume   
+#          
+#     water_volume= domain.get_water_volume()
+#     
+#     
+#     if myid == 0 and verbose: print anuga.indent,'relative error water volume  exact_volume ', (water_volume - exact_volume)/exact_volume   
 
 domain.sww_merge(delete_old=True)