User: cott Date: 2010/12/04 01:36 AM

Modified: /branches/hot_and_MHD_temp_dev/src/ GRHydro_Prim2Con.F90

Log: * fix small bug with Y_e in Prim2ConCells

File Changes:

Directory: /branches/hot_and_MHD_temp_dev/src/ ==============================================

File [modified]: GRHydro_Prim2Con.F90 Delta lines: +13 -12 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Prim2Con.F90 2010-11-26 20:02:43 UTC (rev 186) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Prim2Con.F90 2010-12-04 07:36:15 UTC (rev 187) @@ -49,6 +49,7 @@ CCTK_REAL :: xtemp

if(evolve_temper.ne.1) then + 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 @@ -319,18 +320,6 @@ CCTK_REAL :: det character(len=512) :: warnline

- if(evolve_Y_e.ne.0) then - !$OMP PARALLEL DO PRIVATE(i, j) - 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 - Y_e_con(i,j,k) = Y_e(i,j,k) * dens(i,j,k) - enddo - enddo - enddo - !$OMP END PARALLEL DO - endif - if(evolve_temper.ne.1) then !$OMP PARALLEL DO PRIVATE(i, j) do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 @@ -373,7 +362,19 @@ !$OMP END PARALLEL DO endif

+ if(evolve_Y_e.ne.0) then + !$OMP PARALLEL DO PRIVATE(i, j) + 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 + Y_e_con(i,j,k) = Y_e(i,j,k) * dens(i,j,k) + enddo + enddo + enddo + !$OMP END PARALLEL DO + endif

+ end subroutine Primitive2ConservativeCells