don't access sm2/sp2 if we don't need them (#145)

asalmgren · web-flow · commit 71b6684f58e3 · 2024-08-20T11:09:16.000-07:00
diff --git a/Godunov/hydro_godunov_ppm.H b/Godunov/hydro_godunov_ppm.H
@@ -859,11 +859,9 @@ void PredictStateOnXFace ( const int i, const int j, const int k, const int n,
                            const Limiter& /*limiter*/,
                            int limiter_type)
 {
-    amrex::Real sm2 = S(i-2,j,k,n);
     amrex::Real sm1 = S(i-1,j,k,n);
     amrex::Real s0  = S(i  ,j,k,n);
     amrex::Real sp1 = S(i+1,j,k,n);
-    amrex::Real sp2 = S(i+2,j,k,n);
 
     constexpr auto half{amrex::Real(0.5)};
     constexpr auto  one{amrex::Real(1.0)};
@@ -896,6 +894,9 @@ void PredictStateOnXFace ( const int i, const int j, const int k, const int n,
     } else {
         constexpr auto two3rds{amrex::Real(2.0/3.0)};
 
+        amrex::Real sm2 = S(i-2,j,k,n);
+        amrex::Real sp2 = S(i+2,j,k,n);
+
         amrex::Real sedge1 = Limiter::sedge1(sm2,sm1,s0,sp1,sp2);
         amrex::Real sedge2 = Limiter::sedge2(sm2,sm1,s0,sp1,sp2);
 
@@ -933,11 +934,9 @@ void PredictStateOnYFace ( const int i, const int j, const int k, const int n,
                            const Limiter& /*limiter*/,
                            int limiter_type)
 {
-    amrex::Real sm2 = S(i,j-2,k,n);
     amrex::Real sm1 = S(i,j-1,k,n);
     amrex::Real s0  = S(i,j  ,k,n);
     amrex::Real sp1 = S(i,j+1,k,n);
-    amrex::Real sp2 = S(i,j+2,k,n);
 
     constexpr auto half{amrex::Real(0.5)};
     constexpr auto  one{amrex::Real(1.0)};
@@ -974,6 +973,9 @@ void PredictStateOnYFace ( const int i, const int j, const int k, const int n,
 
         constexpr auto two3rds{amrex::Real(2.0/3.0)};
 
+        amrex::Real sm2 = S(i,j-2,k,n);
+        amrex::Real sp2 = S(i,j+2,k,n);
+
         amrex::Real sedge1 = Limiter::sedge1(sm2,sm1,s0,sp1,sp2);
         amrex::Real sedge2 = Limiter::sedge2(sm2,sm1,s0,sp1,sp2);
 
@@ -1013,11 +1015,9 @@ void PredictStateOnZFace ( const int i, const int j, const int k, const int n,
                            const Limiter& /*limiter*/,
                            int limiter_type)
 {
-    amrex::Real sm2 = S(i,j,k-2,n);
     amrex::Real sm1 = S(i,j,k-1,n);
     amrex::Real s0  = S(i,j,k  ,n);
     amrex::Real sp1 = S(i,j,k+1,n);
-    amrex::Real sp2 = S(i,j,k+2,n);
 
     constexpr auto half{amrex::Real(0.5)};
     constexpr auto  one{amrex::Real(1.0)};
@@ -1052,6 +1052,9 @@ void PredictStateOnZFace ( const int i, const int j, const int k, const int n,
     } else {
         constexpr auto two3rds{amrex::Real(2.0/3.0)};
 
+        amrex::Real sm2 = S(i,j,k-2,n);
+        amrex::Real sp2 = S(i,j,k+2,n);
+
         amrex::Real sedge1 = Limiter::sedge1(sm2,sm1,s0,sp1,sp2);
         amrex::Real sedge2 = Limiter::sedge2(sm2,sm1,s0,sp1,sp2);
 
