Declare all OpenMP private variables explicitly as private

In Fortran OpenMP, loop variables of parallel loops are implicitly
private and do not need to be declared as private. To improve code
clarity, all such variables are now explicitly declared to be private.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@251 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

17 files changed, 93 insertions, 93 deletions

diff --git a/src/GRHydro_CalcUpdate.F90 b/src/GRHydro_CalcUpdate.F90
index f7efaa0..cbf1508 100644
--- a/src/GRHydro_CalcUpdate.F90
+++ b/src/GRHydro_CalcUpdate.F90
@@ -55,7 +55,7 @@ subroutine UpdateCalculation(CCTK_ARGUMENTS)
 
     if (use_weighted_fluxes == 0) then
 
-      !$OMP PARALLEL DO PRIVATE(i,j,itracer,alp_l,alp_r,Bvec_l,Bvec_r)
+      !$OMP PARALLEL DO PRIVATE(i,j,k,itracer,alp_l,alp_r,Bvec_l,Bvec_r)
       do k = GRHydro_stencil + 1, cctk_lsh(3) - GRHydro_stencil
         do j = GRHydro_stencil + 1, cctk_lsh(2) - GRHydro_stencil
           do i = GRHydro_stencil + 1, cctk_lsh(1) - GRHydro_stencil
diff --git a/src/GRHydro_Con2Prim.F90 b/src/GRHydro_Con2Prim.F90
index 9d69ebd..2ba43cd 100644
--- a/src/GRHydro_Con2Prim.F90
+++ b/src/GRHydro_Con2Prim.F90
@@ -87,7 +87,7 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS)
   call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,&
        GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr)
 
