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/GRHydro_Eigenproblem.F90 | |
| 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/GRHydro_Eigenproblem.F90')
| -rw-r--r-- | src/GRHydro_Eigenproblem.F90 | 26 |
1 files changed, 10 insertions, 16 deletions
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) |