Changeset 8169

Timestamp:

Mar 27, 2011, 11:55:41 AM (14 years ago)

Author:

steve

Message:

Fixed up update_centroids_of_velocities_and_height so that it doesn't change the conserved quantities

File:

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

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

@@ -591 +591 @@
         # might not have been setup
 
-        pass
-
         self.update_centroids_of_velocities_and_height()
 
@@ -630 +628 @@
         # Make sure boundary values of conserved quantites
         # are consistent with value of functions at centroids
-        self.distribute_to_vertices_and_edges()
+        #self.distribute_to_vertices_and_edges()
         Z.set_boundary_values_from_edges()
-        W.set_boundary_values_from_edges()
-        UH.set_boundary_values_from_edges()
-        VH.set_boundary_values_from_edges()
+
+        #W.set_boundary_values_from_edges()
+        #UH.set_boundary_values_from_edges()
+        #VH.set_boundary_values_from_edges()
 
         # Update height values
         H.set_values(W.centroid_values-Z.centroid_values, location='centroids')
-        H.set_boundary_values(W.boundary_values-Z.boundary_values)
+        H.set_boundary_values( num.where(W.boundary_values-Z.boundary_values>=0,
+                                         W.boundary_values-Z.boundary_values, 0.0))
 
         assert num.min(H.centroid_values) >= 0