         fwave[3+mv] = beta[1];
 
         fwave[6]    = beta[2];
-        fwave[6+mu] = beta[2]*s2[2];
+        fwave[6+mu] = beta[2]*s[2];
         fwave[6+mv] = beta[2]*vr;    
     }
     

        
        /* Flux differences */
        double fluxdiff[3];
        double phir = grav*hr*hr/2 + hur*hur/hr;
        double phil = grav*hl*hl/2 + hul*hul/hl;

        fluxdiff[0] = (hr*ur) - (hl*ul);
        fluxdiff[1] = phir - phil + grav*hbar*(br - bl);
        fluxdiff[2] = hr*ur*vr - hl*ul*vl;

        /* Wave strengths */



        /* 1 wave speed of left state */
        double sl = ul - sqrt(s_grav*hl);    

        /* 2 wave speed of right state */
        double sr = ur + sqrt(s_grav*hr);    

        /* Roe speeds */
        double uhat = (sqrt(s_grav*hl)*ul + 
                       sqrt(s_grav*hr)*ur)/(sqrt(s_grav*hr) + sqrt(s_grav*hl));
        double chat = sqrt(s_grav*(hr + hl))/2;

        /* Compute wave speeds by comparing speeds above */
        s[0] = min(sl, uhat - chat);