-  !$OMP PARALLEL DO PRIVATE(i,j,itracer,&
+  !$OMP PARALLEL DO PRIVATE(i,j,k,itracer,&
   !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative, anyerr, keyerr, keytemp)
   do k = 1, nz 
     do j = 1, ny 
@@ -1168,7 +1168,7 @@ subroutine Conservative2PrimitivePolytype(CCTK_ARGUMENTS)
 !!$  do k = GRHydro_stencil + 1, nz - GRHydro_stencil
 !!$    do j = GRHydro_stencil + 1, ny - GRHydro_stencil
 !!$      do i = GRHydro_stencil + 1, nx - GRHydro_stencil
-  !$OMP PARALLEL DO PRIVATE(i,j,itracer,&
+  !$OMP PARALLEL DO PRIVATE(i,j,k,itracer,&
   !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det)
   do k = 1, nz
     do j = 1, ny
@@ -1778,7 +1778,7 @@ subroutine check_GRHydro_C2P_failed(CCTK_ARGUMENTS)
   ny = cctk_lsh(2)
   nz = cctk_lsh(3)
 
-  !$OMP PARALLEL DO PRIVATE(i,j)
+  !$OMP PARALLEL DO PRIVATE(i,j,k)
   do k = 1, nz 
     do j = 1, ny 
       do i = 1, nx
diff --git a/src/GRHydro_Con2PrimM.F90 b/src/GRHydro_Con2PrimM.F90
index e062976..2764739 100644
--- a/src/GRHydro_Con2PrimM.F90
+++ b/src/GRHydro_Con2PrimM.F90
@@ -92,7 +92,7 @@ subroutine Conservative2PrimitiveM(CCTK_ARGUMENTS)
   local_gam = local_gam+1.d0
   
 
-  !$OMP PARALLEL DO PRIVATE(i,j,itracer,&
+  !$OMP PARALLEL DO PRIVATE(i,j,k,itracer,&
   !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative, &
   !$OMP b2,xrho,xeps,xpress,xtemp,local_K,local_pgam,sc,keyerr,anyerr)
   do k = 1, nz 
@@ -564,7 +564,7 @@ subroutine Conservative2PrimitivePolytypeM(CCTK_ARGUMENTS)
 !!$    do j = GRHydro_stencil + 1, ny - GRHydro_stencil
 !!$      do i = GRHydro_stencil + 1, nx - GRHydro_stencil
 
-  !$OMP PARALLEL DO PRIVATE(i,j,itracer,&
+  !$OMP PARALLEL DO PRIVATE(i,j,k,itracer,&
   !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative, &
   !$OMP b2, xrho, xpress, local_K, local_pgam, sc)
   do k = 1, nz
diff --git a/src/GRHydro_HLLE.F90 b/src/GRHydro_HLLE.F90
index 1034359..467959a 100644
--- a/src/GRHydro_HLLE.F90
+++ b/src/GRHydro_HLLE.F90
@@ -66,7 +66,7 @@ subroutine GRHydro_HLLE(CCTK_ARGUMENTS)
     call CCTK_WARN(0, "Flux direction not x,y,z")
   end if
 
-  !$OMP PARALLEL DO PRIVATE(j,i,f1,lamminus,lamplus,consp,consm_i, &
+  !$OMP PARALLEL DO PRIVATE(k,j,i,f1,lamminus,lamplus,consp,consm_i, &
   !$OMP                     fplus,fminus,qdiff,avg_beta,avg_alp,   &
   !$OMP                     avg_det,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, &
   !$OMP                     uxxh,uxyh,uxzh,uyyh,uyzh,uzzh,         &
diff --git a/src/GRHydro_Marquina.F90 b/src/GRHydro_Marquina.F90
index 8edce62..58dd742 100644
--- a/src/GRHydro_Marquina.F90
+++ b/src/GRHydro_Marquina.F90
@@ -72,7 +72,7 @@ subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
     
     f_marquina = 0.d0
         
-    !$OMP PARALLEL DO PRIVATE(i,j,consp,consm_i,primp,primm_i,&
+    !$OMP PARALLEL DO PRIVATE(i,j,k,consp,consm_i,primp,primm_i,&
     !$OMP marquinaflux,avg_beta,avg_alp,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,&
     !$OMP psi4h,f_marquina,uxxh,uxyh,uxzh,uyyh,uyzh,uzzh,usendh,&
     !$OMP tmp_w_lorentzp, tmp_w_lorentzm_i,w_lorentzp,w_lorentzm_i,&
@@ -371,7 +371,7 @@ subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
 
     if (evolve_tracer .ne. 0) then
 
-      !$OMP PARALLEL DO PRIVATE(i,j)
+      !$OMP PARALLEL DO PRIVATE(i,j,k)
       do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
         do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
           do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
@@ -399,7 +399,7 @@ subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
 
     if (evolve_Y_e .ne. 0) then
 
-      !$OMP PARALLEL DO PRIVATE(i,j)
+      !$OMP PARALLEL DO PRIVATE(i,j,k)
       do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
         do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
           do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
diff --git a/src/GRHydro_Prim2Con.F90 b/src/GRHydro_Prim2Con.F90
index 0bfea69..8a428c9 100644
--- a/src/GRHydro_Prim2Con.F90
+++ b/src/GRHydro_Prim2Con.F90
@@ -49,7 +49,7 @@ subroutine primitive2conservative(CCTK_ARGUMENTS)
   CCTK_REAL :: xtemp(1)
 
   if(evolve_temper.ne.1) then
-     !$OMP PARALLEL DO PRIVATE(i, j, avg_detl, avg_detr,&
+     !$OMP PARALLEL DO PRIVATE(i, j, k, avg_detl, avg_detr,&
      !$OMP                      gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, &
      !$OMP                      gxxr,gxyr,gxzr,gyyr,gyzr,gzzr)
      do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
@@ -348,7 +348,7 @@ subroutine Primitive2ConservativeCells(CCTK_ARGUMENTS)
   character(len=512) :: warnline
 
   if(evolve_temper.ne.1) then
-     !$OMP PARALLEL DO PRIVATE(i, j, det)
+     !$OMP PARALLEL DO PRIVATE(i, j, k, det)
      do k = 1,cctk_lsh(3)
         do j = 1,cctk_lsh(2)
            do i = 1,cctk_lsh(1)
@@ -367,7 +367,7 @@ subroutine Primitive2ConservativeCells(CCTK_ARGUMENTS)
      end do
      !$OMP END PARALLEL DO
   else
-     !$OMP PARALLEL DO PRIVATE(i, j, det)
+     !$OMP PARALLEL DO PRIVATE(i, j, k, det)
      do k = 1,cctk_lsh(3)
         do j = 1,cctk_lsh(2)
            do i = 1,cctk_lsh(1)
@@ -390,7 +390,7 @@ subroutine Primitive2ConservativeCells(CCTK_ARGUMENTS)
   endif
 
   if(evolve_Y_e.ne.0) then
-     !$OMP PARALLEL DO PRIVATE(i, j)
+     !$OMP PARALLEL DO PRIVATE(i, j, k)
      do k = 1,cctk_lsh(3)
         do j = 1,cctk_lsh(2)
            do i = 1,cctk_lsh(1)
@@ -432,7 +432,7 @@ subroutine Prim2ConservativePolytype(CCTK_ARGUMENTS)
   CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
        gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr
   
-  !$OMP PARALLEL DO PRIVATE(i, j, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
+  !$OMP PARALLEL DO PRIVATE(i, j, k, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
   !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr)
   do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
     do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
@@ -581,7 +581,7 @@ subroutine Primitive2ConservativePolyCells(CCTK_ARGUMENTS)
   CCTK_INT :: i, j, k
   CCTK_REAL :: det
   
-  !$OMP PARALLEL DO PRIVATE(i, j, det)
+  !$OMP PARALLEL DO PRIVATE(i, j, k, det)
      do k = 1,cctk_lsh(3)
         do j = 1,cctk_lsh(2)
            do i = 1,cctk_lsh(1)
@@ -601,7 +601,7 @@ subroutine Primitive2ConservativePolyCells(CCTK_ARGUMENTS)
   !$OMP END PARALLEL DO
 
   if(evolve_Y_e.ne.0) then
-     !$OMP PARALLEL DO PRIVATE(i, j)
+     !$OMP PARALLEL DO PRIVATE(i, j, k)
      do k = 1,cctk_lsh(3)
         do j = 1,cctk_lsh(2)
            do i = 1,cctk_lsh(1)
diff --git a/src/GRHydro_Prim2ConM.F90 b/src/GRHydro_Prim2ConM.F90
index 7648dc6..87ae5e7 100644
--- a/src/GRHydro_Prim2ConM.F90
+++ b/src/GRHydro_Prim2ConM.F90
@@ -232,7 +232,7 @@ subroutine Primitive2ConservativeCellsM(CCTK_ARGUMENTS)
   end do
 
   if(evolve_Y_e.ne.0) then
-     !$OMP PARALLEL DO PRIVATE(i, j)
+     !$OMP PARALLEL DO PRIVATE(i, j, k)
      do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
         do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
            do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1
@@ -275,7 +275,7 @@ subroutine Prim2ConservativePolytypeM(CCTK_ARGUMENTS)
   CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
        gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr
   
-  !$OMP PARALLEL DO PRIVATE(i, j, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
+  !$OMP PARALLEL DO PRIVATE(i, j, k, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
   !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr)
   do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
     do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
@@ -467,7 +467,7 @@ subroutine Primitive2ConservativePolyCellsM(CCTK_ARGUMENTS)
   end do
 
   if(evolve_Y_e.ne.0) then
-     !$OMP PARALLEL DO PRIVATE(i, j)
+     !$OMP PARALLEL DO PRIVATE(i, j, k)
      do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
         do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
            do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1
diff --git a/src/GRHydro_Reconstruct.F90 b/src/GRHydro_Reconstruct.F90
index dd7b81f..5b447c0 100644
--- a/src/GRHydro_Reconstruct.F90
+++ b/src/GRHydro_Reconstruct.F90
@@ -249,7 +249,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
             psidc, psidcplus, psidcminus, trivial_rp, hydro_excision_mask)
     endif
 
-    !$OMP PARALLEL DO PRIVATE(i, j)
+    !$OMP PARALLEL DO PRIVATE(i, j, k)
     do k = 1, nz
       do j = 1, ny
         do i = 1, nx
@@ -280,7 +280,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
     if (flux_direction == 1) then
        if(evolve_mhd.ne.0) then
           if(clean_divergence.ne.0) then
-            !$OMP PARALLEL DO PRIVATE(i, j)
+            !$OMP PARALLEL DO PRIVATE(i, j, k)
             do k = GRHydro_stencil, nz - GRHydro_stencil + 1
               do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                  call SimplePPM_1dM(GRHydro_eos_handle,0,nx,CCTK_DELTA_SPACE(1),&
@@ -308,7 +308,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
             end do
             !$OMP END PARALLEL DO
           else  !clean_divergence
-            !$OMP PARALLEL DO PRIVATE(i, j)
+            !$OMP PARALLEL DO PRIVATE(i, j, k)
             do k = GRHydro_stencil, nz - GRHydro_stencil + 1
               do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                  call SimplePPM_1dM(GRHydro_eos_handle,0,nx,CCTK_DELTA_SPACE(1),&
@@ -337,7 +337,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
             !$OMP END PARALLEL DO
           endif  !clean_divergence
        else  !evolve_mhd
-         !$OMP PARALLEL DO PRIVATE(i, j)
+         !$OMP PARALLEL DO PRIVATE(i, j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
            do j = GRHydro_stencil, ny - GRHydro_stencil + 1
            call SimplePPM_1d(GRHydro_eos_handle,0,nx,CCTK_DELTA_SPACE(1),&
@@ -364,7 +364,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
        endif  !evolve_mhd
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
@@ -376,7 +376,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_ye_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
@@ -391,7 +391,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
     else if (flux_direction == 2) then
       if(evolve_mhd.ne.0) then
         if(clean_divergence.ne.0) then
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,0,ny,CCTK_DELTA_SPACE(2),&
@@ -419,7 +419,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
           end do
           !$OMP END PARALLEL DO
         else  !clean_divergence
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,0,ny,CCTK_DELTA_SPACE(2),&
@@ -448,7 +448,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
           !$OMP END PARALLEL DO
         endif  !clean_divergence
       else  !evolve_mhd
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, nz - GRHydro_stencil + 1
           do j = GRHydro_stencil, nx - GRHydro_stencil + 1
             call SimplePPM_1d(GRHydro_eos_handle,0,ny,CCTK_DELTA_SPACE(2),&
@@ -475,7 +475,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
         !$OMP END PARALLEL DO
       endif  !evolve_mhd
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
@@ -487,7 +487,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
                call SimplePPM_ye_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
@@ -502,7 +502,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
     else if (flux_direction == 3) then
       if(evolve_mhd.ne.0) then
         if(clean_divergence.ne.0) then
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,0,nz,CCTK_DELTA_SPACE(3),&
@@ -530,7 +530,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
           end do
           !$OMP END PARALLEL DO
         else  !clean_divergence
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,0,nz,CCTK_DELTA_SPACE(3),&
@@ -559,7 +559,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
           !$OMP END PARALLEL DO
         endif  !clean_divergence
       else  !evolve_mhd
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, ny - GRHydro_stencil + 1
           do j = GRHydro_stencil, nx - GRHydro_stencil + 1
             call SimplePPM_1d(GRHydro_eos_handle,0,nz,CCTK_DELTA_SPACE(3),&
@@ -586,7 +586,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
         !$OMP END PARALLEL DO
       endif  !evolve_mhd
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
 
@@ -599,7 +599,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
                call SimplePPM_ye_1d(nz,CCTK_DELTA_SPACE(3),rho(j,k,:), &
@@ -633,7 +633,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
      endif
 
     if (flux_direction == 1) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
         do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
@@ -713,7 +713,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
     else if (flux_direction == 2) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
         do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
@@ -793,7 +793,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
     else if (flux_direction == 3) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
         do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
diff --git a/src/GRHydro_ReconstructM.F90 b/src/GRHydro_ReconstructM.F90
index 654d9a7..a48d67f 100644
--- a/src/GRHydro_ReconstructM.F90
+++ b/src/GRHydro_ReconstructM.F90
@@ -205,7 +205,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
 
 
 
-    !$OMP PARALLEL DO PRIVATE(i, j)
+    !$OMP PARALLEL DO PRIVATE(i, j, k)
     do k = 1, nz
       do j = 1, ny
         do i = 1, nx
@@ -234,7 +234,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
   else if (CCTK_EQUALS(recon_method,"ppm")) then
 
     if (flux_direction == 1) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, nz - GRHydro_stencil + 1
         do j = GRHydro_stencil, ny - GRHydro_stencil + 1
           call SimplePPM_1dM(GRHydro_eos_handle,0,nx,CCTK_DELTA_SPACE(1),&
@@ -262,7 +262,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
@@ -274,7 +274,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
@@ -288,7 +288,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
 
 
     else if (flux_direction == 2) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, nz - GRHydro_stencil + 1
         do j = GRHydro_stencil, nx - GRHydro_stencil + 1
           call SimplePPM_1dM(GRHydro_eos_handle,0,ny,CCTK_DELTA_SPACE(2),&
@@ -316,7 +316,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
@@ -328,7 +328,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
@@ -341,7 +341,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
       end if
 
     else if (flux_direction == 3) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, ny - GRHydro_stencil + 1
         do j = GRHydro_stencil, nx - GRHydro_stencil + 1
           call SimplePPM_1dM(GRHydro_eos_handle,0,nz,CCTK_DELTA_SPACE(3),&
@@ -369,7 +369,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
 
@@ -382,7 +382,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nz,CCTK_DELTA_SPACE(3),rho(j,k,:), &
@@ -417,7 +417,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
 
 
     if (flux_direction == 1) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
         do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
@@ -486,7 +486,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
     else if (flux_direction == 2) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
         do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
@@ -553,7 +553,7 @@ subroutine ReconstructionM(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
     else if (flux_direction == 3) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
         do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
diff --git a/src/GRHydro_ReconstructPoly.F90 b/src/GRHydro_ReconstructPoly.F90
index 826ef1c..9d1f860 100644
--- a/src/GRHydro_ReconstructPoly.F90
+++ b/src/GRHydro_ReconstructPoly.F90
@@ -239,7 +239,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
             psidc, psidcplus, psidcminus, trivial_rp, hydro_excision_mask)
     endif
 
-    !$OMP PARALLEL DO PRIVATE(i, j)
+    !$OMP PARALLEL DO PRIVATE(i, j, k)
     do k = 1, nz
       do j = 1, ny
         do i = 1, nx
@@ -270,7 +270,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
     if (flux_direction == 1) then
       if(evolve_mhd.ne.0) then
         if(clean_divergence.ne.0) then
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,1,nx,CCTK_DELTA_SPACE(1),&
@@ -298,7 +298,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
           end do
           !$OMP END PARALLEL DO
         else  !clean_divergence
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,1,nx,CCTK_DELTA_SPACE(1),&
@@ -327,7 +327,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
           !$OMP END PARALLEL DO
         endif  !clean_divergence
       else  !evolve_mhd
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, nz - GRHydro_stencil + 1
           do j = GRHydro_stencil, ny - GRHydro_stencil + 1
             call SimplePPM_1d(GRHydro_eos_handle,1,nx,CCTK_DELTA_SPACE(1),&
@@ -354,7 +354,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
         !$OMP END PARALLEL DO
       endif  !evolve_mhd
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
@@ -366,7 +366,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
@@ -381,7 +381,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
     else if (flux_direction == 2) then
       if(evolve_mhd.ne.0) then
         if(clean_divergence.ne.0) then
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,1,ny,CCTK_DELTA_SPACE(2),&
@@ -409,7 +409,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
           end do
           !$OMP END PARALLEL DO
         else  !clean_divergence
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,1,ny,CCTK_DELTA_SPACE(2),&
@@ -438,7 +438,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
           !$OMP END PARALLEL DO
         endif  !clean_divergence
       else  !evolve_mhd
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, nz - GRHydro_stencil + 1
           do j = GRHydro_stencil, nx - GRHydro_stencil + 1
             call SimplePPM_1d(GRHydro_eos_handle,1,ny,CCTK_DELTA_SPACE(2),&
@@ -465,7 +465,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
         !$OMP END PARALLEL DO
       endif  !evolve_mhd
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
@@ -477,7 +477,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
@@ -492,7 +492,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
     else if (flux_direction == 3) then
       if(evolve_mhd.ne.0) then
         if(clean_divergence.ne.0) then
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,1,nz,CCTK_DELTA_SPACE(3),&
@@ -520,7 +520,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
           end do
           !$OMP END PARALLEL DO
         else  !clean_divergence
-          !$OMP PARALLEL DO PRIVATE(i, j)
+          !$OMP PARALLEL DO PRIVATE(i, j, k)
           do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_1dM(GRHydro_eos_handle,1,nz,CCTK_DELTA_SPACE(3),&
@@ -549,7 +549,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
           !$OMP END PARALLEL DO
         endif  !clean_divergence
       else  !evolve_mhd
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, ny - GRHydro_stencil + 1
           do j = GRHydro_stencil, nx - GRHydro_stencil + 1
             call SimplePPM_1d(GRHydro_eos_handle,1,nz,CCTK_DELTA_SPACE(3),&
@@ -576,7 +576,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
         !$OMP END PARALLEL DO
       endif  !evolve_mhd
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
 
@@ -589,7 +589,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nz,CCTK_DELTA_SPACE(3),rho(j,k,:), &
@@ -622,7 +622,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
      endif
 
     if (flux_direction == 1) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
         do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
@@ -696,7 +696,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
        end do
         !$OMP END PARALLEL DO
      else if (flux_direction == 2) then
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
            do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
               if (CCTK_EQUALS(recon_vars,"primitive")) then
@@ -767,7 +767,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
         end do
       !$OMP END PARALLEL DO
     else if (flux_direction == 3) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
         do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
diff --git a/src/GRHydro_ReconstructPolyM.F90 b/src/GRHydro_ReconstructPolyM.F90
index 70d2b12..9b4bcd6 100644
--- a/src/GRHydro_ReconstructPolyM.F90
+++ b/src/GRHydro_ReconstructPolyM.F90
@@ -203,7 +203,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
 
 
 
-    !$OMP PARALLEL DO PRIVATE(i, j)
+    !$OMP PARALLEL DO PRIVATE(i, j, k)
     do k = 1, nz
       do j = 1, ny
         do i = 1, nx
@@ -232,7 +232,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
   else if (CCTK_EQUALS(recon_method,"ppm")) then
 
     if (flux_direction == 1) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, nz - GRHydro_stencil + 1
         do j = GRHydro_stencil, ny - GRHydro_stencil + 1
           call SimplePPM_1dM(GRHydro_eos_handle,1,nx,CCTK_DELTA_SPACE(1),&
@@ -260,7 +260,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
@@ -272,7 +272,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
@@ -285,7 +285,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
       end if
 
     else if (flux_direction == 2) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, nz - GRHydro_stencil + 1
         do j = GRHydro_stencil, nx - GRHydro_stencil + 1
           call SimplePPM_1dM(GRHydro_eos_handle,1,ny,CCTK_DELTA_SPACE(2),&
@@ -313,7 +313,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
@@ -325,7 +325,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, nz - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
@@ -338,7 +338,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
       end if
 
     else if (flux_direction == 3) then
-      !$OMP PARALLEL DO PRIVATE(i, j)
+      !$OMP PARALLEL DO PRIVATE(i, j, k)
       do k = GRHydro_stencil, ny - GRHydro_stencil + 1
         do j = GRHydro_stencil, nx - GRHydro_stencil + 1
           call SimplePPM_1dM(GRHydro_eos_handle,1,nz,CCTK_DELTA_SPACE(3),&
@@ -366,7 +366,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
       end do
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
 
@@ -379,7 +379,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
          !$OMP END PARALLEL DO
       end if
       if(evolve_Y_e.ne.0) then
-         !$OMP PARALLEL DO PRIVATE(j)
+         !$OMP PARALLEL DO PRIVATE(j, k)
          do k = GRHydro_stencil, ny - GRHydro_stencil + 1
             do j = GRHydro_stencil, nx - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nz,CCTK_DELTA_SPACE(3),rho(j,k,:), &
@@ -414,7 +414,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
      endif
 
      if (flux_direction == 1) then
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
            do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
               if (CCTK_EQUALS(recon_vars,"primitive")) then
@@ -476,7 +476,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
         end do
         !$OMP END PARALLEL DO
      else if (flux_direction == 2) then
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
            do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
               if (CCTK_EQUALS(recon_vars,"primitive")) then
@@ -537,7 +537,7 @@ subroutine ReconstructionPolytypeM(CCTK_ARGUMENTS)
         end do
         !$OMP END PARALLEL DO
      else if (flux_direction == 3) then
-        !$OMP PARALLEL DO PRIVATE(i, j)
+        !$OMP PARALLEL DO PRIVATE(i, j, k)
         do k = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
            do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
               if (CCTK_EQUALS(recon_vars,"primitive")) then
diff --git a/src/GRHydro_Source.F90 b/src/GRHydro_Source.F90
index 1bb3acc..1a981db 100644
--- a/src/GRHydro_Source.F90
+++ b/src/GRHydro_Source.F90
@@ -112,7 +112,7 @@ subroutine SourceTerms(CCTK_ARGUMENTS)
   force_spatial_second_order = .FALSE.
   
   if (spatial_order > 2) then
-    !$OMP PARALLEL DO PRIVATE(i, j)
+    !$OMP PARALLEL DO PRIVATE(i, j, k)
     do k = 1 + GRHydro_stencil, nz - GRHydro_stencil
       do j = 1 + GRHydro_stencil, ny - GRHydro_stencil
         do i = 1 + GRHydro_stencil, nx - GRHydro_stencil
@@ -131,7 +131,7 @@ subroutine SourceTerms(CCTK_ARGUMENTS)
     !$OMP END PARALLEL DO
   end if
   
-  !$OMP PARALLEL DO PRIVATE(i, j, local_spatial_order,&
+  !$OMP PARALLEL DO PRIVATE(i, j, k, local_spatial_order,&
   !$OMP localgxx,localgxy,localgxz,localgyy,localgyz,localgzz,&
   !$OMP psi4pt,det,sqrtdet,rhoenthalpyW2,shiftx,shifty,shiftz,&
   !$OMP dx_betax,dx_betay,dx_betaz,dy_betax,dy_betay,dy_betaz,&
diff --git a/src/GRHydro_SourceM.F90 b/src/GRHydro_SourceM.F90
index f75025d..ba2f383 100644
--- a/src/GRHydro_SourceM.F90
+++ b/src/GRHydro_SourceM.F90
@@ -137,7 +137,7 @@ subroutine SourceTermsM(CCTK_ARGUMENTS)
   force_spatial_second_order = .FALSE.
   
   if (spatial_order > 2) then
-    !$OMP PARALLEL DO PRIVATE(i, j)
+    !$OMP PARALLEL DO PRIVATE(i, j, k)
     do k = 1 + GRHydro_stencil, nz - GRHydro_stencil
       do j = 1 + GRHydro_stencil, ny - GRHydro_stencil
         do i = 1 + GRHydro_stencil, nx - GRHydro_stencil
@@ -156,7 +156,7 @@ subroutine SourceTermsM(CCTK_ARGUMENTS)
     !$OMP END PARALLEL DO
   end if
   
-  !$OMP PARALLEL DO PRIVATE(i, j, local_spatial_order,&
+  !$OMP PARALLEL DO PRIVATE(i, j, k, local_spatial_order,&
   !$OMP localgxx,localgxy,localgxz,localgyy,localgyz,localgzz,&
   !$OMP det,sqrtdet,shiftx,shifty,shiftz,&
   !$OMP dx_betax,dx_betay,dx_betaz,dy_betax,dy_betay,dy_betaz,&
diff --git a/src/GRHydro_TVDReconstruct.F90 b/src/GRHydro_TVDReconstruct.F90
index c6865c6..ebe1a43 100644
--- a/src/GRHydro_TVDReconstruct.F90
+++ b/src/GRHydro_TVDReconstruct.F90
@@ -52,7 +52,7 @@ subroutine tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
 !!$ Initially all Riemann problems are NON-trivial
 
   trivial_rp = .false.
-    !$OMP PARALLEL DO PRIVATE(i,j,dupw,dloc,delta,ratio,hdelta)
+    !$OMP PARALLEL DO PRIVATE(i,j,k,dupw,dloc,delta,ratio,hdelta)
     do k = GRHydro_stencil, nz-GRHydro_stencil+1
       do j = GRHydro_stencil, ny-GRHydro_stencil+1
         do i = GRHydro_stencil, nx-GRHydro_stencil+1
diff --git a/src/GRHydro_Tmunu.F90 b/src/GRHydro_Tmunu.F90
index 7939a07..6109fb7 100644
--- a/src/GRHydro_Tmunu.F90
+++ b/src/GRHydro_Tmunu.F90
@@ -79,7 +79,7 @@
    CCTK_INT i,j,k
 
 
-   !$OMP PARALLEL DO PRIVATE(i,j,velxlow, velylow, velzlow,&
+   !$OMP PARALLEL DO PRIVATE(i,j,k,velxlow, velylow, velzlow,&
    !$OMP betaxlow, betaylow, betazlow, beta2, utlow, uxlow, uylow, uzlow,&
    !$OMP rhoenthalpy, ut,ux,uy,uz,bst,bsx,bsy,bsz,bs2)
    do k = 1, cctk_lsh(3)
diff --git a/src/GRHydro_TmunuM.F90 b/src/GRHydro_TmunuM.F90
index 6315a44..dfb7ab5 100644
--- a/src/GRHydro_TmunuM.F90
+++ b/src/GRHydro_TmunuM.F90
@@ -83,7 +83,7 @@
    CCTK_INT :: i,j,k
 
 
-   !$OMP PARALLEL DO PRIVATE(i,j,velxlow, velylow, velzlow,&
+   !$OMP PARALLEL DO PRIVATE(i,j,k,velxlow, velylow, velzlow,&
    !$OMP Bvecxlow,Bvecylow,Bveczlow, bdotv,dum,b2,bxlow,bylow,bzlow,&
    !$OMP betaxlow, betaylow, betazlow, beta2, bdotbeta,vdotbeta,utlow, btlow,&
    !$OMP rhohstarw2,pstar)
diff --git a/src/GRHydro_UpdateMask.F90 b/src/GRHydro_UpdateMask.F90
index 3f3be88..d408533 100644
--- a/src/GRHydro_UpdateMask.F90
+++ b/src/GRHydro_UpdateMask.F90
@@ -42,7 +42,7 @@ subroutine GRHydroUpdateAtmosphereMask(CCTK_ARGUMENTS)
   frac = CCTK_DELTA_TIME
 
   if(evolve_temper.ne.1) then
-     !$OMP PARALLEL DO PRIVATE(j,i)
+     !$OMP PARALLEL DO PRIVATE(k,j,i)
      do k = 1, cctk_lsh(3)
         do j = 1, cctk_lsh(2)
            do i = 1, cctk_lsh(1)
@@ -64,7 +64,7 @@ subroutine GRHydroUpdateAtmosphereMask(CCTK_ARGUMENTS)
      !$OMP END PARALLEL DO
   else
      ! allow negative total energy
-     !$OMP PARALLEL DO PRIVATE(j,i)
+     !$OMP PARALLEL DO PRIVATE(k,j,i)
      do k = 1, cctk_lsh(3)
         do j = 1, cctk_lsh(2)
            do i = 1, cctk_lsh(1)