         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];

        bpasdq[mq] += max(sb[1],0.)*waveb[meqn + mq];
        bpasdq[mq] += max(sb[2],0.)*waveb[2*meqn + mq];
    }
}
#endif


__device__ cudaclaw_cuda_rpt2_t geoclaw_rpt2 = geoclaw_rpt2shallow;

void geoclaw_assign_rpt2(cudaclaw_cuda_rpt2_t *rpt2)
{

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