aboutsummaryrefslogtreecommitdiff
path: root/src/GRHydro_UpdateMaskM.F90
diff options
context:
space:
mode:
Diffstat (limited to 'src/GRHydro_UpdateMaskM.F90')
-rw-r--r--src/GRHydro_UpdateMaskM.F9076
1 files changed, 36 insertions, 40 deletions
diff --git a/src/GRHydro_UpdateMaskM.F90 b/src/GRHydro_UpdateMaskM.F90
index 84fdec5..2c16ccf 100644
--- a/src/GRHydro_UpdateMaskM.F90
+++ b/src/GRHydro_UpdateMaskM.F90
@@ -59,7 +59,7 @@ subroutine GRHydro_AtmosphereResetM(CCTK_ARGUMENTS)
DECLARE_CCTK_PARAMETERS
CCTK_INT :: i, j, k
- CCTK_REAL :: det
+ CCTK_REAL :: sdet
! begin EOS Omni vars
integer :: n,keytemp,anyerr,keyerr(1)
@@ -107,7 +107,7 @@ subroutine GRHydro_AtmosphereResetM(CCTK_ARGUMENTS)
if (verbose.eq.1) call CCTK_INFO("Entering AtmosphereReset.")
-!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr)
+!$OMP PARALLEL DO PRIVATE(sdet,keytemp,i,j,k,anyerr,keyerr)
do k = 1, cctk_lsh(3)
do j = 1, cctk_lsh(2)
do i = 1, cctk_lsh(1)
@@ -118,8 +118,7 @@ subroutine GRHydro_AtmosphereResetM(CCTK_ARGUMENTS)
vup(i,j,k,1) = 0.0d0
vup(i,j,k,2) = 0.0d0
vup(i,j,k,3) = 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
@@ -133,7 +132,7 @@ subroutine GRHydro_AtmosphereResetM(CCTK_ARGUMENTS)
call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,&
i,j,k,x(i,j,k),y(i,j,k),z(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),Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),&
rho(i,j,k),vup(i,j,k,1),vup(i,j,k,2),vup(i,j,k,3),&
eps(i,j,k),press(i,j,k),Bprim(i,j,k,1), &
@@ -145,7 +144,7 @@ subroutine GRHydro_AtmosphereResetM(CCTK_ARGUMENTS)
call prim2conpolytypeM(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), Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),&
rho(i,j,k), vup(i,j,k,1), vup(i,j,k,2), &
@@ -199,7 +198,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
DECLARE_CCTK_PARAMETERS
CCTK_INT :: i, j, k
- CCTK_REAL :: det
+ CCTK_REAL :: sdet
CCTK_REAL :: rho_min
CCTK_INT :: eos_handle
@@ -318,7 +317,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
rho_min = rho_min * initial_atmosphere_factor
endif
-!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr)
+!$OMP PARALLEL DO PRIVATE(sdet,keytemp,i,j,k,anyerr,keyerr)
do k = 1, cctk_lsh(3)
do j = 1, cctk_lsh(2)
do i = 1, cctk_lsh(1)
@@ -331,8 +330,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
vup(i,j,k,2) = 0.0d0
vup(i,j,k,3) = 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
@@ -345,7 +343,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,&
i,j,k,x(i,j,k),y(i,j,k),z(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),Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),&
rho(i,j,k),vup(i,j,k,1),vup(i,j,k,2),vup(i,j,k,3),&
eps(i,j,k),press(i,j,k),Bprim(i,j,k,1), &
@@ -363,7 +361,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
call prim2conpolytypeM(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), Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),&
rho(i,j,k), vup(i,j,k,1), vup(i,j,k,2), &
@@ -378,8 +376,8 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
vup_p(i,j,k,2) = 0.0d0
vup_p(i,j,k,3) = 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
@@ -392,7 +390,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,&
i,j,k,x(i,j,k),y(i,j,k),z(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),Bcons_p(i,j,k,1),Bcons_p(i,j,k,2),Bcons_p(i,j,k,3),&
rho_p(i,j,k),vup_p(i,j,k,1),vup_p(i,j,k,2),vup_p(i,j,k,3),&
eps_p(i,j,k),press_p(i,j,k),Bprim_p(i,j,k,1), &
@@ -410,7 +408,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
call prim2conpolytypeM(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), Bcons_p(i,j,k,1),Bcons_p(i,j,k,2),Bcons_p(i,j,k,3),&
rho_p(i,j,k), vup_p(i,j,k,1), vup_p(i,j,k,2), &
@@ -427,8 +425,8 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
vup_p_p(i,j,k,2) = 0.0d0
vup_p_p(i,j,k,3) = 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
@@ -441,7 +439,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,&
i,j,k,x(i,j,k),y(i,j,k),z(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),Bcons_p_p(i,j,k,1),Bcons_p_p(i,j,k,2),Bcons_p_p(i,j,k,3),&
rho_p_p(i,j,k),vup_p_p(i,j,k,1),vup_p_p(i,j,k,2),vup_p_p(i,j,k,3),&
eps_p_p(i,j,k),press_p_p(i,j,k),Bprim_p_p(i,j,k,1), &
@@ -459,7 +457,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS)
call prim2conpolytypeM(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), Bcons_p_p(i,j,k,1),Bcons_p_p(i,j,k,2),Bcons_p_p(i,j,k,3),&
rho_p_p(i,j,k), vup_p_p(i,j,k,1), vup_p_p(i,j,k,2), &
@@ -534,7 +532,7 @@ subroutine GRHydro_AtmosphereResetAM(CCTK_ARGUMENTS)
DECLARE_CCTK_PARAMETERS
CCTK_INT :: i, j, k
- CCTK_REAL :: det
+ CCTK_REAL :: sdet
! begin EOS Omni vars
integer :: n,keytemp,anyerr,keyerr(1)
@@ -582,7 +580,7 @@ subroutine GRHydro_AtmosphereResetAM(CCTK_ARGUMENTS)
if (verbose.eq.1) call CCTK_INFO("Entering AtmosphereReset.")
-!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr)
+!$OMP PARALLEL DO PRIVATE(sdet,keytemp,i,j,k,anyerr,keyerr)
do k = 1, cctk_lsh(3)
do j = 1, cctk_lsh(2)
do i = 1, cctk_lsh(1)
@@ -593,8 +591,7 @@ subroutine GRHydro_AtmosphereResetAM(CCTK_ARGUMENTS)
vup(i,j,k,1) = 0.0d0
vup(i,j,k,2) = 0.0d0
vup(i,j,k,3) = 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
@@ -608,7 +605,7 @@ subroutine GRHydro_AtmosphereResetAM(CCTK_ARGUMENTS)
call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,&
i,j,k,x(i,j,k),y(i,j,k),z(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),Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),&
rho(i,j,k),vup(i,j,k,1),vup(i,j,k,2),vup(i,j,k,3),&
eps(i,j,k),press(i,j,k),Bprim(i,j,k,1), &
@@ -620,7 +617,7 @@ subroutine GRHydro_AtmosphereResetAM(CCTK_ARGUMENTS)
call prim2conpolytypeM(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), Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),&
rho(i,j,k), vup(i,j,k,1), vup(i,j,k,2), &
@@ -674,7 +671,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
DECLARE_CCTK_PARAMETERS
CCTK_INT :: i, j, k
- CCTK_REAL :: det
+ CCTK_REAL :: sdet
CCTK_REAL :: rho_min
CCTK_INT :: eos_handle
@@ -793,7 +790,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
rho_min = rho_min * initial_atmosphere_factor
endif
-!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr)
+!$OMP PARALLEL DO PRIVATE(sdet,keytemp,i,j,k,anyerr,keyerr)
do k = 1, cctk_lsh(3)
do j = 1, cctk_lsh(2)
do i = 1, cctk_lsh(1)
@@ -806,8 +803,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
vup(i,j,k,2) = 0.0d0
vup(i,j,k,3) = 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
@@ -820,7 +816,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,&
i,j,k,x(i,j,k),y(i,j,k),z(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),Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),&
rho(i,j,k),vup(i,j,k,1),vup(i,j,k,2),vup(i,j,k,3),&
eps(i,j,k),press(i,j,k),Bprim(i,j,k,1), &
@@ -838,7 +834,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
call prim2conpolytypeM(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), Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),&
rho(i,j,k), vup(i,j,k,1), vup(i,j,k,2), &
@@ -853,8 +849,8 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
vup_p(i,j,k,2) = 0.0d0
vup_p(i,j,k,3) = 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
@@ -867,7 +863,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,&
i,j,k,x(i,j,k),y(i,j,k),z(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),Bcons_p(i,j,k,1),Bcons_p(i,j,k,2),Bcons_p(i,j,k,3),&
rho_p(i,j,k),vup_p(i,j,k,1),vup_p(i,j,k,2),vup_p(i,j,k,3),&
eps_p(i,j,k),press_p(i,j,k),Bprim_p(i,j,k,1), &
@@ -885,7 +881,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
call prim2conpolytypeM(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), Bcons_p(i,j,k,1),Bcons_p(i,j,k,2),Bcons_p(i,j,k,3),&
rho_p(i,j,k), vup_p(i,j,k,1), vup_p(i,j,k,2), &
@@ -902,8 +898,8 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
vup_p_p(i,j,k,2) = 0.0d0
vup_p_p(i,j,k,3) = 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
@@ -916,7 +912,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,&
i,j,k,x(i,j,k),y(i,j,k),z(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),Bcons_p_p(i,j,k,1),Bcons_p_p(i,j,k,2),Bcons_p_p(i,j,k,3),&
rho_p_p(i,j,k),vup_p_p(i,j,k,1),vup_p_p(i,j,k,2),vup_p_p(i,j,k,3),&
eps_p_p(i,j,k),press_p_p(i,j,k),Bprim_p_p(i,j,k,1), &
@@ -934,7 +930,7 @@ subroutine GRHydro_InitialAtmosphereResetAM(CCTK_ARGUMENTS)
call prim2conpolytypeM(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), Bcons_p_p(i,j,k,1),Bcons_p_p(i,j,k,2),Bcons_p_p(i,j,k,3),&
rho_p_p(i,j,k), vup_p_p(i,j,k,1), vup_p_p(i,j,k,2), &