diff options
Diffstat (limited to 'src/GRHydro_Con2Prim.F90')
-rw-r--r-- | src/GRHydro_Con2Prim.F90 | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/src/GRHydro_Con2Prim.F90 b/src/GRHydro_Con2Prim.F90 index 5af9518..1387c65 100644 --- a/src/GRHydro_Con2Prim.F90 +++ b/src/GRHydro_Con2Prim.F90 @@ -120,16 +120,16 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) #if 0 !$OMP CRITICAL if (rho(i,j,k).le.0.0d0) then - call CCTK_WARN(1,"rho less than zero at entry of Con2Prim") - write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel - call CCTK_WARN(1,warnline) - write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) - call CCTK_WARN(1,warnline) - write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) - call CCTK_WARN(1,warnline) - call CCTK_WARN(0,"Aborting!!!") - endif - !$OMP END CRITICAL + call CCTK_WARN(1,"rho less than zero at entry of Con2Prim") + write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel + call CCTK_WARN(1,warnline) + write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) + call CCTK_WARN(1,warnline) + write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) + call CCTK_WARN(1,warnline) + call CCTK_WARN(0,"Aborting!!!") + endif + !$OMP END CRITICAL #endif !do not compute if in atmosphere or in excised region @@ -341,41 +341,41 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) !! Some debugging convenience output # if 0 - !$OMP CRITICAL - if (dens(i,j,k).ne.dens(i,j,k)) then - call CCTK_WARN(1,"NAN at exit of Con2Prim") - write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel - call CCTK_WARN(1,warnline) - write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) - call CCTK_WARN(1,warnline) - write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) - call CCTK_WARN(1,warnline) - call CCTK_WARN(0,"Aborting!!!") - endif - if (rho(i,j,k).ne.rho(i,j,k)) then - call CCTK_WARN(1,"NAN in rho at exit of Con2Prim") - write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel - call CCTK_WARN(1,warnline) - write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) - call CCTK_WARN(1,warnline) - write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) - call CCTK_WARN(1,warnline) - call CCTK_WARN(0,"Aborting!!!") - endif - !$OMP END CRITICAL - - !$OMP CRITICAL + !$OMP CRITICAL + if (dens(i,j,k).ne.dens(i,j,k)) then + call CCTK_WARN(1,"NAN at exit of Con2Prim") + write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel + call CCTK_WARN(1,warnline) + write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) + call CCTK_WARN(1,warnline) + write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) + call CCTK_WARN(1,warnline) + call CCTK_WARN(0,"Aborting!!!") + endif + if (rho(i,j,k).ne.rho(i,j,k)) then + call CCTK_WARN(1,"NAN in rho at exit of Con2Prim") + write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel + call CCTK_WARN(1,warnline) + write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) + call CCTK_WARN(1,warnline) + write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) + call CCTK_WARN(1,warnline) + call CCTK_WARN(0,"Aborting!!!") + endif + !$OMP END CRITICAL + + !$OMP CRITICAL if (rho(i,j,k).le.0.0d0) then - call CCTK_WARN(1,"rho less than zero at exit of Con2Prim") - write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel - call CCTK_WARN(1,warnline) - write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) - call CCTK_WARN(1,warnline) - write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) - call CCTK_WARN(1,warnline) - call CCTK_WARN(0,"Aborting!!!") - endif - !$OMP END CRITICAL + call CCTK_WARN(1,"rho less than zero at exit of Con2Prim") + write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel + call CCTK_WARN(1,warnline) + write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) + call CCTK_WARN(1,warnline) + write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) + call CCTK_WARN(1,warnline) + call CCTK_WARN(0,"Aborting!!!") + endif + !$OMP END CRITICAL #endif @@ -562,13 +562,13 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & if (pnew .lt. plow .or. tmp .le. 0.0d0 .or. mustbisect) then - ! Ok, Newton-Raphson ended up finding something unphysical. - ! Let's try to find our root via bisection (which converges slower but is more robust) + ! Ok, Newton-Raphson ended up finding something unphysical. + ! Let's try to find our root via bisection (which converges slower but is more robust) - pnew = (plow + pold) / 2 - tmp = (utau + pnew + udens)**2 - s2 - - mustbisect = .false. + pnew = (plow + pold) / 2 + tmp = (utau + pnew + udens)**2 - s2 + + mustbisect = .false. end if else @@ -1054,13 +1054,13 @@ subroutine Con2Prim_pt_hot(cctk_iteration, ii,jj,kk,handle, dens, & if (pnew .lt. plow .or. tmp .le. 0.0d0 .or. mustbisect) then - ! Ok, Newton-Raphson ended up finding something unphysical. - ! Let's try to find our root via bisection (which converges slower but is more robust) + ! Ok, Newton-Raphson ended up finding something unphysical. + ! Let's try to find our root via bisection (which converges slower but is more robust) - pnew = (plow + pold) / 2 - tmp = (utau + pnew + udens)**2 - s2 - - mustbisect = .false. + pnew = (plow + pold) / 2 + tmp = (utau + pnew + udens)**2 - s2 + + mustbisect = .false. end if else |