Changeset 8203

Timestamp:

Aug 31, 2011, 10:17:30 PM (13 years ago)

Author:

steve

Message:

Now swb_domain is calling a well balanced gravity calculation

Location:

trunk/anuga_core/source/anuga/shallow_water_balanced

Files:

• run_wave_shelf.py (modified) (2 diffs)
• swb_domain.py (modified) (3 diffs)
• swb_domain_ext.c (modified) (3 diffs)

trunk/anuga_core/source/anuga/shallow_water_balanced/run_wave_shelf.py

@@ -66 +66 @@
 #------------------------------------------------------------------------------
 depth1 = -100.0
-depth2 = -50.00
+depth2 = -30.00
 def topography(x,y):
     z = num.zeros_like(x)
@@ -80 +80 @@
 
         if x[i] > 100000.0:
-            z[i] = depth2*(1.0 - (x[i] - 75000.0)/50000)
+            z[i] = depth2*(1.0 - 1.1*(x[i] - 100000.0)/50000)
     return z
 

trunk/anuga_core/source/anuga/shallow_water_balanced/swb_domain.py

@@ -71 +71 @@
         self.quantities['height'].set_beta(1.0)
 
+        #--------------------------------------------
+        # Replace shallow water gravity forcing term
+        # with swb version
+        #--------------------------------------------
+        self.forcing_terms[1] = swb_gravity
+
 
     def check_integrity(self):
@@ -161 +167 @@
         v_C   = V.centroid_values
 
-        num_min = num.min(w_C-z_C)
-        if num_min < -1.0e-5:
-            print '**** num.min(w_C-z_C)', num_min
+        #num_min = num.min(w_C-z_C)
+        #if num_min < -1.0e-5:
+        #    print '**** num.min(w_C-z_C)', num_min
 
     
@@ -415 +421 @@
 ################################################################################
 
-def gravity(domain):
+def swb_gravity(domain):
     """Apply gravitational pull in the presence of bed slope
     Wrapper calls underlying C implementation
     """
 
-    from swb_domain_ext import gravity as gravity_c
+    from swb_domain_ext import gravity_c
+
+    #print "Using swb gravity"
 
     xmom_update = domain.quantities['xmomentum'].explicit_update
     ymom_update = domain.quantities['ymomentum'].explicit_update
 
-    stage = domain.quantities['stage']
+    stage     = domain.quantities['stage']
     elevation = domain.quantities['elevation']
 
 
-    stage = stage.vertex_values
+    stage     = stage.vertex_values
     elevation = elevation.vertex_values
 

trunk/anuga_core/source/anuga/shallow_water_balanced/swb_domain_ext.c

@@ -597 +597 @@
                         &xmom, &ymom)) {
     //&epsilon)) {
-    PyErr_SetString(PyExc_RuntimeError, "shallow_water_ext.c: gravity could not parse input arguments");
+    PyErr_SetString(PyExc_RuntimeError, "swb_domain_ext.c: gravity could not parse input arguments");
     return NULL;
   }
@@ -612 +612 @@
     k3 = 3*k;  // base index
     
-    // Get bathymetry
+    // Get stage
     w0 = ((double*) w -> data)[k3 + 0];
     w1 = ((double*) w -> data)[k3 + 1];
     w2 = ((double*) w -> data)[k3 + 2];
 
-
+    // Get water depth
     h0 = ((double*) w -> data)[k3 + 0] - ((double*) z -> data)[k3 + 0];
     h1 = ((double*) w -> data)[k3 + 1] - ((double*) z -> data)[k3 + 1];
@@ -630 +630 @@
     
     // Get average depth from centroid values
-    avg_h = 1.0/3.0* ( h0 + h1 +h2 );
+    avg_h = 1.0/3.0*( h0 + h1 +h2 );
     
     // Compute bed slope