             /* Start at first non-ghost interior cell */
             int I = (iy + mbc)*ys + ix + mbc - 1;
 
-            double *s = start;
-            double *wave = s + mwaves;
+            double *const s = start;
+            double *const wave = s + mwaves;
             for(int mw = 0; mw < mwaves; mw++)
             {
                 /* ------------------------------- Y-directions --------------------------- */

            qr[mq] = qold[I_q];

            amdq[mq] = amdq_trans[I_q];
            apdq[mq] = apdq_trans[I_q];
        }            
        
        for(int imp = 0; imp < 2; imp++)

            ql[mq] = qold[I_q-1];
            qr[mq] = qold[I_q];

            //amdq[mq] = amdq_trans[I_q];
            apdq[mq] = apdq_trans[I_q];
        }            

