diff options
author | knarf <knarf@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2010-08-16 18:23:38 +0000 |
---|---|---|
committer | knarf <knarf@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2010-08-16 18:23:38 +0000 |
commit | 1361427f712c6cb0cdbe5e9f00cc005508987cc3 (patch) | |
tree | 7795bea65fdc251f9d439aa7846b6e9a8b29fbf7 /src | |
parent | b1669ebc87d263dff1bb6655da154256a3dbb394 (diff) |
more #defines, use integer handles if given, remove eos_key usage
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@144 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
Diffstat (limited to 'src')
-rw-r--r-- | src/GRHydro_Con2Prim.F90 | 74 | ||||
-rw-r--r-- | src/GRHydro_Eigenproblem.F90 | 26 | ||||
-rw-r--r-- | src/GRHydro_Eigenproblem_Marquina.F90 | 20 | ||||
-rw-r--r-- | src/GRHydro_EoSChangeGamma.F90 | 18 | ||||
-rw-r--r-- | src/GRHydro_Prim2Con.F90 | 14 |
5 files changed, 65 insertions, 87 deletions
diff --git a/src/GRHydro_Con2Prim.F90 b/src/GRHydro_Con2Prim.F90 index 6154902..e55d2de 100644 --- a/src/GRHydro_Con2Prim.F90 +++ b/src/GRHydro_Con2Prim.F90 @@ -68,7 +68,6 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) #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 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) 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 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) #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 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) 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 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) 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 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & #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 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & !!$ 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 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & !!$ 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 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & 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 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & 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 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & 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 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & 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 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) #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 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & #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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & !!$ 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & !!$ 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & 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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & #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 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & 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) diff --git a/src/GRHydro_Eigenproblem.F90 b/src/GRHydro_Eigenproblem.F90 index ffb94fd..8791e89 100644 --- a/src/GRHydro_Eigenproblem.F90 +++ b/src/GRHydro_Eigenproblem.F90 @@ -66,7 +66,6 @@ subroutine eigenvalues(handle,rho,velx,vely,velz,eps,w_lorentz,& #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 @@ subroutine eigenvalues(handle,rho,velx,vely,velz,eps,w_lorentz,& 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 @@ subroutine eigenvalues(handle,rho,velx,vely,velz,eps,w_lorentz,& #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 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,& #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 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,& 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 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,& !!$ 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 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,& #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 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,& 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 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,& !!$ 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) diff --git a/src/GRHydro_Eigenproblem_Marquina.F90 b/src/GRHydro_Eigenproblem_Marquina.F90 index ddd590e..f583fb6 100644 --- a/src/GRHydro_Eigenproblem_Marquina.F90 +++ b/src/GRHydro_Eigenproblem_Marquina.F90 @@ -92,15 +92,16 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& !!$ 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 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& 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 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& !!$ 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 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& !!$ 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) diff --git a/src/GRHydro_EoSChangeGamma.F90 b/src/GRHydro_EoSChangeGamma.F90 index 470ea09..622a8b3 100644 --- a/src/GRHydro_EoSChangeGamma.F90 +++ b/src/GRHydro_EoSChangeGamma.F90 @@ -62,7 +62,6 @@ subroutine GRHydro_EoSChangeGamma(CCTK_ARGUMENTS) #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 @@ subroutine GRHydro_EoSChangeGamma(CCTK_ARGUMENTS) 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 @@ subroutine GRHydro_EoSChangeK(CCTK_ARGUMENTS) #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 @@ subroutine GRHydro_EoSChangeK(CCTK_ARGUMENTS) 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 @@ subroutine GRHydro_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS) #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 @@ subroutine GRHydro_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS) 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 diff --git a/src/GRHydro_Prim2Con.F90 b/src/GRHydro_Prim2Con.F90 index 875fa50..39f6761 100644 --- a/src/GRHydro_Prim2Con.F90 +++ b/src/GRHydro_Prim2Con.F90 @@ -129,12 +129,13 @@ subroutine prim2con(handle, gxx, gxy, gxz, gyy, gyz, gzz, det, ddens, & 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 @@ subroutine prim2con(handle, gxx, gxy, gxz, gyy, gyz, gzz, det, ddens, & 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 @@ subroutine prim2con(handle, gxx, gxy, gxz, gyy, gyz, gzz, det, ddens, & *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 @@ subroutine prim2conpolytype(handle, gxx, gxy, gxz, gyy, gyz, & 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 @@ subroutine prim2conpolytype(handle, gxx, gxy, gxz, gyy, gyz, & 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 @@ subroutine prim2conpolytype(handle, gxx, gxy, gxz, gyy, gyz, & 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 |