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_Prim2Con.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_Prim2Con.F90')
| -rw-r--r-- | src/GRHydro_Prim2Con.F90 | 14 |
1 files changed, 7 insertions, 7 deletions
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 |