Changeset 6159

Timestamp:

Jan 14, 2009, 11:02:14 AM (15 years ago)

Author:

wilson

Message:

updated 14/01/09

File:

• anuga_work/development/anuga_1d/channel_domain_ext.c (modified) (6 diffs)

anuga_work/development/anuga_1d/channel_domain_ext.c

@@ -60 +60 @@
     double zphalf,zmhalf,hleftstar,hrightstar;
     double fluxtemp1,fluxtemp0,speedtemp;
+    double batemp;
 
     zmhalf = max(q_leftm[2],q_leftp[2]);
@@ -133 +134 @@
     } else {
         edgeflux[0] = s_maxl*flux_left[0] - s_minl*flux_right[0];
-//      edgeflux[0] += s_maxl*s_minl*(a_leftp-a_leftm);
+
+        batemp = (h_leftp)*b_leftp-(h_leftm)*b_leftm;
+
+        edgeflux[0] += s_maxl*s_minl*batemp;
         edgeflux[0] /= denom;
         edgeflux[1] = s_maxl*flux_left[1] - s_minl*flux_right[1];
@@ -141 +145 @@
 
     }
-    
         fluxtemp0 = edgeflux[0];
         fluxtemp1 = edgeflux[1];
@@ -148 +151 @@
     // Flux formulas for right hand side
     flux_left[0] = d_rightm;
-    flux_left[1] = u_rightm*d_rightm + 0.5*g*h_rightm*h_rightm;
+    flux_left[1] = u_rightm*d_rightm + 0.5*g*h_rightm*h_rightm*b_rightm;
 
     flux_right[0] = d_rightp;
-    flux_right[1] = u_rightp*d_rightp + 0.5*g*h_rightp*h_rightp;
+    flux_right[1] = u_rightp*d_rightp + 0.5*g*h_rightp*h_rightp*b_rightp;
     
    
@@ -161 +164 @@
     } else {
         edgeflux[0] = s_maxr*flux_left[0] - s_minr*flux_right[0];
-//              edgeflux[0] += s_maxr*s_minr*(a_rightp-a_rightm);
+
+        batemp = (h_rightp)*b_rightp-(h_rightm)*b_rightm;
+
+        edgeflux[0] += s_maxr*s_minr*batemp;
         edgeflux[0] /= denom;
         edgeflux[1] = s_maxr*flux_left[1] - s_minr*flux_right[1];
@@ -174 +180 @@
     edgeflux[1]=edgeflux[1]-fluxtemp1;
     
-    
-     
-    edgeflux[1]-=0.5*g*h_rightm*h_rightm-0.5*g*hrightstar*hrightstar+0.5*g*hleftstar*hleftstar-0.5*g*h_leftp*h_leftp;
-
-    
-
+   
+     edgeflux[1]-=0.5*g*h_rightm*h_rightm*b_rightm-0.5*g*hrightstar*hrightstar*b_rightm+0.5*g*hleftstar*hleftstar*b_leftp-0.5*g*h_leftp*h_leftp*b_leftp;
+
+   
+     //edgeflux[1]-=0.5*g*h_rightm*h_rightm-0.5*g*hrightstar*hrightstar+0.5*g*hleftstar*hleftstar-0.5*g*h_leftp*h_leftp;
       
-
      //edgeflux[1]-=0.5*g*b_rightm*h_rightm*h_rightm-0.5*g*b_leftp*h_leftp*h_leftp;
                 // Maximal wavespeed