         szp[mw] = (1+z)/2*beta[mw];
     }
 
-    for(mq = 0; mq < meqn; mq++)
+    for(int mq = 0; mq < meqn; mq++)
     {
         bmasdq[mq]  = szm[0]*waveb[mq];
         bmasdq[mq] += szm[1]*waveb[meqn + mq];

    beta[2] = (delf3/(s3-s1))-(s1*delf1/(s3-s1));

    double wave[9];
    waveb[0]  = 1;
    waveb[mu] = s2;
    waveb[mv] = s1;

    waveb[meqn + 0]  = 0;
    waveb[meqn + mu] = 1;
    waveb[meqn + mv] = 0;

    waveb[2*meqn + 0]  = 1;
    waveb[2*meqn + mu] = s2;
    waveb[2*meqn + mv] = s3;


    double szm[3], szp[3];

    double ur = hur/hr;
    double vr = hvr/hr;

#if 0
    double eta = hr  + aux2[0];
    double topo1 = aux1[0];
    double topo3 = aux3[0];
#endif    

    /* Construct Roe variables */
    double hrs = sqrt(hr);
