[Commits] [svn:einsteintoolkit] GRHydro/trunk/ (Rev. 149)

User: cott Date: 2010/08/18 01:41 PM

Modified: /trunk/ interface.ccl, interface.ccl.omni, param.ccl, param.ccl.omni /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Eigenproblem.F90, GRHydro_Eigenproblem_Marquina.F90, GRHydro_EoSChangeGamma.F90, GRHydro_Prim2Con.F90 /trunk/test/ GRHydro_test_tov_ppm_ML_eos_omni.par

Log: * adjustments for things to work with updated EOS_Omni interface

* test case passes

File Changes:

Directory: /trunk/src/ ======================

File [modified]: GRHydro_Con2Prim.F90 Delta lines: +33 -32 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/src/GRHydro_Con2Prim.F90 2010-08-18 18:41:48 UTC (rev 149) @@ -94,9 +94,9 @@

#if USE_EOS_OMNI ! this is a poly call - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& GRHydro_rho_min,xeps,xtemp,xye,pmin,keyerr,anyerr) - call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) #else pmin = EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0) @@ -158,10 +158,10 @@ vel(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 #if USE_EOS_OMNI - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr)

- call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,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)) @@ -212,10 +212,10 @@ vel(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 #if USE_EOS_OMNI - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr)

- call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,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)) @@ -273,6 +273,7 @@ implicit none

DECLARE_CCTK_PARAMETERS + CCTK_REAL dens, sx, sy, sz, tau, rho, velx, vely, velz, epsilon, & press, uxx, uxy, uxz, uyy, uyz, uzz, det, w_lorentz, x, & y, z, r, GRHydro_rho_min @@ -317,7 +318,7 @@

!!$ Set initial guess for pressure: #if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,xtemp,xye,xpress,keyerr,anyerr) pold = max(1.d-10,xpress) #else @@ -352,7 +353,7 @@ !!$ Calculate the function

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,xtemp,xye,xpress,keyerr,anyerr)

f = pold - xpress @@ -404,10 +405,10 @@ end if

#if USE_EOS_OMNI - call EOS_Omni_DPressByDRho(handle,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,xtemp,xye,dpressbydrho,keyerr,anyerr)

- call EOS_Omni_DPressByDEps(handle,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,xtemp,xye,dpressbydeps,keyerr,anyerr) #else dpressbydrho = EOS_DPressByDRho(handle,rho,epsilon) @@ -433,7 +434,7 @@ udens)/udens

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,xtemp,xye,xpress,keyerr,anyerr)

f = pnew - xpress @@ -448,10 +449,10 @@ do i=1,GRHydro_polish

#if USE_EOS_OMNI - call EOS_Omni_DPressByDRho(handle,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,xtemp,xye,dpressbydrho,keyerr,anyerr)

- call EOS_Omni_DPressByDEps(handle,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,xtemp,xye,dpressbydeps,keyerr,anyerr) #else dpressbydrho = EOS_DPressByDRho(handle,rho,epsilon) @@ -475,7 +476,7 @@ udens)/udens

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n, & + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n, & rho,epsilon,xtemp,xye,xpress,keyerr,anyerr)

f = pold - xpress @@ -588,10 +589,10 @@

#if USE_EOS_OMNI ! this is a poly call - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& GRHydro_rho_min,epsmin,xtemp,xye,pmin,epsmin,keyerr,anyerr) #else pmin=EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0) @@ -954,10 +955,10 @@ rhoold = max(GRHydro_rho_min,rho)

#if USE_EOS_OMNI -! call EOS_Omni_press(handle,keytemp,n,& +! call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& ! rhoold,xeps,xtemp,xye,xpress,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(handle,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,n,& rhoold,xeps,xtemp,xye,press,xeps,keyerr,anyerr)

enthalpy = 1.0d0 + xeps + press / rhoold @@ -969,7 +970,7 @@ w_lorentz = sqrt(1.d0 + s2 / ( (udens*enthalpy)**2 ))

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhoold,epsilon,xtemp,xye,press,keyerr,anyerr) #else press = EOS_Pressure(handle, rhoold, epsilon) @@ -1007,10 +1008,10 @@ udens = rhonew dens = sqrtdet * rhonew #if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,1.0d0,xtemp,xye,press,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(handle,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) #else press = EOS_Pressure(handle, rhonew, 1.d0) @@ -1032,7 +1033,7 @@ !!$ 2D_Polytrope it gives the right answers.

#if USE_EOS_OMNI - call EOS_Omni_DPressByDrho(handle,keytemp,n,& + call EOS_Omni_DPressByDrho(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,epsilon,xtemp,xye,denthalpy,keyerr,anyerr) denthalpy = denthalpy / rhonew #else @@ -1059,10 +1060,10 @@ !!$ Recalculate primitive variables and function

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,epsilon,xtemp,xye,press,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(handle,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr)

enthalpy = 1.0d0 + epsilon + press / rhonew @@ -1090,10 +1091,10 @@ dens = sqrtdet * rhonew

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,1.0d0,xtemp,xye,press,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(handle,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) #else press = EOS_Pressure(handle, rhonew, 1.d0) @@ -1114,10 +1115,10 @@ 50 rho = rhonew

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,epsilon,xtemp,xye,press,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(handle,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr)

