diff options
Diffstat (limited to 'src/GRHydro_RoeSolver.F90')
| -rw-r--r-- | src/GRHydro_RoeSolver.F90 | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/GRHydro_RoeSolver.F90 b/src/GRHydro_RoeSolver.F90 index 7d77599..329c081 100644 --- a/src/GRHydro_RoeSolver.F90 +++ b/src/GRHydro_RoeSolver.F90 @@ -11,6 +11,7 @@ #include "cctk_Arguments.h" #include "cctk_Parameters.h" #include "cctk_Functions.h" +#include "GRHydro_Macros.h" #include "SpaceMask.h" @@ -138,19 +139,7 @@ subroutine GRHydro_RoeSolve(CCTK_ARGUMENTS) gzzh = 0.5d0 * (gzz(i+xoffset,j+yoffset,k+zoffset) + & gzz(i,j,k)) - if (conformal_state > 0) then - - psi4h = (0.5d0*(psi(i,j,k)+psi(i+xoffset,j+yoffset,k+zoffset)))**4 - gxxh = gxxh * psi4h - gxyh = gxyh * psi4h - gxzh = gxzh * psi4h - gyyh = gyyh * psi4h - gyzh = gyzh * psi4h - gzzh = gzzh * psi4h - - end if - - call SpatialDeterminant(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,avg_det) + avg_det = SPATIAL_DETERMINANT(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh) !!$ If the Riemann problem is trivial, just calculate the fluxes from the !!$ left state and skip to the next cell @@ -493,20 +482,8 @@ subroutine GRHydro_RoeSolveGeneral(CCTK_ARGUMENTS) gyz(i,j,k)) gzzh = 0.5d0 * (gzz(i+xoffset,j+yoffset,k+zoffset) + & gzz(i,j,k)) - - if (conformal_state > 0) then - - psi4h = (0.5d0*(psi(i,j,k)+psi(i+xoffset,j+yoffset,k+zoffset)))**4 - gxxh = gxxh * psi4h - gxyh = gxyh * psi4h - gxzh = gxzh * psi4h - gyyh = gyyh * psi4h - gyzh = gyzh * psi4h - gzzh = gzzh * psi4h - - end if - call SpatialDeterminant(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,avg_det) + avg_det = SPATIAL_DETERMINANT(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh) !!$ If the Riemann problem is trivial the flux is already correct |