aboutsummaryrefslogtreecommitdiff
path: root/src/GRHydro_Marquina.F90
diff options
context:
space:
mode:
Diffstat (limited to 'src/GRHydro_Marquina.F90')
-rw-r--r--src/GRHydro_Marquina.F9029
1 files changed, 19 insertions, 10 deletions
diff --git a/src/GRHydro_Marquina.F90 b/src/GRHydro_Marquina.F90
index ac54b0a..18621c9 100644
--- a/src/GRHydro_Marquina.F90
+++ b/src/GRHydro_Marquina.F90
@@ -47,12 +47,18 @@ subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
avg_det,uxxh,uxyh,uxzh,uyyh,uyzh,uzzh,&
pressp,pressm_i, &
tmp_w_lorentzp, tmp_w_lorentzm_i, w_lorentzp,w_lorentzm_i, usendh, psi4h
- CCTK_REAL :: xtemp
integer :: m
integer :: i,j,k
+ integer :: keytemp
CCTK_INT :: type_bits, trivial, not_trivial
+ if(evolve_temper.eq.1.and.reconstruct_temper.eq.1) then
+ keytemp = 1
+ else
+ keytemp = 0
+ endif
+
if (flux_direction == 1) then
call SpaceMask_GetTypeBits(type_bits, "Hydro_RiemannProblemX")
call SpaceMask_GetStateBits(trivial, "Hydro_RiemannProblemX", &
@@ -222,12 +228,13 @@ subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
marquinaflux(2),marquinaflux(3),marquinaflux(4), &
marquinaflux(5))
else
- xtemp = temperature(i,j,k)
- call eigenproblem_marquina_hot(GRHydro_eos_handle,&
+ call eigenproblem_marquina_hot(GRHydro_eos_handle,keytemp,&
primm_i(1),primm_i(2), &
primm_i(3),primm_i(4),primm_i(5),primp(1), &
primp(2),primp(3),primp(4),primp(5), &
- xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),y_e_plus(i,j,k),&
+ tempminus(i+xoffset,j+yoffset,k+zoffset),&
+ tempplus(i,j,k),&
+ y_e_minus(i+xoffset,j+yoffset,k+zoffset),y_e_plus(i,j,k),&
gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, &
usendh,avg_det,avg_alp,avg_beta,consp(1),consp(2),&
consp(3), consp(4), consp(5),consm_i(1),consm_i(2), &
@@ -251,12 +258,13 @@ subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
marquinaflux(3),marquinaflux(4),marquinaflux(2), &
marquinaflux(5))
else
- xtemp = temperature(i,j,k)
- call eigenproblem_marquina_hot(GRHydro_eos_handle,&
+ call eigenproblem_marquina_hot(GRHydro_eos_handle,keytemp,&
primm_i(1),primm_i(3), &
primm_i(4),primm_i(2),primm_i(5),primp(1), &
primp(3),primp(4),primp(2),primp(5), &
- xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),y_e_plus(i,j,k),&
+ tempminus(i+xoffset,j+yoffset,k+zoffset),&
+ tempplus(i,j,k),&
+ y_e_minus(i+xoffset,j+yoffset,k+zoffset),y_e_plus(i,j,k),&
gyyh,gyzh,gxyh,gzzh,gxzh,gxxh, &
usendh,avg_det,avg_alp,avg_beta,consp(1),consp(3),&
consp(4), consp(2), consp(5),consm_i(1),consm_i(3), &
@@ -280,12 +288,13 @@ subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
marquinaflux(4),marquinaflux(2),marquinaflux(3), &
marquinaflux(5))
else
- xtemp = temperature(i,j,k)
- call eigenproblem_marquina_hot(GRHydro_eos_handle,&
+ call eigenproblem_marquina_hot(GRHydro_eos_handle,keytemp,&
primm_i(1),primm_i(4), &
primm_i(2),primm_i(3),primm_i(5),primp(1), &
primp(4),primp(2),primp(3),primp(5), &
- xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),y_e_plus(i,j,k),&
+ tempminus(i+xoffset,j+yoffset,k+zoffset),&
+ tempplus(i,j,k),&
+ y_e_minus(i+xoffset,j+yoffset,k+zoffset),y_e_plus(i,j,k),&
gzzh,gxzh,gyzh,gxxh,gxyh,gyyh, &
usendh,avg_det,avg_alp,avg_beta,consp(1),consp(4),&
consp(2), consp(3), consp(5),consm_i(1),consm_i(4), &