diff options
Diffstat (limited to 'src/GRHydro_HLLE.F90')
| -rw-r--r-- | src/GRHydro_HLLE.F90 | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/src/GRHydro_HLLE.F90 b/src/GRHydro_HLLE.F90 index 7bf70e7..3271ff9 100644 --- a/src/GRHydro_HLLE.F90 +++ b/src/GRHydro_HLLE.F90 @@ -47,13 +47,13 @@ subroutine GRHydro_HLLE(CCTK_ARGUMENTS) DECLARE_CCTK_PARAMETERS integer :: i, j, k, m + integer :: keytemp CCTK_REAL, dimension(5) :: consp,consm_i,fplus,fminus,lamplus CCTK_REAL, dimension(5) :: f1,lamminus CCTK_REAL, dimension(5) :: qdiff CCTK_REAL :: charmin, charmax, charpm,avg_alp,avg_det CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r - CCTK_REAL :: xtemp CCTK_INT :: type_bits, trivial, not_trivial @@ -100,11 +100,17 @@ subroutine GRHydro_HLLE(CCTK_ARGUMENTS) call CCTK_WARN(0, "Flux direction not x,y,z") end if + if(evolve_temper.eq.1.and.reconstruct_temper.eq.1) then + keytemp = 1 + else + keytemp = 0 + endif + !$OMP PARALLEL DO PRIVATE(k,j,i,f1,lamminus,lamplus,consp,consm_i, & !$OMP fplus,fminus,qdiff,avg_beta,avg_alp, & !$OMP avg_det,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, & !$OMP uxxh,uxyh,uxzh,uyyh,uyzh,uzzh, & - !$OMP usendh, xtemp, charmin, charmax, charpm, & + !$OMP usendh, charmin, charmax, charpm, & !$OMP m) do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil @@ -234,25 +240,26 @@ subroutine GRHydro_HLLE(CCTK_ARGUMENTS) gyzh,gzzh,& usendh,avg_alp,avg_beta) else - xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + call eigenvalues_hot(GRHydro_eos_handle,keytemp,& + i,j,k,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& epsminus(i+xoffset,j+yoffset,k+zoffset),& - xtemp,& + tempminus(i+xoffset,j+yoffset,k+zoffset),& y_e_minus(i+xoffset,j+yoffset,k+zoffset),& w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gxxh,gxyh,gxzh,gyyh,& gyzh,gzzh,& usendh,avg_alp,avg_beta) - xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + call eigenvalues_hot(GRHydro_eos_handle,keytemp,& + i,j,k,& rhoplus(i,j,k),& velxplus(i,j,k),velyplus(i,j,k),& velzplus(i,j,k),epsplus(i,j,k), & - xtemp,y_e_plus(i,j,k),& + tempplus(i+xoffset,j+yoffset,k+zoffset),& + y_e_plus(i,j,k),& w_lorentzplus(i,j,k),& lamplus,gxxh,gxyh,gxzh,gyyh,& gyzh,gzzh,& @@ -287,25 +294,23 @@ subroutine GRHydro_HLLE(CCTK_ARGUMENTS) gxzh,gxxh,& usendh,avg_alp,avg_beta) else - xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + call eigenvalues_hot(GRHydro_eos_handle,keytemp,i,j,k,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& epsminus(i+xoffset,j+yoffset,k+zoffset),& - xtemp,& + tempminus(i+xoffset,j+yoffset,k+zoffset),& y_e_minus(i+xoffset,j+yoffset,k+zoffset),& w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gyyh,gyzh,gxyh,gzzh,& gxzh,gxxh,& usendh,avg_alp,avg_beta) - xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + call eigenvalues_hot(GRHydro_eos_handle,keytemp,i,j,k,& rhoplus(i,j,k),& velyplus(i,j,k),velzplus(i,j,k),& velxplus(i,j,k),epsplus(i,j,k),& - xtemp,y_e_plus(i,j,k),& + tempplus(i,j,k),y_e_plus(i,j,k),& w_lorentzplus(i,j,k),& lamplus,gyyh,gyzh,gxyh,gzzh,& gxzh,gxxh,& @@ -340,24 +345,24 @@ subroutine GRHydro_HLLE(CCTK_ARGUMENTS) gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) else - xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + call eigenvalues_hot(GRHydro_eos_handle,keytemp,i,j,k,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& epsminus(i+xoffset,j+yoffset,k+zoffset),& - xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),& + tempminus(i+xoffset,j+yoffset,k+zoffset),& + y_e_minus(i+xoffset,j+yoffset,k+zoffset),& w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gzzh,gxzh,gyzh,& gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) - xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + call eigenvalues_hot(GRHydro_eos_handle,keytemp,& + i,j,k,& rhoplus(i,j,k),& velzplus(i,j,k),velxplus(i,j,k),& velyplus(i,j,k),epsplus(i,j,k),& - xtemp,y_e_plus(i,j,k),& + tempplus(i,j,k),y_e_plus(i,j,k),& w_lorentzplus(i,j,k),& lamplus,gzzh,gxzh,gyzh,& gxxh,gxyh,gyyh,& |