User: knarf Date: 2010/08/16 01:24 PM
Modified: /trunk/src/ GRHydro_C2P2C.F90, GRHydro_Con2Prim.F90, GRHydro_SimpleWave.F90
Log: use eos handles
File Changes:
Directory: /trunk/src/ ======================
File [modified]: GRHydro_C2P2C.F90 Delta lines: +2 -4 =================================================================== --- trunk/src/GRHydro_C2P2C.F90 2010-08-16 13:45:31 UTC (rev 109) +++ trunk/src/GRHydro_C2P2C.F90 2010-08-16 18:24:10 UTC (rev 110) @@ -55,7 +55,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 @@ -63,7 +62,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
@@ -108,10 +106,10 @@
GRHydro_rho_min = 1.e-10 #if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(GRHydro_eos_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_eos_handle,keytemp,n,& GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) #else pmin = EOS_Pressure(GRHydro_eos_handle, GRHydro_rho_min, 1.0d0)
File [modified]: GRHydro_Con2Prim.F90 Delta lines: +2 -4 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-08-16 13:45:31 UTC (rev 109) +++ trunk/src/GRHydro_Con2Prim.F90 2010-08-16 18:24:10 UTC (rev 110) @@ -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,7 +69,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
@@ -110,10 +108,10 @@ epsnegative = .false.
#if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(GRHydro_eos_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_eos_handle,keytemp,n,& GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) #else pmin = EOS_Pressure(GRHydro_eos_handle, GRHydro_rho_min, 1.0d0)
File [modified]: GRHydro_SimpleWave.F90 Delta lines: +1 -3 =================================================================== --- trunk/src/GRHydro_SimpleWave.F90 2010-08-16 13:45:31 UTC (rev 109) +++ trunk/src/GRHydro_SimpleWave.F90 2010-08-16 18:24:10 UTC (rev 110) @@ -59,7 +59,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 @@ -67,7 +66,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
@@ -151,7 +149,7 @@ velx(i,1,1) = 0.d0 w_lorentz(i,1,1) = 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,1,1),1.0d0,xtemp,xye,press(i,1,1),keyerr,anyerr) #else press(i,1,1) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,1,1), 1.0d0)