From 30e325d094335d4f4081bd8839ccecf877b563d3 Mon Sep 17 00:00:00 2001 From: eschnett Date: Mon, 13 Jun 2011 15:40:56 +0000 Subject: 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 --- src/GRHydro_ReconstructPoly.F90 | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/GRHydro_ReconstructPoly.F90') 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 -- cgit v1.2.3