Changeset 9008

Timestamp:

Oct 18, 2013, 5:37:29 PM (11 years ago)

Author:

davies

Message:

More work on dev_audusse

Location:

trunk/anuga_work/development/gareth

Files:

• experimental/bal_and/swb2_domain.py (modified) (1 diff)
• experimental/bal_and/swb2_domain_ext.c (modified) (3 diffs)
• tests/dam_break/plotme.py (modified) (1 diff)
• tests/shallow_steep_slope/channel_SU_sparse.py (modified) (1 diff)
• tests/urban_flow/ideal_urban.py (modified) (1 diff)
• tests/urban_flow/plotme.py (modified) (1 diff)

trunk/anuga_work/development/gareth/experimental/bal_and/swb2_domain.py

@@ -76 +76 @@
 
         self.beta_w=1.0
-        self.beta_w_dry=1.0
+        self.beta_w_dry=0.0
         self.beta_uh=1.0
         self.beta_uh_dry=0.0

trunk/anuga_work/development/gareth/experimental/bal_and/swb2_domain_ext.c

@@ -945 +945 @@
     
     // Try some Froude-number limiting in shallow depths
-    //dpth=max(stage_centroid_values[k] - elevation_centroid_values[k], 0.0);
-
-    //if(dpth<0.4){
-    //    // momnorm = momentum^2
-    //    momnorm=(xmom_centroid_values[k]*xmom_centroid_values[k]+
-    //             ymom_centroid_values[k]*ymom_centroid_values[k]);
-    //    
-    //    // vel^2 < constant*g*dpth [-- then multiply both sides by dpth^2]
-    //    if(momnorm > 4*9.81*dpth*dpth*dpth){
-    //        // Down-scale momentum so that Froude number < constant
-    //        tmp=sqrt((4*9.81*dpth*dpth*dpth)/momnorm);
-    //        xmom_centroid_values[k] *=tmp;
-    //        ymom_centroid_values[k] *=tmp;
-    //    }
-    //}
+    dpth=max(stage_centroid_values[k] - elevation_centroid_values[k], 0.0);
+
+    if(dpth<0.1){
+        // momnorm = momentum^2
+        momnorm=(xmom_centroid_values[k]*xmom_centroid_values[k]+
+                 ymom_centroid_values[k]*ymom_centroid_values[k]);
+        
+        // vel^2 < constant*g*dpth [-- then multiply both sides by dpth^2]
+        if(momnorm > 4*9.81*dpth*dpth*dpth){
+            // Down-scale momentum so that Froude number < constant
+            tmp=sqrt((4*9.81*dpth*dpth*dpth)/momnorm);
+            xmom_centroid_values[k] *=tmp;
+            ymom_centroid_values[k] *=tmp;
+        }
+    }
   }
 
@@ -1201 +1201 @@
           // Calculate heights of neighbouring cells
           hc = stage_centroid_values[k]  - elevation_centroid_values[k];
-          h0 = stage_centroid_values[k] - elevation_centroid_values[k0];
-          h1 = stage_centroid_values[k] - elevation_centroid_values[k1];
-          h2 = stage_centroid_values[k] - elevation_centroid_values[k2];
+          h0 = stage_centroid_values[k0] - elevation_centroid_values[k0];
+          h1 = stage_centroid_values[k1] - elevation_centroid_values[k1];
+          h2 = stage_centroid_values[k2] - elevation_centroid_values[k2];
           hmin = min(min(h0, min(h1, h2)), hc);
           //// GD FIXME: No longer needed? 
@@ -1290 +1290 @@
           find_qmin_and_qmax(dq0, dq1, dq2, &qmin, &qmax);
         
-          beta_tmp = 1.0;//beta_w_dry + (beta_w - beta_w_dry) * hfactor;
+          beta_tmp = beta_w_dry + (beta_w - beta_w_dry) * hfactor;
         
           

trunk/anuga_work/development/gareth/tests/dam_break/plotme.py

@@ -11 +11 @@
 
 
-p_dev = util2.get_output('dam_break_20131009_221446/dam_break.sww', 0.001)
+p_dev = util2.get_output('dam_break_20131018_165002/dam_break.sww', 0.001)
 p2_dev=util2.get_centroids(p_dev, velocity_extrapolation=True)
 

trunk/anuga_work/development/gareth/tests/shallow_steep_slope/channel_SU_sparse.py

@@ -36 +36 @@
 #------------------------------------------------------------------------------
 def topography(x, y):
-        return -x/10.  #+ 1.*(numpy.sin(x/10.) +abs(y-50.)/10.) -0.*(x>80.) # linear bed slope
+        return -x/10.  + 1.*(numpy.sin(x/10.) +abs(y-50.)/10.) -0.*(x>80.) # linear bed slope
 
 def stagetopo(x,y):

trunk/anuga_work/development/gareth/tests/urban_flow/ideal_urban.py

@@ -12 +12 @@
 #from anuga.structures.inlet_operator import Inlet_operator
 
-from balanced_dev import *
-from balanced_dev import create_domain_from_regions as create_domain_from_regions
+from bal_and import *
+from bal_and import create_domain_from_regions as create_domain_from_regions
 #from anuga_tsunami import *
 #from anuga_tsunami import create_domain_from_regions as create_domain_from_regions

trunk/anuga_work/development/gareth/tests/urban_flow/plotme.py

@@ -1 +1 @@
 ### Python code to do plotting of this experiment.
 
-import util
+from bal_and import plot_utils as util
 import numpy
 from matplotlib import pyplot as pyplot