diff options
| author | cott <cott@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2010-08-27 20:30:51 +0000 |
|---|---|---|
| committer | cott <cott@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2010-08-27 20:30:51 +0000 |
| commit | 39d5f5e568fecb8cf28f7a13418c472b14a85966 (patch) | |
| tree | 702d5448cecb79d96d7fbc0ef758a493de569d98 /src/GRHydro_Boundaries.F90 | |
| parent | b9d5cef4e0c1a57d0b83961350d68b556f72e2c1 (diff) | |
* remove dependence on StaticConformal
* change calculation of the determinant of the 3-metric from
a subroutine call to a macro.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@152 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
Diffstat (limited to 'src/GRHydro_Boundaries.F90')
| -rw-r--r-- | src/GRHydro_Boundaries.F90 | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/GRHydro_Boundaries.F90 b/src/GRHydro_Boundaries.F90 index 5e8c093..b4dcafb 100644 --- a/src/GRHydro_Boundaries.F90 +++ b/src/GRHydro_Boundaries.F90 @@ -11,6 +11,7 @@ #include "cctk_Parameters.h" #include "cctk_Arguments.h" #include "cctk_Functions.h" +#include "GRHydro_Macros.h" #include "util_Table.h" @@ -246,16 +247,9 @@ subroutine GRHydro_OutflowBoundaries(CCTK_ARGUMENTS) press(i,j,k) = press(i,j,k-1) w_lorentz(i,j,k) = w_lorentz(i,j,k-1) - if (conformal_state .eq. 0) then - psi4pt = 1d0 - call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& - gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),det) - else - psi4pt = psi(i,j,k)**4 - call SpatialDeterminant(psi4pt*gxx(i,j,k),psi4pt*gxy(i,j,k),& - psi4pt*gxz(i,j,k),psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),& - psi4pt*gzz(i,j,k),det) - end if + psi4pt = 1.0d0 + det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),\ + gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& @@ -293,16 +287,9 @@ subroutine GRHydro_OutflowBoundaries(CCTK_ARGUMENTS) press(i,j,k) = press(i,j,k+1) w_lorentz(i,j,k) = w_lorentz(i,j,k+1) - if (conformal_state .eq. 0) then - psi4pt = 1d0 - call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& - gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),det) - else - psi4pt = psi(i,j,k)**4 - call SpatialDeterminant(psi4pt*gxx(i,j,k),psi4pt*gxy(i,j,k),& - psi4pt*gxz(i,j,k),psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),& - psi4pt*gzz(i,j,k),det) - end if + psi4pt = 1.0d0 + det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),\ + gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& |