[Commits] [svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 204)

[cott at tapir.caltech.edu]

User: cott
Date: 2010/12/31 02:03 PM

Modified:
 /trunk/src/
  GRHydro_Prim2Con.F90

Log:
 * update prim2con_hot pointwise function to conform
   to interface definition of EOS_Omni functions

File Changes:

Directory: /trunk/src/
======================

File [modified]: GRHydro_Prim2Con.F90
Delta lines: +9 -8
===================================================================
--- trunk/src/GRHydro_Prim2Con.F90	2010-12-31 19:55:57 UTC (rev 203)
+++ trunk/src/GRHydro_Prim2Con.F90	2010-12-31 20:03:19 UTC (rev 204)
@@ -220,11 +220,12 @@
   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 @@
   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