enthalpy = 1.0d0 + epsilon + press / rhonew @@ -1128,10 +1129,10 @@ #endif

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,epsilon,xtemp,xye,press,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(handle,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) #else press = EOS_Pressure(handle, rhonew, epsilon) @@ -1156,9 +1157,9 @@ rho = GRHydro_rho_min dens = sqrtdet * rho #if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhonew,1.d0,xtemp,xye,press,keyerr,anyerr) - call EOS_Omni_EpsFromPress(handle,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,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 -10 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/src/GRHydro_Eigenproblem.F90 2010-08-18 18:41:48 UTC (rev 149) @@ -86,15 +86,15 @@

#if USE_EOS_OMNI -! call EOS_Omni_cs2(handle,keytemp,n,& +! call EOS_Omni_cs2(handle,keytemp,GRHydro_eos_rf_prec,n,& ! rho,eps,xtemp,xye,cs2,keyerr,anyerr) - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,press,keyerr,anyerr)

- call EOS_Omni_DPressByDEps(handle,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,dpdeps,keyerr,anyerr)

- call EOS_Omni_DPressByDRho(handle,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,dpdrho,keyerr,anyerr)

cs2 = (dpdrho + press * dpdeps / (rho**2))/ & @@ -210,18 +210,18 @@ !!$ Set required fluid quantities

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,press,keyerr,anyerr)

- call EOS_Omni_DPressByDEps(handle,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,dpdeps,keyerr,anyerr)

- call EOS_Omni_DPressByDRho(handle,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,dpdrho,keyerr,anyerr)

cs2 = (dpdrho + press * dpdeps / (rho**2))/ & (1.0d0 + eps + press/rho) -! call EOS_Omni_cs2(handle,keytemp,n,& +! call EOS_Omni_cs2(handle,keytemp,GRHydro_eos_rf_prec,n,& ! rho,eps,xtemp,xye,cs2,keyerr,anyerr) #else press = EOS_Pressure(handle,rho,eps) @@ -594,10 +594,10 @@

!!$ Set required fluid quantities #if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,press,keyerr,anyerr)

- call EOS_Omni_cs2(handle,keytemp,n,& + call EOS_Omni_cs2(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,cs2,keyerr,anyerr) #else press = EOS_Pressure(handle,rho,eps)

File [modified]: GRHydro_Eigenproblem_Marquina.F90 Delta lines: +8 -8 =================================================================== --- trunk/src/GRHydro_Eigenproblem_Marquina.F90 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/src/GRHydro_Eigenproblem_Marquina.F90 2010-08-18 18:41:48 UTC (rev 149) @@ -120,13 +120,13 @@ !!$ Set required fluid quantities invrhol = one / rhol #if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhol,epsl,xtemp,xye,pressl,keyerr,anyerr) -! call EOS_Omni_cs2(handle,keytemp,n,& +! call EOS_Omni_cs2(handle,keytemp,GRHydro_eos_rf_prec,n,& ! rhol,epsl,xtemp,xye,cs2l,keyerr,anyerr) - call EOS_Omni_DPressByDEps(handle,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,GRHydro_eos_rf_prec,n,& rhol,epsl,xtemp,xye,dpdepsl,keyerr,anyerr) - call EOS_Omni_DPressByDRho(handle,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,GRHydro_eos_rf_prec,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(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rhor,epsr,xtemp,xye,pressr,keyerr,anyerr) -! call EOS_Omni_cs2(handle,keytemp,n,& +! call EOS_Omni_cs2(handle,keytemp,GRHydro_eos_rf_prec,n,& ! rhor,epsr,xtemp,xye,cs2r,keyerr,anyerr) - call EOS_Omni_DPressByDEps(handle,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,GRHydro_eos_rf_prec,n,& rhor,epsr,xtemp,xye,dpdepsr,keyerr,anyerr) - call EOS_Omni_DPressByDRho(handle,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,GRHydro_eos_rf_prec,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 -6 =================================================================== --- trunk/src/GRHydro_EoSChangeGamma.F90 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/src/GRHydro_EoSChangeGamma.F90 2010-08-18 18:41:48 UTC (rev 149) @@ -70,10 +70,10 @@ real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 ! end EOS Omni vars - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr)

local_Gamma = 1.0d0 + xpress/xeps @@ -167,10 +167,10 @@ real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 ! end EOS Omni vars - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr)

local_Gamma = 1.0d0 + xpress/xeps @@ -271,10 +271,10 @@ real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 ! end EOS Omni vars - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr)

local_Gamma = 1.0d0 + xpress/xeps

File [modified]: GRHydro_Prim2Con.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/src/GRHydro_Prim2Con.F90 2010-08-18 18:41:48 UTC (rev 149) @@ -151,7 +151,7 @@ *dvely*dvelz))

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& drho,deps,xtemp,xye,dpress,keyerr,anyerr) #else dpress = EOS_Pressure(handle, drho, deps) @@ -380,10 +380,10 @@ endif

