Changeset 3876 for anuga_core/source/anuga/shallow_water

Timestamp:

Oct 26, 2006, 5:31:27 PM (19 years ago)

Author:

steve

Message:

Added parameter alpha_balance to config.py to deal with large jumps in bed

Location:

anuga_core/source/anuga/shallow_water

Files:

• shallow_water_domain.py (modified) (3 diffs)
• shallow_water_ext.c (modified) (5 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -92 +92 @@
 from anuga.config import g, beta_h, beta_w, beta_w_dry,\
      beta_uh, beta_uh_dry, beta_vh, beta_vh_dry
+from anuga.config import alpha_balance
 
 
@@ -143 +144 @@
         self.beta_vh_dry = beta_vh_dry
         self.beta_h      = beta_h
+        self.alpha_balance = alpha_balance
 
         self.flux_function = flux_function_central
@@ -1212 +1214 @@
 
     from shallow_water_ext import balance_deep_and_shallow
-    balance_deep_and_shallow(wc, zc, hc, wv, zv, hv, hvbar,
+    balance_deep_and_shallow(domain, wc, zc, hc, wv, zv, hv, hvbar,
                              xmomc, ymomc, xmomv, ymomv)
 

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -423 +423 @@
                               double* ymomc,
                               double* xmomv,
-                              double* ymomv) {
+                              double* ymomv,
+                              double alpha_balance) {
 
   int k, k3, i;
@@ -463 +464 @@
       //else
       //  alpha = max( min( hc[k]/dz, 1.0), 0.0 );
-      alpha = max( min( 2.0*hmin/dz, 1.0), 0.0 );
+      alpha = max( min( alpha_balance*hmin/dz, 1.0), 0.0 );
     else
       alpha = 1.0;  //Flat bed
@@ -1569 +1570 @@
     *xmomv,
     *ymomv;
+  
+  PyObject *domain, *Tmp;
+    
+  double alpha_balance = 2.0;
 
   int N; //, err;
 
   // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "OOOOOOOOOOO",
+  if (!PyArg_ParseTuple(args, "OOOOOOOOOOOO",
+                        &domain,
                         &wc, &zc, &hc,
                         &wv, &zv, &hv, &hvbar,
@@ -1581 +1587 @@
   }  
           
+  // Pull out parameters
+  Tmp = PyObject_GetAttrString(domain, "alpha_balance");
+  if (!Tmp) {
+    PyErr_SetString(PyExc_RuntimeError, "shallow_water_ext.c: balance_deep_and_shallow could not obtain object alpha_balance from domain");
+    return NULL;
+  }  
+  alpha_balance = PyFloat_AsDouble(Tmp);
+  Py_DECREF(Tmp);
+
 
   N = wc -> dimensions[0];
@@ -1592 +1607 @@
                             (double*) hv -> data,
                             (double*) hvbar -> data,
-                            (double*) xmomc -> data,
+                                (double*) xmomc -> data,
                             (double*) ymomc -> data,
                             (double*) xmomv -> data,
-                            (double*) ymomv -> data);
+                            (double*) ymomv -> data,
+                            alpha_balance);