Changeset 1636 for inundation/ga/storm_surge/pyvolution/shallow_water.py

Timestamp:

Jul 25, 2005, 4:48:54 PM (20 years ago)

Author:

ole

Message:

Fixed 'lost mass' conservation problem and added unit test, that reveals it.

File:

• inundation/ga/storm_surge/pyvolution/shallow_water.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -615 +615 @@
         if hc[k] < domain.minimum_allowed_height:
             #Control stage
-            wc[k] = zc[k]
+            if hc[k] < domain.epsilon:
+                wc[k] = zc[k] # Contain 'lost mass' error
 
             #Control momentum
@@ -635 +636 @@
     from shallow_water_ext import protect
 
-    protect(domain.minimum_allowed_height, wc, zc, xmomc, ymomc)
+    protect(domain.minimum_allowed_height, domain.epsilon,
+            wc, zc, xmomc, ymomc)