aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcott <cott@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45>2010-12-31 20:03:19 +0000
committercott <cott@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45>2010-12-31 20:03:19 +0000
commitb299d28338e664489bf6d89c795897179370eb46 (patch)
tree4a9aa8de8994902633edd1155cb139d8ea0f0e7a
parent76c05f596fed0444885e9f49ee54b5caeec386f5 (diff)
* update prim2con_hot pointwise function to conform
to interface definition of EOS_Omni functions git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@204 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
-rw-r--r--src/GRHydro_Prim2Con.F9017
1 files changed, 9 insertions, 8 deletions
diff --git a/src/GRHydro_Prim2Con.F90 b/src/GRHydro_Prim2Con.F90
index 048e6ae..71f2825 100644
--- a/src/GRHydro_Prim2Con.F90
+++ b/src/GRHydro_Prim2Con.F90
@@ -220,11 +220,12 @@ subroutine prim2con_hot(handle, GRHydro_reflevel, ii, jj, kk, &
implicit none
DECLARE_CCTK_PARAMETERS
+ DECLARE_CCTK_FUNCTIONS
CCTK_REAL :: gxx, gxy, gxz, gyy, gyz, gzz, det
- CCTK_REAL :: ddens, dsx, dsy, dsz, dtau, drho, dvelx, dvely, dvelz,&
- deps, dpress, w, vlowx, vlowy, vlowz
- CCTK_REAL :: temp,ye, x, y, z
+ CCTK_REAL :: ddens, dsx, dsy, dsz, dtau, drho(1), dvelx, dvely, dvelz,&
+ deps(1), dpress(1), w, vlowx, vlowy, vlowz
+ CCTK_REAL :: temp(1),ye(1), x, y, z
CCTK_INT :: handle, GRHydro_reflevel, ii, jj, kk
character(len=512) warnline
@@ -278,11 +279,11 @@ subroutine prim2con_hot(handle, GRHydro_reflevel, ii, jj, kk, &
vlowy = gxy*dvelx + gyy*dvely + gyz*dvelz
vlowz = gxz*dvelx + gyz*dvely + gzz*dvelz
- ddens = sqrt(det) * drho * w
- dsx = sqrt(det) * (drho*(1+deps)+dpress)*w*w * vlowx
- dsy = sqrt(det) * (drho*(1+deps)+dpress)*w*w * vlowy
- dsz = sqrt(det) * (drho*(1+deps)+dpress)*w*w * vlowz
- dtau = sqrt(det) * ((drho*(1+deps)+dpress)*w*w - dpress) - ddens
+ ddens = sqrt(det) * drho(1) * w
+ dsx = sqrt(det) * (drho(1)*(1+deps(1))+dpress(1))*w*w * vlowx
+ dsy = sqrt(det) * (drho(1)*(1+deps(1))+dpress(1))*w*w * vlowy
+ dsz = sqrt(det) * (drho(1)*(1+deps(1))+dpress(1))*w*w * vlowz
+ dtau = sqrt(det) * ((drho(1)*(1+deps(1))+dpress(1))*w*w - dpress(1)) - ddens
end subroutine prim2con_hot