[Commits] [svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 144)
knarf at cct.lsu.edu
knarf at cct.lsu.edu
Mon Aug 16 13:23:38 CDT 2010
User: knarf
Date: 2010/08/16 01:23 PM
Modified:
/trunk/src/
GRHydro_Con2Prim.F90, GRHydro_Eigenproblem.F90, GRHydro_Eigenproblem_Marquina.F90, GRHydro_EoSChangeGamma.F90, GRHydro_Prim2Con.F90
Log:
more #defines, use integer handles if given, remove eos_key usage
File Changes:
Directory: /trunk/src/
======================
File [modified]: GRHydro_Con2Prim.F90
Delta lines: +32 -42
===================================================================
--- trunk/src/GRHydro_Con2Prim.F90 2010-08-16 17:52:56 UTC (rev 143)
+++ trunk/src/GRHydro_Con2Prim.F90 2010-08-16 18:23:38 UTC (rev 144)
@@ -68,7 +68,6 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: poly_eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -76,7 +75,6 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- poly_eoskey = GRHydro_poly_eoskey
! end EOS Omni vars
#endif
@@ -96,9 +94,9 @@
#if USE_EOS_OMNI
! this is a poly call
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,&
GRHydro_rho_min,xeps,xtemp,xye,pmin,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,&
GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr)
#else
pmin = EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0)
@@ -160,10 +158,10 @@
vel(i,j,k,:) = 0.d0
w_lorentz(i,j,k) = 1.d0
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,&
rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,&
rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr)
#else
press(i,j,k) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,j,k), eps(i,j,k))
@@ -214,10 +212,10 @@
vel(i,j,k,:) = 0.d0
w_lorentz(i,j,k) = 1.d0
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,&
rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,&
rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr)
#else
press(i,j,k) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,j,k), eps(i,j,k))
@@ -297,14 +295,12 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
real*8 :: xpress = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- eoskey = GRHydro_eoskey
! end EOS Omni vars
#endif
@@ -321,7 +317,7 @@
!!$ Set initial guess for pressure:
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rho,epsilon,xtemp,xye,xpress,keyerr,anyerr)
pold = max(1.d-10,xpress)
#else
@@ -356,7 +352,7 @@
!!$ Calculate the function
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rho,epsilon,xtemp,xye,xpress,keyerr,anyerr)
f = pold - xpress
@@ -408,10 +404,10 @@
end if
#if USE_EOS_OMNI
- call EOS_Omni_DPressByDRho(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDRho(handle,keytemp,n,&
rho,epsilon,xtemp,xye,dpressbydrho,keyerr,anyerr)
- call EOS_Omni_DPressByDEps(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDEps(handle,keytemp,n,&
rho,epsilon,xtemp,xye,dpressbydeps,keyerr,anyerr)
#else
dpressbydrho = EOS_DPressByDRho(handle,rho,epsilon)
@@ -437,7 +433,7 @@
udens)/udens
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rho,epsilon,xtemp,xye,xpress,keyerr,anyerr)
f = pnew - xpress
@@ -452,10 +448,10 @@
do i=1,GRHydro_polish
#if USE_EOS_OMNI
- call EOS_Omni_DPressByDRho(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDRho(handle,keytemp,n,&
rho,epsilon,xtemp,xye,dpressbydrho,keyerr,anyerr)
- call EOS_Omni_DPressByDEps(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDEps(handle,keytemp,n,&
rho,epsilon,xtemp,xye,dpressbydeps,keyerr,anyerr)
#else
dpressbydrho = EOS_DPressByDRho(handle,rho,epsilon)
@@ -479,7 +475,7 @@
udens)/udens
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n, &
+ call EOS_Omni_press(handle,keytemp,n, &
rho,epsilon,xtemp,xye,xpress,keyerr,anyerr)
f = pold - xpress
@@ -579,8 +575,6 @@
#if USE_EOS_OMNI
! begin EOS omni
- CCTK_INT :: eoskey = 0
- CCTK_INT :: poly_eoskey = 0
CCTK_INT :: keyerr(1) = 0
CCTK_INT :: anyerr = 0
CCTK_INT :: keytemp = 0
@@ -588,18 +582,16 @@
CCTK_REAL :: xye = 0.0d0
CCTK_REAL :: xeps = 0.0d0
CCTK_REAL :: xtemp = 0.0d0
- eoskey = GRHydro_eoskey
- poly_eoskey = GRHydro_poly_eoskey
! end EOS omni
#endif
#if USE_EOS_OMNI
! this is a poly call
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,&
GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,&
GRHydro_rho_min,epsmin,xtemp,xye,pmin,epsmin,keyerr,anyerr)
#else
pmin=EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0)
@@ -937,7 +929,6 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: poly_eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -945,7 +936,6 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- poly_eoskey = GRHydro_poly_eoskey
! end EOS Omni vars
#endif
@@ -964,10 +954,10 @@
rhoold = max(GRHydro_rho_min,rho)
#if USE_EOS_OMNI
-! call EOS_Omni_press(poly_eoskey,keytemp,n,&
+! call EOS_Omni_press(handle,keytemp,n,&
! rhoold,xeps,xtemp,xye,xpress,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(handle,keytemp,n,&
rhoold,xeps,xtemp,xye,press,xeps,keyerr,anyerr)
enthalpy = 1.0d0 + xeps + press / rhoold
@@ -979,7 +969,7 @@
w_lorentz = sqrt(1.d0 + s2 / ( (udens*enthalpy)**2 ))
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhoold,epsilon,xtemp,xye,press,keyerr,anyerr)
#else
press = EOS_Pressure(handle, rhoold, epsilon)
@@ -1017,10 +1007,10 @@
udens = rhonew
dens = sqrtdet * rhonew
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhonew,1.0d0,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(handle,keytemp,n,&
rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr)
#else
press = EOS_Pressure(handle, rhonew, 1.d0)
@@ -1042,7 +1032,7 @@
!!$ 2D_Polytrope it gives the right answers.
#if USE_EOS_OMNI
- call EOS_Omni_DPressByDrho(poly_eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDrho(handle,keytemp,n,&
rhonew,epsilon,xtemp,xye,denthalpy,keyerr,anyerr)
denthalpy = denthalpy / rhonew
#else
@@ -1069,10 +1059,10 @@
!!$ Recalculate primitive variables and function
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhonew,epsilon,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(handle,keytemp,n,&
rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr)
enthalpy = 1.0d0 + epsilon + press / rhonew
@@ -1100,10 +1090,10 @@
dens = sqrtdet * rhonew
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhonew,1.0d0,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(handle,keytemp,n,&
rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr)
#else
press = EOS_Pressure(handle, rhonew, 1.d0)
@@ -1124,10 +1114,10 @@
50 rho = rhonew
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhonew,epsilon,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(handle,keytemp,n,&
rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr)
enthalpy = 1.0d0 + epsilon + press / rhonew
@@ -1138,10 +1128,10 @@
#endif
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhonew,epsilon,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(handle,keytemp,n,&
rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr)
#else
press = EOS_Pressure(handle, rhonew, epsilon)
@@ -1166,9 +1156,9 @@
rho = GRHydro_rho_min
dens = sqrtdet * rho
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhonew,1.d0,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(handle,keytemp,n,&
rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr)
#else
press = EOS_Pressure(handle, rhonew, 1.d0)
File [modified]: GRHydro_Eigenproblem.F90
Delta lines: +10 -16
===================================================================
--- trunk/src/GRHydro_Eigenproblem.F90 2010-08-16 17:52:56 UTC (rev 143)
+++ trunk/src/GRHydro_Eigenproblem.F90 2010-08-16 18:23:38 UTC (rev 144)
@@ -66,7 +66,6 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -74,7 +73,6 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- eoskey = GRHydro_eoskey
! end EOS Omni vars
#endif
@@ -86,15 +84,15 @@
#if USE_EOS_OMNI
-! call EOS_Omni_cs2(eoskey,keytemp,n,&
+! call EOS_Omni_cs2(handle,keytemp,n,&
! rho,eps,xtemp,xye,cs2,keyerr,anyerr)
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rho,eps,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_DPressByDEps(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDEps(handle,keytemp,n,&
rho,eps,xtemp,xye,dpdeps,keyerr,anyerr)
- call EOS_Omni_DPressByDRho(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDRho(handle,keytemp,n,&
rho,eps,xtemp,xye,dpdrho,keyerr,anyerr)
cs2 = (dpdrho + press * dpdeps / (rho**2))/ &
@@ -192,7 +190,6 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -200,7 +197,6 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- eoskey = GRHydro_eoskey
! end EOS Omni vars
#endif
@@ -210,18 +206,18 @@
!!$ Set required fluid quantities
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rho,eps,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_DPressByDEps(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDEps(handle,keytemp,n,&
rho,eps,xtemp,xye,dpdeps,keyerr,anyerr)
- call EOS_Omni_DPressByDRho(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDRho(handle,keytemp,n,&
rho,eps,xtemp,xye,dpdrho,keyerr,anyerr)
cs2 = (dpdrho + press * dpdeps / (rho**2))/ &
(1.0d0 + eps + press/rho)
-! call EOS_Omni_cs2(eoskey,keytemp,n,&
+! call EOS_Omni_cs2(handle,keytemp,n,&
! rho,eps,xtemp,xye,cs2,keyerr,anyerr)
#else
press = EOS_Pressure(handle,rho,eps)
@@ -577,7 +573,6 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -585,7 +580,6 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- eoskey = GRHydro_eoskey
! end EOS Omni vars
#endif
@@ -594,10 +588,10 @@
!!$ Set required fluid quantities
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rho,eps,xtemp,xye,press,keyerr,anyerr)
- call EOS_Omni_cs2(eoskey,keytemp,n,&
+ call EOS_Omni_cs2(handle,keytemp,n,&
rho,eps,xtemp,xye,cs2,keyerr,anyerr)
#else
press = EOS_Pressure(handle,rho,eps)
File [modified]: GRHydro_Eigenproblem_Marquina.F90
Delta lines: +10 -10
===================================================================
--- trunk/src/GRHydro_Eigenproblem_Marquina.F90 2010-08-16 17:52:56 UTC (rev 143)
+++ trunk/src/GRHydro_Eigenproblem_Marquina.F90 2010-08-16 18:23:38 UTC (rev 144)
@@ -92,15 +92,16 @@
!!$ Warning, warning. Nasty hack follows
+#if !USE_EOS_OMNI
#ifdef _EOS_BASE_INC_
#undef _EOS_BASE_INC_
#endif
#include "EOS_Base.inc"
+#endif
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -108,7 +109,6 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- eoskey = GRHydro_eoskey
! end EOS Omni vars
#endif
@@ -120,13 +120,13 @@
!!$ Set required fluid quantities
invrhol = one / rhol
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhol,epsl,xtemp,xye,pressl,keyerr,anyerr)
-! call EOS_Omni_cs2(eoskey,keytemp,n,&
+! call EOS_Omni_cs2(handle,keytemp,n,&
! rhol,epsl,xtemp,xye,cs2l,keyerr,anyerr)
- call EOS_Omni_DPressByDEps(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDEps(handle,keytemp,n,&
rhol,epsl,xtemp,xye,dpdepsl,keyerr,anyerr)
- call EOS_Omni_DPressByDRho(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDRho(handle,keytemp,n,&
rhol,epsl,xtemp,xye,dpdrhol,keyerr,anyerr)
cs2l = (dpdrhol + pressl * dpdepsl * invrhol**2)/ &
(1.0d0 + epsl + pressl*invrhol)
@@ -174,13 +174,13 @@
!!$ Set required fluid quantities
invrhor = one / rhor
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
rhor,epsr,xtemp,xye,pressr,keyerr,anyerr)
-! call EOS_Omni_cs2(eoskey,keytemp,n,&
+! call EOS_Omni_cs2(handle,keytemp,n,&
! rhor,epsr,xtemp,xye,cs2r,keyerr,anyerr)
- call EOS_Omni_DPressByDEps(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDEps(handle,keytemp,n,&
rhor,epsr,xtemp,xye,dpdepsr,keyerr,anyerr)
- call EOS_Omni_DPressByDRho(eoskey,keytemp,n,&
+ call EOS_Omni_DPressByDRho(handle,keytemp,n,&
rhor,epsr,xtemp,xye,dpdrhor,keyerr,anyerr)
cs2r = (dpdrhor + pressr * dpdepsr * invrhor**2)/ &
(1.0d0 + epsr + pressr*invrhor)
File [modified]: GRHydro_EoSChangeGamma.F90
Delta lines: +6 -12
===================================================================
--- trunk/src/GRHydro_EoSChangeGamma.F90 2010-08-16 17:52:56 UTC (rev 143)
+++ trunk/src/GRHydro_EoSChangeGamma.F90 2010-08-16 18:23:38 UTC (rev 144)
@@ -62,7 +62,6 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: poly_eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -70,12 +69,11 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- poly_eoskey = GRHydro_poly_eoskey
! end EOS Omni vars
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,&
1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,&
1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr)
local_Gamma = 1.0d0 + xpress/xeps
@@ -161,7 +159,6 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: poly_eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -169,12 +166,11 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- poly_eoskey = GRHydro_poly_eoskey
! end EOS Omni vars
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,&
1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,&
1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr)
local_Gamma = 1.0d0 + xpress/xeps
@@ -267,7 +263,6 @@
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: poly_eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -275,12 +270,11 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- poly_eoskey = GRHydro_poly_eoskey
! end EOS Omni vars
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,&
1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,&
1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr)
local_Gamma = 1.0d0 + xpress/xeps
File [modified]: GRHydro_Prim2Con.F90
Delta lines: +7 -7
===================================================================
--- trunk/src/GRHydro_Prim2Con.F90 2010-08-16 17:52:56 UTC (rev 143)
+++ trunk/src/GRHydro_Prim2Con.F90 2010-08-16 18:23:38 UTC (rev 144)
@@ -129,12 +129,13 @@
deps, dpress, w, vlowx, vlowy, vlowz
CCTK_INT :: handle
+#if !USE_EOS_OMNI
#include "EOS_Base.inc"
+#endif
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -142,7 +143,6 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- eoskey = GRHydro_eoskey
! end EOS Omni vars
#endif
@@ -151,7 +151,7 @@
*dvely*dvelz))
#if USE_EOS_OMNI
- call EOS_Omni_press(eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
drho,deps,xtemp,xye,dpress,keyerr,anyerr)
#else
dpress = EOS_Pressure(handle, drho, deps)
@@ -341,15 +341,16 @@
CCTK_INT :: handle
character(len=256) NaN_WarnLine
+#if !USE_EOS_OMNI
#ifdef _EOS_BASE_INC_
#undef _EOS_BASE_INC_
#endif
#include "EOS_Base.inc"
+#endif
#if USE_EOS_OMNI
! begin EOS Omni vars
integer :: n = 1
- integer :: poly_eoskey = 0
integer :: keytemp = 0
integer :: anyerr = 0
integer :: keyerr(1) = 0
@@ -357,7 +358,6 @@
real*8 :: xeps = 0.0d0
real*8 :: xtemp = 0.0d0
real*8 :: xye = 0.0d0
- poly_eoskey = GRHydro_poly_eoskey
! end EOS Omni vars
#endif
@@ -380,10 +380,10 @@
endif
#if USE_EOS_OMNI
- call EOS_Omni_press(poly_eoskey,keytemp,n,&
+ call EOS_Omni_press(handle,keytemp,n,&
drho,xeps,xtemp,xye,dpress,keyerr,anyerr)
- call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,&
+ call EOS_Omni_EpsFromPress(handle,keytemp,n,&
drho,xeps,xtemp,xye,dpress,deps,keyerr,anyerr)
#else
if (handle .ge. 0) then
More information about the Commits
mailing list