Changeset 3876

Timestamp:

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

Author:

steve

Message:

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

Location:

anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/realtime_visualisation_new.py (modified) (1 diff)
• anuga/config.py (modified) (1 diff)
• anuga/examples/island.py (modified) (6 diffs)
• anuga/examples/netherlands.py (modified) (3 diffs)
• anuga/shallow_water/shallow_water_domain.py (modified) (3 diffs)
• anuga/shallow_water/shallow_water_ext.c (modified) (5 diffs)
• anuga_parallel/run_parallel_sw_rectangle.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/realtime_visualisation_new.py

@@ -210 +210 @@
 
         #print 'update bed image'
-        if qname=='elevation':
-            self.pos[:,2] = self.pos[:,2]+1.0e-2
+        if qname=='stage':
+            self.pos[:,2] = self.pos[:,2] - self.domain.visualise_wet_dry_cutoff
 
         self.vpython_z_models[qname].pos    = self.pos

anuga_core/source/anuga/config.py

@@ -81 +81 @@
 beta_h      = 0.2
 
+alpha_balance = 2.0
 
 CFL = 1.0  #FIXME (ole): Is this in use yet??

anuga_core/source/anuga/examples/island.py

@@ -36 +36 @@
                           filename = 'island.msh' ,
                           interior_regions=[ ([[50,25], [70,25], [70,75], [50,75]], 1.0)]
-                          #interior_holes=[[50,25], [70,25], [70,75], [50,75]],
+                          #interior_holes=[[[50,25], [70,25], [70,75], [50,75]]],
                           )
 
@@ -45 +45 @@
 domain.smooth = False
 domain.set_name('island')
-domain.set_default_order(2)
+domain.default_order = 2
 
 
@@ -55 +55 @@
 # beta_h == 0.0 means that constant (1st order) gradients are introduced
 # on h. This is equivalent to the constant depth used previously.
-domain.beta_h     = 0.2
-domain.beta_w_dry = 0.2
-
+domain.beta_h     = 0.5
+domain.beta_w_dry = 0.0
+domain.alpha_balance = 10.0
+domain.minimum_allowed_height = 1.0e-4 
+domain.maximum_allowed_speed = 100.0 
+domain.minimum_storable_height = 1.0e-4 
+domain.visualise_wet_dry_cutoff = 5.0e-2
 
 #------------------------------------------------------------------------------
@@ -66 +70 @@
     z = 0*x
     for i in range(len(x)):
-        z[i] = 8*exp( -((x[i]-50)**2 + (y[i]-50)**2)/100 )
+        z[i] = 20*exp( -((x[i]-50)**2 + (y[i]-50)**2)/100 )
 
         #z[i] += 0.5*exp( -((x[i]-10)**2 + (y[i]-10)**2)/50 )
@@ -79 +83 @@
     return z
 
+stage_value = 15.0
 #domain.set_quantity('friction', 0.1)  #Honky dory
-domain.set_quantity('friction', 100.0)     #Creep
+domain.set_quantity('friction', 0.01)     #Creep
 domain.set_quantity('elevation', island)
-domain.set_quantity('stage', 1)
+domain.set_quantity('stage', stage_value)
 domain.max_timestep = 0.01
 
@@ -91 +96 @@
 
 Br = Reflective_boundary(domain)
-Bd = Dirichlet_boundary([1, 0, 0])
+Bd = Dirichlet_boundary([stage_value, 0, 0])
 
-domain.set_boundary({'left': Bd, 'right': Bd, 'top': Bd, 'bottom': Bd})
+domain.set_boundary({'left': Bd, 'right': Bd, 'top': Bd, 'bottom': Bd, 'exterior': Br})
 domain.check_integrity()
 

anuga_core/source/anuga/examples/netherlands.py

@@ -83 +83 @@
 N = 130 #size = 33800
 N = 600 #Size = 720000
-N = 50
+N = 40
+
 
 
@@ -105 +106 @@
 domain.beta_vh     = 1.0
 domain.beta_vh_dry = 0.2
+
+domain.alpha_balance = 10.0
 
 #Output params
@@ -139 +142 @@
     vis.updating['stage'] = True
     vis.qcolor['stage'] = (0.0,0.0,0.8)
-    vis.coloring['stage']= True
+    vis.coloring['stage']= False
 
 

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);
 
 

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
+#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