Changeset 9023

Timestamp:

Nov 14, 2013, 12:13:43 AM (11 years ago)

Author:

davies

Message:

Increasing velocity extrapolation accuracy near depth gradients

Location:

trunk/anuga_work/development/gareth

Files:

• experimental/bal_and/swb2_domain_ext.c (modified) (1 diff)
• tests/shallow_steep_slope/channel_SU_2plot.py (modified) (2 diffs)
• tests/shallow_steep_slope/channel_SU_sparse.py (modified) (1 diff)

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

@@ -1256 +1256 @@
       // REDEFINE hfactor for momentum terms -- make MORE first order
       // Reduce beta linearly from 1-0 between depth ratio of 0.6-0.4
-      hfactor= max(0., min(5*max(hmin,0.0)/max(hc,1.0e-06)-2.0, 
-                           min(5*max(hc,0.)/max(hmax,1.0e-06)-2.0, 1.0))
-                  );
+      //hfactor= max(0., min(5*max(hmin,0.0)/max(hc,1.0e-06)-2.0, 
+      //                     min(5*max(hc,0.)/max(hmax,1.0e-06)-2.0, 1.0))
+      //            );
       //hfactor= max(0., min(5*max(hmin,0.0)/max(hmax,1.0e-06)-2.0, 
       //                      1.0));
-      hfactor=min( max(hmin,0.)/(max(hmin,0.)+10.*minimum_allowed_height), hfactor);
+      //hfactor=min( max(hmin,0.)/(max(hmin,0.)+10.*minimum_allowed_height), hfactor);
       
       //-----------------------------------

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

@@ -47 +47 @@
 pyplot.ion()
 
-line, = pyplot.plot( (p2.x[v].min(),p2.x[v].max()) ,( (p2.stage[:,v]-p2.elev[1,v]).max(),(p2.stage[:,v]-p2.elev[1,v]).min() ) )
+line, = pyplot.plot( (p2.x[v].min(),p2.x[v].max()) ,( (p2.stage[:,v]-p2.elev[v]).max(),(p2.stage[:,v]-p2.elev[v]).min() ) )
 line.set_label('Numerical')
 pyplot.plot( (0,100),(dana,dana), 'r',label='Analytical' )
@@ -55 +55 @@
 for i in range(p2.xmom.shape[0]):
     line.set_xdata(p2.x[v])
-    line.set_ydata(p2.stage[i,v]-p2.elev[1,v])
+    line.set_ydata(p2.stage[i,v]-p2.elev[v])
     pyplot.draw()
     pyplot.title('Flow depth: should be converging to steady uniform flow ' )

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