User: rhaas Date: 2013/07/06 01:10 PM

Modified: /trunk/src/ GRHydro_Con2PrimHot.F90

Log: GRHydro: Fixed a problem with excision mask and atmopshere treatment in hot Con2Prim.

From: Christian Reisswig <reisswig@scriwalker.(none)>

File Changes:

Directory: /trunk/src/ ======================

File [modified]: GRHydro_Con2PrimHot.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Con2PrimHot.F90 2013-07-06 18:10:16 UTC (rev 542) +++ trunk/src/GRHydro_Con2PrimHot.F90 2013-07-06 18:10:18 UTC (rev 543) @@ -83,7 +83,7 @@

!$OMP PARALLEL DO PRIVATE(i,j,k,itracer,& !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative, anyerr, keyerr, keytemp,& - !$OMP warnline, dummy1, dummy2) + !$OMP warnline, dummy1, dummy2,reset_to_atmo) do k = 1, nz do j = 1, ny do i = 1, nx @@ -125,7 +125,7 @@ reset_to_atmo = 1 endif

- if (reset_to_atmo .gt. 0 .or. hydro_excision_mask(i,j,k) .gt. 0) then + if (reset_to_atmo .gt. 0 .or. (GRHydro_enable_internal_excision /= 0 .and. hydro_excision_mask(i,j,k) .gt. 0)) then SET_ATMO_MIN(dens(i,j,k), sqrt(det)*GRHydro_rho_min, r(i,j,k)) SET_ATMO_MIN(rho(i,j,k), GRHydro_rho_min, r(i,j,k)) scon(i,j,k,:) = 0.d0