Changeset 8352

Timestamp:

Feb 28, 2012, 10:00:43 AM (13 years ago)

Author:

steve

Message:

Work around for running rainfall forcing and kinematic viscosity. Tracked back to negative centroid height values (which we shouldn't get!).

Location:

trunk/anuga_core/source/anuga

Files:

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

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

@@ -396 +396 @@
     def statistics(self, *args, **kwargs):
         return self.mesh.statistics(*args, **kwargs)
+
+    def print_statistics(self, *args, **kwargs):
+        print self.statistics(*args, **kwargs)
         
     def get_extent(self, *args, **kwargs):
@@ -1021 +1024 @@
 
         return msg
+
+    def print_timestepping_statistics(self, track_speeds=False,
+                                      triangle_id=None):
+        print self.timestepping_statistics(track_speeds,
+                                      triangle_id)
+
+
+        
+    def print_boundary_statistics(self, quantities=None, tags=None):
+        print self.boundary_statistics(quantities, tags)
 
     def write_boundary_statistics(self, quantities=None, tags=None):

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

@@ -662 +662 @@
 
         # Update height values
-        H.set_values(W.centroid_values-Z.centroid_values, location='centroids')
+        H.set_values( num.where(W.centroid_values-Z.centroid_values>=0,
+                                W.centroid_values-Z.centroid_values, 0.0), location='centroids')
         H.set_boundary_values( num.where(W.boundary_values-Z.boundary_values>=0,
                                          W.boundary_values-Z.boundary_values, 0.0))