#if USE_EOS_OMNI - call EOS_Omni_press(handle,keytemp,n,& + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& drho,xeps,xtemp,xye,dpress,keyerr,anyerr)

- call EOS_Omni_EpsFromPress(handle,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,n,& drho,xeps,xtemp,xye,dpress,deps,keyerr,anyerr) #else if (handle .ge. 0) then

Directory: /trunk/test/ =======================

File [modified]: GRHydro_test_tov_ppm_ML_eos_omni.par Delta lines: +2 -2 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_ML_eos_omni.par 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/test/GRHydro_test_tov_ppm_ML_eos_omni.par 2010-08-18 18:41:48 UTC (rev 149) @@ -88,8 +88,8 @@ eos_omni::poly_gamma_ini = 2.0 eos_omni::poly_k = 100.0d0

-grhydro::grhydro_poly_eoskey = 1 -grhydro::grhydro_eoskey = 1 +#grhydro::grhydro_poly_eoskey = 1 +#grhydro::grhydro_eoskey = 1

IOBasic::outInfo_every = 1 IOBasic::outInfo_vars = "HydroBase::rho"

Directory: /trunk/ ==================

File [modified]: interface.ccl Delta lines: +5 -0 =================================================================== --- trunk/interface.ccl 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/interface.ccl 2010-08-18 18:41:48 UTC (rev 149) @@ -168,6 +168,7 @@

void FUNCTION EOS_Omni_press(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -182,6 +183,7 @@

void FUNCTION EOS_Omni_DPressByDEps(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -196,6 +198,7 @@

void FUNCTION EOS_Omni_DPressByDRho(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -210,6 +213,7 @@

void FUNCTION EOS_Omni_cs2(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -223,6 +227,7 @@

void FUNCTION EOS_Omni_EpsFromPress(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \

File [modified]: interface.ccl.omni Delta lines: +11 -6 =================================================================== --- trunk/interface.ccl.omni 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/interface.ccl.omni 2010-08-18 18:41:48 UTC (rev 149) @@ -163,11 +163,12 @@ #######################################################

CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name) - USES FUNCTION EOS_Omni_GetHandle

-void FUNCTION EOS_Omni_press(CCTK_INT IN eoshandle, \ + +void FUNCTION EOS_Omni_press(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -180,8 +181,9 @@ USES FUNCTION EOS_Omni_press

-void FUNCTION EOS_Omni_DPressByDEps(CCTK_INT IN eoshandle, \ +void FUNCTION EOS_Omni_DPressByDEps(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -194,8 +196,9 @@ USES FUNCTION EOS_Omni_DPressByDEps

-void FUNCTION EOS_Omni_DPressByDRho(CCTK_INT IN eoshandle, \ +void FUNCTION EOS_Omni_DPressByDRho(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -208,8 +211,9 @@ USES FUNCTION EOS_Omni_DPressByDRho

-void FUNCTION EOS_Omni_cs2(CCTK_INT IN eoshandle, \ +void FUNCTION EOS_Omni_cs2(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -221,8 +225,9 @@

USES FUNCTION EOS_Omni_cs2

-void FUNCTION EOS_Omni_EpsFromPress(CCTK_INT IN eoshandle, \ +void FUNCTION EOS_Omni_EpsFromPress(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \

File [modified]: param.ccl Delta lines: +16 -11 =================================================================== --- trunk/param.ccl 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/param.ccl 2010-08-18 18:41:48 UTC (rev 149) @@ -244,19 +244,24 @@

####################### EOS Omni Parameters ##############################

-int GRHydro_poly_eoskey "eoskey for poly EOS" -{ - 1:* :: "Must be larger than 0" -} 1 +###int GRHydro_poly_eoskey "eoskey for poly EOS" +###{ +### 1:* :: "Must be larger than 0" +###} 1 +### +### +###int GRHydro_eoskey "eoskey determining which EOS to use" +###{ +### 1 :: "Polytropic EOS" +### 2 :: "Gamma-Law EOS" +### 3 :: "Hybrid EOS" +### 4:* :: "something else" +###} 2

- -int GRHydro_eoskey "eoskey determining which EOS to use" +real GRHydro_eos_rf_prec "Precision to which root finding should be carried out" { - 1 :: "Polytropic EOS" - 2 :: "Gamma-Law EOS" - 3 :: "Hybrid EOS" - 4:* :: "something else" -} 2 + (0.0:* :: "anything larger than 0 goes" +} 1.0e-8

####################### Other Parameters ##############################

File [modified]: param.ccl.omni Delta lines: +6 -0 =================================================================== --- trunk/param.ccl.omni 2010-08-18 18:03:14 UTC (rev 148) +++ trunk/param.ccl.omni 2010-08-18 18:41:48 UTC (rev 149) @@ -244,6 +244,12 @@ .* :: "Can be anything" } "Ideal_Fluid"

+real GRHydro_eos_rf_prec "Precision to which root finding should be carried out" +{ + (0.0:* :: "anything larger than 0 goes" +} 1.0e-8 + + ####################### Other Parameters ##############################

#Parameters controlling conservative <-> primitive change.