Changeset 1636 for inundation/ga/storm_surge/pyvolution/shallow_water_ext.c

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_ext.c (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water_ext.c

@@ -279 +279 @@
 int _protect(int N,
              double minimum_allowed_height,
+             double epsilon,
              double* wc,
              double* zc,
@@ -293 +294 @@
 
     if (hc < minimum_allowed_height) {
-      wc[k] = zc[k];
+      if (hc < epsilon) wc[k] = zc[k]; //Contain 'lost mass' error
       xmomc[k] = 0.0;
       ymomc[k] = 0.0;
@@ -301 +302 @@
   return 0;
 }
-
-
-
-
 
 
@@ -670 +667 @@
 
   int N;
-  double minimum_allowed_height;
+  double minimum_allowed_height, epsilon;
 
   // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "dOOOO",
+  if (!PyArg_ParseTuple(args, "ddOOOO",
                         &minimum_allowed_height,
+                        &epsilon,
                         &wc, &zc, &xmomc, &ymomc))
     return NULL;
@@ -682 +680 @@
   _protect(N,
            minimum_allowed_height,
+           epsilon,
            (double*) wc -> data,
            (double*) zc -> data,