Changeset 3696

Timestamp:

Oct 4, 2006, 5:38:07 PM (18 years ago)

Author:

steve

Message:

Added run_sw_rectangle in examples to show improvement in dealing with wet/dry interface. Controlled by beta's for cell near interface

Location:

anuga_core/source

Files:

• anuga/examples/run_sw_rectangle.py (added)
• anuga/shallow_water/shallow_water_ext.c (modified) (6 diffs)
• anuga_parallel/run_parallel_sw_rectangle.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -630 +630 @@
     *ymom_vertex_values,
         *elevation_vertex_values;
-  PyObject *domain, *Tmp_w, *Tmp_w_dry, *Tmp_uh, *Tmp_uh_dry, *Tmp_vh, *Tmp_vh_dry;
+  PyObject *domain, *Tmp;
   //Local variables
   double a, b;//gradient vector, not stored but used to calculate vertex values from centroids
@@ -639 +639 @@
   double hc, h0, h1, h2;
   double beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry, beta_tmp;
+  double minimum_allowed_height;
   //provisional jumps from centroids to v'tices and safety factor re limiting
   //by which these jumps are limited
@@ -661 +662 @@
 
   //get the safety factor beta_w, set in the config.py file. This is used in the limiting process
-  Tmp_w = PyObject_GetAttrString(domain, "beta_w");
-  if (!Tmp_w)
-    return NULL;
-  beta_w = PyFloat_AsDouble(Tmp_w);
-  Py_DECREF(Tmp_w);
+  Tmp = PyObject_GetAttrString(domain, "beta_w");
+  if (!Tmp)
+    return NULL;
+  beta_w = PyFloat_AsDouble(Tmp);
+  Py_DECREF(Tmp);
   
-  Tmp_w_dry = PyObject_GetAttrString(domain, "beta_w_dry");
-  if (!Tmp_w_dry)
-    return NULL;
-  beta_w_dry = PyFloat_AsDouble(Tmp_w_dry);
-  Py_DECREF(Tmp_w_dry);
+  Tmp = PyObject_GetAttrString(domain, "beta_w_dry");
+  if (!Tmp)
+    return NULL;
+  beta_w_dry = PyFloat_AsDouble(Tmp);
+  Py_DECREF(Tmp);
   
-  Tmp_uh = PyObject_GetAttrString(domain, "beta_uh");
-  if (!Tmp_uh)
-    return NULL;
-  beta_uh = PyFloat_AsDouble(Tmp_uh);
-  Py_DECREF(Tmp_uh);
+  Tmp = PyObject_GetAttrString(domain, "beta_uh");
+  if (!Tmp)
+    return NULL;
+  beta_uh = PyFloat_AsDouble(Tmp);
+  Py_DECREF(Tmp);
   
-  Tmp_uh_dry = PyObject_GetAttrString(domain, "beta_uh_dry");
-  if (!Tmp_uh_dry)
-    return NULL;
-  beta_uh_dry = PyFloat_AsDouble(Tmp_uh_dry);
-  Py_DECREF(Tmp_uh_dry); 
-
-  Tmp_vh = PyObject_GetAttrString(domain, "beta_vh");
-  if (!Tmp_vh)
-    return NULL;
-  beta_vh = PyFloat_AsDouble(Tmp_vh);
-  Py_DECREF(Tmp_vh);
+  Tmp = PyObject_GetAttrString(domain, "beta_uh_dry");
+  if (!Tmp)
+    return NULL;
+  beta_uh_dry = PyFloat_AsDouble(Tmp);
+  Py_DECREF(Tmp); 
+
+  Tmp = PyObject_GetAttrString(domain, "beta_vh");
+  if (!Tmp)
+    return NULL;
+  beta_vh = PyFloat_AsDouble(Tmp);
+  Py_DECREF(Tmp);
   
-  Tmp_vh_dry = PyObject_GetAttrString(domain, "beta_vh_dry");
-  if (!Tmp_vh_dry)
-    return NULL;
-  beta_vh_dry = PyFloat_AsDouble(Tmp_vh_dry);
-  Py_DECREF(Tmp_vh_dry);
+  Tmp = PyObject_GetAttrString(domain, "beta_vh_dry");
+  if (!Tmp)
+    return NULL;
+  beta_vh_dry = PyFloat_AsDouble(Tmp);
+  Py_DECREF(Tmp);
+  
+  Tmp = PyObject_GetAttrString(domain, "minimum_allowed_height");
+  if (!Tmp)
+    return NULL;
+  minimum_allowed_height = PyFloat_AsDouble(Tmp);
+  Py_DECREF(Tmp);  
   
   number_of_elements = stage_centroid_values -> dimensions[0];
@@ -779 +786 @@
           hmin = qmin;
           beta_tmp = beta_w;
-          if (hmin<0.001)
+          if (hmin<minimum_allowed_height)
                 beta_tmp = beta_w_dry;
       limit_gradient(dqv,qmin,qmax,beta_tmp);//the gradient will be limited
@@ -804 +811 @@
       find_qmin_and_qmax(dq0,dq1,dq2,&qmin,&qmax);
           beta_tmp = beta_uh;
-          if (hmin<0.001)
+          if (hmin<minimum_allowed_height)
                 beta_tmp = beta_uh_dry;
       limit_gradient(dqv,qmin,qmax,beta_tmp);//the gradient will be limited
@@ -829 +836 @@
       find_qmin_and_qmax(dq0,dq1,dq2,&qmin,&qmax);
           beta_tmp = beta_vh;
-          if (hmin<0.001)
+          if (hmin<minimum_allowed_height)
                 beta_tmp = beta_vh_dry;
       limit_gradient(dqv,qmin,qmax,beta_tmp);//the gradient will be limited

anuga_core/source/anuga_parallel/run_parallel_sw_rectangle.py

@@ -117 +117 @@
 domain.beta_vh_dry = 0.2
 
+domain.beta_w      = 0.9
+domain.beta_w_dry  = 0.9
+domain.beta_uh     = 0.9
+domain.beta_uh_dry = 0.9
+domain.beta_vh     = 0.9
+domain.beta_vh_dry = 0.9
+
 yieldstep = 0.005
 finaltime = 1.0