@@ -72,7 +72,7 @@ void StateContainer::PushArray(IdefixArray4D<real>& in,
 }
 
 
-void StateContainer::AddAndStore(real wl, real wr, StateContainer & in) {
+void StateContainer::AddAndStore(const real wl, const real wr, StateContainer & in) {
   idfx::pushRegion("StateContainer::AddAndStore");
 
   if(in.stateVector.size() != this->stateVector.size()) {
 
@@ -30,7 +30,7 @@ class StateContainer {
   void CopyFrom(StateContainer &);    // Return a deepcopy of the current state container
   void AllocateAs(StateContainer &);    // Return a deepcopy of the current state container
   void PushArray(IdefixArray4D<real> &, State::TypeLocation, std::string);
-  void AddAndStore(real, real, StateContainer&);
+  void AddAndStore(const real, const real, StateContainer&);
 
 
  private:
 
@@ -284,7 +284,7 @@ void Hydro::HlldMHD() {
 
 #if HAVE_ENERGY
         real Uhll[NVAR];
-        real vs, pts, sqrL, sqrR, vsL, vsR, wsL, wsR;
+        real pts, sqrL, sqrR, vsL, vsR, wsL, wsR;
 
         // 3c. Compute U*(L), U^*(R)
         scrh = ONE_F/(sr - sl);
 
@@ -183,31 +183,33 @@ class SlopeLimiter {
         real dvp = Vc(nv,k,j,i)-Vc(nv,k-koffset,j-joffset,i-ioffset);
 
         real dv;
+        /*
         if(shockFlattening) {
-          if(flags(k-koffset,j-joffset,i-ioffset) == FlagShock::Shock) {
-            // Force slope limiter to minmod
+          if(flags(k,j,i) == FlagShock::Shock) {
             dv = MinModLim(dvp,dvm);
           } else {
             dv = PLMLim(dvp,dvm);
           }
         } else { // No shock flattening
+        */
           dv = PLMLim(dvp,dvm);
-        }
+        //}
 
         vL[nv] = Vc(nv,k-koffset,j-joffset,i-ioffset) + HALF_F*dv;
 
         dvm = dvp;
         dvp = Vc(nv,k+koffset,j+joffset,i+ioffset) - Vc(nv,k,j,i);
-
+/*
         if(shockFlattening) {
           if(flags(k,j,i) == FlagShock::Shock) {
             dv = MinModLim(dvp,dvm);
           } else {
             dv = PLMLim(dvp,dvm);
           }
         } else { // No shock flattening
+        */
           dv = PLMLim(dvp,dvm);
-        }
+        //}
 
         vR[nv] = Vc(nv,k,j,i) - HALF_F*dv;
       } else if constexpr(order == 3) {
Original file line number	Diff line number	Diff line change
@@ -72,7 +72,7 @@ void StateContainer::PushArray(IdefixArray4D<real>& in,
72	72	}
73	73
74	74
75		- void StateContainer::AddAndStore(real wl, real wr, StateContainer & in) {
	75	+ void StateContainer::AddAndStore(const real wl, const real wr, StateContainer & in) {
76	76	idfx::pushRegion("StateContainer::AddAndStore");
77	77
78	78	if(in.stateVector.size() != this->stateVector.size()) {