diff options
Diffstat (limited to 'src/GRHydro_Con2PrimAM.F90')
| -rw-r--r-- | src/GRHydro_Con2PrimAM.F90 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/GRHydro_Con2PrimAM.F90 b/src/GRHydro_Con2PrimAM.F90 index 5bdf02a..6b8d894 100644 --- a/src/GRHydro_Con2PrimAM.F90 +++ b/src/GRHydro_Con2PrimAM.F90 @@ -187,7 +187,6 @@ subroutine Conservative2PrimitiveAM(CCTK_ARGUMENTS) det = SPATIAL_DETERMINANT(g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k)) sdet = sqrt(det) - call UpperMetric(uxx,uxy,uxz,uyy,uyz,uzz,det,& g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),& g23(i,j,k),g33(i,j,k)) @@ -345,9 +344,12 @@ subroutine Conservative2PrimitiveAM(CCTK_ARGUMENTS) Bconsz_tmp = sdet*Bvecz_tmp keytemp = 0 - - call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, keytemp, & - GRHydro_eos_rf_prec, local_gam(1), dens(i,j,k), & + !Watch out for the values returned to b2. Here b2 is the Bprim^2 + !while inside the point-wise con2prim routines it is the square + !of the comoving B-field, b^{\mu} b_{\mu}. It is overwritten + !in this routine, but we may need to find a better notation + !avoid future confusions. + call GRHydro_Con2PrimM_pt2(GRHydro_eos_handle, keytemp, GRHydro_eos_rf_prec, GRHydro_perc_ptol, local_gam(1), dens(i,j,k), & scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & Bconsx_tmp, Bconsy_tmp, Bconsz_tmp,xye(1), & xtemp(1),rho_tmp,velx_tmp,vely_tmp,velz_tmp,& @@ -488,8 +490,7 @@ subroutine Conservative2PrimitiveAM(CCTK_ARGUMENTS) keytemp = 0 - call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, keytemp, & - GRHydro_eos_rf_prec, local_gam(1), dens(i,j,k), & + call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, GRHydro_reflevel, i ,j ,k, x(i,j,k), y(i,j,k), z(i,j,k), keytemp, GRHydro_eos_rf_prec, GRHydro_perc_ptol, local_gam(1), dens(i,j,k), & scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & Bconsx_tmp, Bconsy_tmp, Bconsz_tmp, Y_e(i,j,k), & temperature(i,j,k),rho_tmp,velx_tmp,vely_tmp,velz_tmp,& @@ -518,8 +519,7 @@ subroutine Conservative2PrimitiveAM(CCTK_ARGUMENTS) Bconsx_tmp = sdet*Bvecx_tmp Bconsy_tmp = sdet*Bvecy_tmp Bconsz_tmp = sdet*Bvecz_tmp - call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, keytemp, & - local_perc_ptol, local_gam(1), dens(i,j,k), & + call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, GRHydro_reflevel, i ,j ,k, x(i,j,k), y(i,j,k), z(i,j,k), keytemp, GRHydro_eos_rf_prec, GRHydro_perc_ptol, local_gam(1), dens(i,j,k), & scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & Bconsx_tmp, Bconsy_tmp, Bconsz_tmp, Y_e(i,j,k), & temperature(i,j,k),rho_tmp,velx_tmp,vely_tmp,velz_tmp,& @@ -873,7 +873,7 @@ subroutine Conservative2PrimitiveBoundsAM(CCTK_ARGUMENTS) Bconsx_tmp = sqrt(avg_detl)*Bvecxminus(i,j,k) Bconsy_tmp = sqrt(avg_detl)*Bvecyminus(i,j,k) Bconsz_tmp = sqrt(avg_detl)*Bveczminus(i,j,k) - call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, keytemp, GRHydro_eos_rf_prec, local_gam(1),densminus(i,j,k), & + call GRHydro_Con2PrimM_pt2(GRHydro_eos_handle, keytemp, GRHydro_eos_rf_prec, GRHydro_perc_ptol, local_gam(1), densminus(i,j,k), & sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k), tauminus(i,j,k), & Bconsx_tmp, Bconsy_tmp, Bconsz_tmp, xye(1), xtemp(1), rhominus(i,j,k),& velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),pressminus(i,j,k),& @@ -934,7 +934,7 @@ subroutine Conservative2PrimitiveBoundsAM(CCTK_ARGUMENTS) Bconsx_tmp = sqrt(avg_detr)*Bvecxplus(i,j,k) Bconsy_tmp = sqrt(avg_detr)*Bvecyplus(i,j,k) Bconsz_tmp = sqrt(avg_detr)*Bveczplus(i,j,k) - call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, keytemp, GRHydro_eos_rf_prec, local_gam(1),densplus(i,j,k), & + call GRHydro_Con2PrimM_pt2(GRHydro_eos_handle, keytemp, GRHydro_eos_rf_prec, GRHydro_perc_ptol, local_gam(1), densplus(i,j,k), & sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k), tauplus(i,j,k), & Bconsx_tmp, Bconsy_tmp, Bconsz_tmp, xye(1), xtemp(1), rhoplus(i,j,k),& velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& |