[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit dcc4947a23787964a3b8ec1197d72a19290a9552
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Dec 10 07:43:48 2008 +1100

    Bug fix for HLLC riemann solver
    
    darcs-hash:20081209204348-d4795-9e5444677037bd14c8620b51f54a015c9a4e1d1f.gz

diff --git a/src/river.c b/src/river.c
index a12b741..50145c1 100644
--- a/src/river.c
+++ b/src/river.c
@@ -156,10 +156,8 @@ static void riemann_hllc (const gdouble * uL, const gdouble * uR,
     gdouble fL[3], fR[3];
     flux (uL, g, fL);
     flux (uR, g, fR);
-    guint i;
-    for (i = 0; i < 2; i++)
-      f[i] = (SR*fL[i] - SL*fR[i] + SL*SR*(uR[i] - uL[i]))/(SR - SL);
-
+    f[0] = (SR*fL[0] - SL*fR[0] + SL*SR*(uR[0] - uL[0]))/(SR - SL);
+    f[1] = (SR*fL[1] - SL*fR[1] + SL*SR*(uR[0]*uR[1] - uL[0]*uL[1]))/(SR - SL);
     gdouble SM = ((SL*uR[0]*(uR[1] - SR) - SR*uL[0]*(uL[1] - SL))/
 		  (uR[0]*(uR[1] - SR) - uL[0]*(uL[1] - SL)));
     if (SL <= 0. && 0. <= SM)

-- 
Gerris Flow Solver