diff options
| author | rhaas <rhaas@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2013-02-11 16:30:06 +0000 |
|---|---|---|
| committer | rhaas <rhaas@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2013-02-11 16:30:06 +0000 |
| commit | a2508f3d268c2abf4fab3eeb6e553508d32a0436 (patch) | |
| tree | cd1ec9efe5c8e27c9f866f4a0b78d42e1c20bd0c /src/GRHydro_Marquina.F90 | |
| parent | b770b656fbd9926096a99da9b72dc39c44a4fcf9 (diff) | |
* add option to reconstruct temperature to GRHydro
This does not yet work with the MHD part of the code,
but Philipp is going to change this.
* Improve TOVSolverHot; in particular, give functions unique
names to avoid duplicate symbols with TOVSolverC
From: Christian Ott <cott@bethe.tapir.caltech.edu>
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@473 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
Diffstat (limited to 'src/GRHydro_Marquina.F90')
| -rw-r--r-- | src/GRHydro_Marquina.F90 | 29 |
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), & |