aboutsummaryrefslogtreecommitdiff
path: root/src/GRHydro_UpdateMask.F90
diff options
context:
space:
mode:
Diffstat (limited to 'src/GRHydro_UpdateMask.F90')
-rw-r--r--src/GRHydro_UpdateMask.F9038
1 files changed, 18 insertions, 20 deletions
diff --git a/src/GRHydro_UpdateMask.F90 b/src/GRHydro_UpdateMask.F90
index 2fd47df..60243de 100644
--- a/src/GRHydro_UpdateMask.F90
+++ b/src/GRHydro_UpdateMask.F90
@@ -250,7 +250,7 @@ subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
DECLARE_CCTK_PARAMETERS
CCTK_INT :: i, j, k
- CCTK_REAL :: det, dummy1, dummy2
+ CCTK_REAL :: sdet, dummy1, dummy2
! save memory when MP is not used
@@ -286,7 +286,7 @@ subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
if (verbose.eq.1) call CCTK_INFO("Entering AtmosphereReset.")
-!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr, dummy1, dummy2)
+!$OMP PARALLEL DO PRIVATE(sdet,keytemp,i,j,k,anyerr,keyerr, dummy1, dummy2)
do k = 1, cctk_lsh(3)
do j = 1, cctk_lsh(2)
do i = 1, cctk_lsh(1)
@@ -297,8 +297,7 @@ subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
velx(i,j,k) = 0.0d0
vely(i,j,k) = 0.0d0
velz(i,j,k) = 0.0d0
- 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 = sdetg(i,j,k)
if(evolve_temper.ne.0) then
! ! set the temperature to be relatively low
@@ -313,7 +312,7 @@ subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
cctk_iteration,i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),&
g11(i,j,k),g12(i,j,k),&
g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), &
- det,dens(i,j,k),scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
+ sdet,dens(i,j,k),scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), &
velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k),&
temperature(i,j,k),y_e(i,j,k))
@@ -321,7 +320,7 @@ subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
else
call prim2conpolytype(GRHydro_polytrope_handle, &
g11(i,j,k), g12(i,j,k), g13(i,j,k), &
- g22(i,j,k), g23(i,j,k), g33(i,j,k), det, &
+ g22(i,j,k), g23(i,j,k), g33(i,j,k), sdet, &
dens(i,j,k), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), &
velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k))
@@ -361,7 +360,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
DECLARE_CCTK_PARAMETERS
CCTK_INT :: i, j, k
- CCTK_REAL :: det
+ CCTK_REAL :: sdet
CCTK_REAL :: rho_min, dummy1, dummy2
CCTK_INT :: eos_handle
@@ -450,7 +449,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
rho_min = rho_min * initial_atmosphere_factor
endif
-!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr, dummy1, dummy2)
+!$OMP PARALLEL DO PRIVATE(sdet,keytemp,i,j,k,anyerr,keyerr, dummy1, dummy2)
do k = 1, cctk_lsh(3)
do j = 1, cctk_lsh(2)
do i = 1, cctk_lsh(1)
@@ -460,8 +459,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
GRHydro_enable_internal_excision /= 0 .and. &
hydro_excision_mask(i,j,k) .ne. 0) then
SET_ATMO_MIN(rho(i,j,k), dummy2, r(i,j,k))
- 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 = sdetg(i,j,k)
velx(i,j,k) = 0.0d0
vely(i,j,k) = 0.0d0
@@ -480,7 +478,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
cctk_iteration,i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),&
g11(i,j,k),g12(i,j,k),&
g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), &
- det,dens(i,j,k),scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
+ sdet,dens(i,j,k),scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), &
velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k),&
temperature(i,j,k),y_e(i,j,k))
@@ -493,7 +491,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
rho(i,j,k),xeps,xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr)
call prim2conpolytype(eos_handle, &
g11(i,j,k), g12(i,j,k), g13(i,j,k), &
- g22(i,j,k), g23(i,j,k), g33(i,j,k), det, &
+ g22(i,j,k), g23(i,j,k), g33(i,j,k), sdet, &
dens(i,j,k), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), &
velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k))
@@ -506,8 +504,8 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
vely_p(i,j,k) = 0.0d0
velz_p(i,j,k) = 0.0d0
- det = SPATIAL_DETERMINANT(g11_p(i,j,k), g12_p(i,j,k), g13_p(i,j,k), \
- g22_p(i,j,k), g23_p(i,j,k), g33_p(i,j,k))
+ sdet = sqrt(SPATIAL_DETERMINANT(g11_p(i,j,k), g12_p(i,j,k), g13_p(i,j,k), \
+ g22_p(i,j,k), g23_p(i,j,k), g33_p(i,j,k)))
if(evolve_temper.ne.0) then
! set the temperature to be relatively low
@@ -522,7 +520,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
cctk_iteration,i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),&
g11_p(i,j,k),g12_p(i,j,k),&
g13_p(i,j,k),g22_p(i,j,k),g23_p(i,j,k),g33_p(i,j,k), &
- det,dens_p(i,j,k),scon_p(i,j,k,1), scon_p(i,j,k,2), scon_p(i,j,k,3), &
+ sdet,dens_p(i,j,k),scon_p(i,j,k,1), scon_p(i,j,k,2), scon_p(i,j,k,3), &
tau_p(i,j,k), rho_p(i,j,k), velx_p(i,j,k), vely_p(i,j,k), &
velz_p(i,j,k), eps_p(i,j,k), press_p(i,j,k), w_lorentz_p(i,j,k),&
temperature_p(i,j,k),y_e_p(i,j,k))
@@ -535,7 +533,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
rho_p(i,j,k),xeps,xtemp,xye,press_p(i,j,k),eps_p(i,j,k),keyerr,anyerr)
call prim2conpolytype(eos_handle, &
g11_p(i,j,k), g12_p(i,j,k), g13_p(i,j,k), &
- g22_p(i,j,k), g23_p(i,j,k), g33_p(i,j,k), det, &
+ g22_p(i,j,k), g23_p(i,j,k), g33_p(i,j,k), sdet, &
dens_p(i,j,k), scon_p(i,j,k,1), scon_p(i,j,k,2), scon_p(i,j,k,3), &
tau_p(i,j,k), rho_p(i,j,k), velx_p(i,j,k), vely_p(i,j,k), &
velz_p(i,j,k), eps_p(i,j,k), press_p(i,j,k), w_lorentz_p(i,j,k))
@@ -549,8 +547,8 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
velx_p_p(i,j,k) = 0.0d0
vely_p_p(i,j,k) = 0.0d0
velz_p_p(i,j,k) = 0.0d0
- det = SPATIAL_DETERMINANT(g11_p_p(i,j,k), g12_p_p(i,j,k), g13_p_p(i,j,k), \
- g22_p_p(i,j,k), g23_p_p(i,j,k), g33_p_p(i,j,k))
+ sdet = sqrt(SPATIAL_DETERMINANT(g11_p_p(i,j,k), g12_p_p(i,j,k), g13_p_p(i,j,k), \
+ g22_p_p(i,j,k), g23_p_p(i,j,k), g33_p_p(i,j,k)))
if(evolve_temper.ne.0) then
! set the temperature to be relatively low
@@ -564,7 +562,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
cctk_iteration,i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),&
g11_p_p(i,j,k),g12_p_p(i,j,k),&
g13_p_p(i,j,k),g22_p_p(i,j,k),g23_p_p(i,j,k),g33_p_p(i,j,k), &
- det,dens_p_p(i,j,k),scon_p_p(i,j,k,1), scon_p_p(i,j,k,2), scon_p_p(i,j,k,3), &
+ sdet,dens_p_p(i,j,k),scon_p_p(i,j,k,1), scon_p_p(i,j,k,2), scon_p_p(i,j,k,3), &
tau_p_p(i,j,k), rho_p_p(i,j,k), velx_p_p(i,j,k), vely_p_p(i,j,k), &
velz_p_p(i,j,k), eps_p_p(i,j,k), press_p_p(i,j,k), w_lorentz_p_p(i,j,k),&
temperature_p_p(i,j,k),y_e_p_p(i,j,k))
@@ -577,7 +575,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
rho_p_p(i,j,k),xeps,xtemp,xye,press_p_p(i,j,k),eps_p_p(i,j,k),keyerr,anyerr)
call prim2conpolytype(eos_handle, &
g11_p_p(i,j,k), g12_p_p(i,j,k), g13_p_p(i,j,k), &
- g22_p_p(i,j,k), g23_p_p(i,j,k), g33_p_p(i,j,k), det, &
+ g22_p_p(i,j,k), g23_p_p(i,j,k), g33_p_p(i,j,k), sdet, &
dens_p_p(i,j,k), scon_p_p(i,j,k,1), scon_p_p(i,j,k,2), scon_p_p(i,j,k,3), &
tau_p_p(i,j,k), rho_p_p(i,j,k), velx_p_p(i,j,k), vely_p_p(i,j,k), &
velz_p_p(i,j,k), eps_p_p(i,j,k), press_p_p(i,j,k), w_lorentz_p_p(i,j,k))