Commits August 2010

commits@lists.einsteintoolkit.org

5 participants
29 discussions

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 152)
by cott＠tapir.caltech.edu 27 Aug '10

27 Aug '10

User: cott Date: 2010/08/27 03:30 PM Modified: /trunk/ interface.ccl, interface.ccl.omni /trunk/src/ GRHydro_Boundaries.F90, GRHydro_Con2Prim.F90, GRHydro_EoSChangeGamma.F90, GRHydro_FluxSplit.F90, GRHydro_HLLE.F90, GRHydro_HLLEPoly.F90, GRHydro_Marquina.F90, GRHydro_PPM.F90, GRHydro_ParamCheck.F90, GRHydro_Prim2Con.F90, GRHydro_Reconstruct.F90, GRHydro_ReconstructPoly.F90, GRHydro_RiemannSolve.F90, GRHydro_RoeSolver.F90, GRHydro_Source.F90, GRHydro_Tmunu.F90, GRHydro_UpdateMask.F90, Utils.F90 Log: * remove dependence on StaticConformal * change calculation of the determinant of the 3-metric from a subroutine call to a macro. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: <Unavailable> File [modified]: GRHydro_FluxSplit.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLE.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLEPoly.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Marquina.F90 Delta lines: <Unavailable> File [modified]: GRHydro_PPM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ParamCheck.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Prim2Con.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Reconstruct.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ReconstructPoly.F90 Delta lines: <Unavailable> File [modified]: GRHydro_RiemannSolve.F90 Delta lines: <Unavailable> File [modified]: GRHydro_RoeSolver.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Source.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Tmunu.F90 Delta lines: <Unavailable> File [modified]: GRHydro_UpdateMask.F90 Delta lines: <Unavailable> File [modified]: Utils.F90 Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: interface.ccl.omni Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 151)
by cott＠tapir.caltech.edu 26 Aug '10

26 Aug '10

User: cott Date: 2010/08/26 03:06 PM Added: /trunk/src/ GRHydro_Macros.h Log: * add a source file containing macro definitions File Changes: Directory: /trunk/src/ ====================== File [added]: GRHydro_Macros.h Delta lines: +3 -0 =================================================================== --- trunk/src/GRHydro_Macros.h (rev 0) +++ trunk/src/GRHydro_Macros.h 2010-08-26 20:06:30 UTC (rev 151) @@ -0,0 +1,3 @@ +#define SPATIAL_DETERMINANT(gxx,gxy,gxz,gyy,gyz,gzz) \ + (-(gxz)**2*(gyy) + 2*(gxy)*(gxz)*(gyz) - (gxx)*(gyz)**2 - (gxy)**2*(gzz) \ + + (gxx)*(gyy)*(gzz))

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 8)
by cott＠tapir.caltech.edu 26 Aug '10

26 Aug '10

User: cott Date: 2010/08/26 02:26 PM Added: /EOS_Omni/src/ EOS_Omni_SingleVarCalls_harm.F90 Modified: /EOS_Omni/ interface.ccl /EOS_Omni/src/ make.code.defn Log: * add routines for MHD with Harm-based con2prim File Changes: Directory: /EOS_Omni/ ===================== File [modified]: interface.ccl Delta lines: +54 -0 =================================================================== --- EOS_Omni/interface.ccl 2010-08-18 18:41:07 UTC (rev 7) +++ EOS_Omni/interface.ccl 2010-08-26 19:26:54 UTC (rev 8) @@ -97,3 +97,57 @@ CCTK_INT OUT anyerr) PROVIDES FUNCTION EOS_Omni_RestMassDensityFromEpsPress WITH EOS_Omni_EOS_RestMassDensityFromEpsPress LANGUAGE Fortran + +################################################################################ +# the following routines are needed for MHD con2prim based on the Harm Code + +void FUNCTION EOS_Omni_press_f_hrho_v2_rhoW(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY hrho, \ + CCTK_REAL IN ARRAY v2, \ + CCTK_REAL IN ARRAY rhoW, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY press, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +PROVIDES FUNCTION EOS_Omni_press_f_hrho_v2_rhoW WITH EOS_Omni_EOS_Press_f_hrho_v2_rhoW LANGUAGE Fortran + + +void FUNCTION EOS_Omni_dpdhrho_f_hrho_v2_rhoW(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY hrho, \ + CCTK_REAL IN ARRAY v2, \ + CCTK_REAL IN ARRAY rhoW, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY dpdhrho,\ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +PROVIDES FUNCTION EOS_Omni_dpdhrho_f_hrho_v2_rhoW WITH EOS_Omni_EOS_dpdhrho_f_hrho_v2_rhoW LANGUAGE Fortran + +void FUNCTION EOS_Omni_dpdv2_f_hrho_v2_rhoW(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY hrho, \ + CCTK_REAL IN ARRAY v2, \ + CCTK_REAL IN ARRAY rhoW, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY dpdv2, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +PROVIDES FUNCTION EOS_Omni_dpdv2_f_hrho_v2_rhoW WITH EOS_Omni_EOS_dpdv2_f_hrho_v2_rhoW LANGUAGE Fortran + +################################################################################ Directory: /EOS_Omni/src/ ========================= File [added]: EOS_Omni_SingleVarCalls_harm.F90 Delta lines: +170 -0 =================================================================== --- EOS_Omni/src/EOS_Omni_SingleVarCalls_harm.F90 (rev 0) +++ EOS_Omni/src/EOS_Omni_SingleVarCalls_harm.F90 2010-08-26 19:26:54 UTC (rev 8) @@ -0,0 +1,170 @@ +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" +#include "cctk_Functions.h" + +! eoskey: +! 1 --- polytropic EOS +! 2 --- gamma-law EOS +! 3 --- hybrid EOS +! 4 --- finite-T microphysical NSE EOS + +subroutine EOS_Omni_EOS_Press_f_hrho_v2_rhoW(eoskey,keytemp,rf_precision,npoints,& + hrho,v2,rhoW,eps,temp,ye,press,keyerr,anyerr) + + use EOS_Omni_Module + implicit none + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_INT, intent(in) :: eoskey,keytemp,npoints + CCTK_INT, intent(out) :: keyerr(npoints) + CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision + CCTK_REAL, intent(in) :: hrho(npoints),v2(npoints) + CCTK_REAL, intent(in) :: rhoW(npoints),ye(npoints) + CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) + CCTK_REAL, intent(out) :: press(npoints) + + ! local vars + integer :: i + real*8 :: gtmp1,gtmp2 + character(256) :: warnstring + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + hybrid_p_poly, hybrid_p_th + real*8,parameter :: zero = 0.0d0 + + anyerr = 0 + keyerr(:) = 0 + + select case (eoskey) + case (1) + ! polytropic EOS + call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + case (2) + ! gamma-law EOS + if(keytemp.eq.1) then + call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + endif + do i=1,npoints + gtmp1 = 1.0d0 - v2(i) + gtmp2 = rhoW(i)*sqrt(gtmp1) + press(i) = (gl_gamma - 1.0d0)/(gl_gamma) * & + (hrho(i)*gtmp1 - gtmp2) + eps(i) = press(i) / (gl_gamma - 1.0d0) / gtmp2 + enddo + case (3) + ! hybrid EOS + call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + + case DEFAULT + write(warnstring,*) "eoskey ",eoskey," not implemented!" + call CCTK_WARN(0,warnstring) + end select + +end subroutine EOS_Omni_EOS_Press_f_hrho_v2_rhoW + + +subroutine EOS_Omni_EOS_dpdhrho_f_hrho_v2_rhoW(eoskey,keytemp,rf_precision,npoints,& + hrho,v2,rhoW,eps,temp,ye,dpdhrho,keyerr,anyerr) + + use EOS_Omni_Module + implicit none + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_INT, intent(in) :: eoskey,keytemp,npoints + CCTK_INT, intent(out) :: keyerr(npoints) + CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision + CCTK_REAL, intent(in) :: hrho(npoints),v2(npoints) + CCTK_REAL, intent(in) :: rhoW(npoints),ye(npoints) + CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) + CCTK_REAL, intent(out) :: dpdhrho(npoints) + + ! local vars + integer :: i + character(256) :: warnstring + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + hybrid_p_poly, hybrid_p_th + real*8,parameter :: zero = 0.0d0 + + anyerr = 0 + keyerr(:) = 0 + + select case (eoskey) + case (1) + ! polytropic EOS + call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + case (2) + ! gamma-law EOS + if(keytemp.eq.1) then + call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + endif + do i=1,npoints + dpdhrho(i) = (gl_gamma - 1.0d0) * (1.0d0 - v2(i)) / (gl_gamma) + enddo + case (3) + ! hybrid EOS + call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + + case DEFAULT + write(warnstring,*) "eoskey ",eoskey," not implemented!" + call CCTK_WARN(0,warnstring) + end select + +end subroutine EOS_Omni_EOS_dpdhrho_f_hrho_v2_rhoW + + +subroutine EOS_Omni_EOS_dpdv2_f_hrho_v2_rhoW(eoskey,keytemp,rf_precision,npoints,& + hrho,v2,rhoW,eps,temp,ye,dpdv2,keyerr,anyerr) + + use EOS_Omni_Module + implicit none + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_INT, intent(in) :: eoskey,keytemp,npoints + CCTK_INT, intent(out) :: keyerr(npoints) + CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision + CCTK_REAL, intent(in) :: hrho(npoints),v2(npoints) + CCTK_REAL, intent(in) :: rhoW(npoints),ye(npoints) + CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) + CCTK_REAL, intent(out) :: dpdv2(npoints) + + ! local vars + integer :: i + character(256) :: warnstring + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + hybrid_p_poly, hybrid_p_th + real*8,parameter :: zero = 0.0d0 + + anyerr = 0 + keyerr(:) = 0 + + select case (eoskey) + case (1) + ! polytropic EOS + call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + case (2) + ! gamma-law EOS + if(keytemp.eq.1) then + call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + endif + do i=1,npoints + dpdv2(i) = (gl_gamma - 1.0d0) * (0.5d0 * rhoW(i) & + / sqrt(1.0d0 - v2(i)) - hrho(i)) / gl_gamma + enddo + case (3) + ! hybrid EOS + call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + + case DEFAULT + write(warnstring,*) "eoskey ",eoskey," not implemented!" + call CCTK_WARN(0,warnstring) + end select + +end subroutine EOS_Omni_EOS_dpdv2_f_hrho_v2_rhoW + + File [modified]: make.code.defn Delta lines: +2 -1 =================================================================== --- EOS_Omni/src/make.code.defn 2010-08-18 18:41:07 UTC (rev 7) +++ EOS_Omni/src/make.code.defn 2010-08-26 19:26:54 UTC (rev 8) @@ -1,7 +1,8 @@ # Main make.code.defn file for thorn EOS_Omni # Source files in this directory -SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 EOS_Omni_Handles.c +SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 \ + EOS_Omni_SingleVarCalls_harm.F90 EOS_Omni_Handles.c # Subdirectories containing source files SUBDIRS =

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 150)
by knarf＠cct.lsu.edu 19 Aug '10

19 Aug '10

User: knarf Date: 2010/08/19 09:25 AM Modified: /trunk/src/ GRHydro_EOS.c Log: fix stupid typo File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_EOS.c Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_EOS.c 2010-08-18 18:41:48 UTC (rev 149) +++ trunk/src/GRHydro_EOS.c 2010-08-19 14:25:30 UTC (rev 150) @@ -53,7 +53,7 @@ #else if ((*GRHydro_eos_handle = EOS_Handle(GRHydro_eos_table)) < 0) CCTK_WARN(0, "Cannot get EOS handle, aborting."); - if ((*GRHydro_polytrope_handle = EOS_Handle("2D_Polytrope")) < 0); + if ((*GRHydro_polytrope_handle = EOS_Handle("2D_Polytrope")) < 0) CCTK_WARN(0, "Cannot get polytrope EOS handle, aborting."); CCTK_VInfo(CCTK_THORNSTRING, "GRHydro will use the %s equation of state.", GRHydro_eos_table);

1 0

[svn:einsteintoolkit] Hydro_Analysis/trunk/ (Rev. 111)
by knarf＠cct.lsu.edu 18 Aug '10

18 Aug '10

User: knarf Date: 2010/08/18 01:54 PM Modified: /trunk/ interface.ccl Log: correct tensortype File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2010-07-12 14:50:02 UTC (rev 110) +++ trunk/interface.ccl 2010-08-18 18:54:33 UTC (rev 111) @@ -12,7 +12,7 @@ CCTK_REAL Hydro_Analysis_rho_max_loc[3] type = SCALAR tags='checkpoint="no"' "coordinate location of the maximum of rho" -CCTK_REAL Hydro_Analysis_rho_center_volume_weighted_gf[3] type = GF Timelevels = 3 tags='checkpoint="no" tensortypealias="vector"' "temporary GF to obtain the coordinate location of the volume weightes center of mass via a reduction" +CCTK_REAL Hydro_Analysis_rho_center_volume_weighted_gf[3] type = GF Timelevels = 3 tags='checkpoint="no" tensortypealias="u"' "temporary GF to obtain the coordinate location of the volume weighted center of mass via a reduction" CCTK_REAL Hydro_Analysis_rho_center_volume_weighted[3] type = SCALAR tags='checkpoint="no"' "coordinate location of the volume weightes center of mass"

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 113)
by cott＠tapir.caltech.edu 18 Aug '10

18 Aug '10

User: cott Date: 2010/08/18 01:42 PM Modified: /trunk/ interface.ccl /trunk/src/ GRHydro_ReadConformalData.F90, GRHydro_SimpleWave.F90 Log: * make work with updated EOS_Omni interface File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_ReadConformalData.F90 Delta lines: +3 -1 =================================================================== --- trunk/src/GRHydro_ReadConformalData.F90 2010-08-18 18:15:02 UTC (rev 112) +++ trunk/src/GRHydro_ReadConformalData.F90 2010-08-18 18:42:06 UTC (rev 113) @@ -61,6 +61,7 @@ integer :: keytemp = 0 integer :: anyerr = 0 integer :: keyerr(1) = 0 + real*8 :: rf_precision = 1.0d-10 real*8 :: xpress(1) = 0.0d0 real*8 :: xeps(1) = 0.0d0 real*8 :: xtemp(1) = 0.0d0 @@ -155,7 +156,8 @@ do j=1,cctk_lsh(2) do k=1,cctk_lsh(3) #ifdef USE_EOS_OMNI - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,rho(i,j,k),xeps,xtemp,xye,& + call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,rf_precision,& + n,rho(i,j,k),xeps,xtemp,xye,& press(i,j,k),eps(i,j,k),keyerr,anyerr) #else File [modified]: GRHydro_SimpleWave.F90 Delta lines: +2 -1 =================================================================== --- trunk/src/GRHydro_SimpleWave.F90 2010-08-18 18:15:02 UTC (rev 112) +++ trunk/src/GRHydro_SimpleWave.F90 2010-08-18 18:42:06 UTC (rev 113) @@ -66,6 +66,7 @@ real*8 :: xeps(1) = 0.0d0 real*8 :: xtemp(1) = 0.0d0 real*8 :: xye(1) = 0.0d0 + real*8 :: rf_precision = 1.0d-10 ! end EOS Omni vars #endif @@ -150,7 +151,7 @@ w_lorentz(i,1,1) = 1.d0 #if USE_EOS_OMNI xeps = 1.0d0 - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,rf_precision,n,& rho(i,1,1),xeps,xtemp,xye,press(i,1,1),keyerr,anyerr) #else press(i,1,1) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,1,1), 1.0d0) Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +4 -2 =================================================================== --- trunk/interface.ccl 2010-08-18 18:15:02 UTC (rev 112) +++ trunk/interface.ccl 2010-08-18 18:42:06 UTC (rev 113) @@ -62,8 +62,9 @@ USES FUNCTION EOS_Omni_GetHandle -void FUNCTION EOS_Omni_press(CCTK_INT IN eoshandle, \ +void FUNCTION EOS_Omni_press(CCTK_INT IN eoshandle, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \ @@ -75,8 +76,9 @@ USES FUNCTION EOS_Omni_press -void FUNCTION EOS_Omni_EpsFromPress(CCTK_INT IN eoshandle, \ +void FUNCTION EOS_Omni_EpsFromPress(CCTK_INT IN eoshandle, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL IN ARRAY rho, \ CCTK_REAL INOUT ARRAY eps, \

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 149)
by cott＠tapir.caltech.edu 18 Aug '10

18 Aug '10

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.

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 7)
by cott＠tapir.caltech.edu 18 Aug '10

18 Aug '10

User: cott Date: 2010/08/18 01:41 PM Modified: /EOS_Omni/ interface.ccl /EOS_Omni/src/ EOS_Omni_SingleVarCalls.F90 Log: * change interface, add scalar double precision variable rf_precision that allows the application thorn to specify the relative precision between iterations at which EOS root finding should be stopped. File Changes: Directory: /EOS_Omni/ ===================== File [modified]: interface.ccl Delta lines: +6 -0 =================================================================== --- EOS_Omni/interface.ccl 2010-08-16 17:52:05 UTC (rev 6) +++ EOS_Omni/interface.ccl 2010-08-18 18:41:07 UTC (rev 7) @@ -10,6 +10,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, \ @@ -24,6 +25,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, \ @@ -38,6 +40,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, \ @@ -52,6 +55,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, \ @@ -66,6 +70,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, \ @@ -81,6 +86,7 @@ void FUNCTION EOS_Omni_RestMassDensityFromEpsPress(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ CCTK_INT IN npoints, \ CCTK_REAL OUT ARRAY rho, \ CCTK_REAL IN ARRAY eps, \ Directory: /EOS_Omni/src/ ========================= File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +13 -7 =================================================================== --- EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-08-16 17:52:05 UTC (rev 6) +++ EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-08-18 18:41:07 UTC (rev 7) @@ -9,7 +9,7 @@ ! 3 --- hybrid EOS ! 4 --- finite-T microphysical NSE EOS -subroutine EOS_Omni_EOS_Press(eoskey,keytemp,npoints,& +subroutine EOS_Omni_EOS_Press(eoskey,keytemp,rf_precision,npoints,& rho,eps,temp,ye,press,keyerr,anyerr) use EOS_Omni_Module @@ -19,6 +19,7 @@ CCTK_INT, intent(in) :: eoskey,keytemp,npoints CCTK_INT, intent(out) :: keyerr(npoints) CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision CCTK_REAL, intent(in) :: rho(npoints),ye(npoints) CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) CCTK_REAL, intent(out) :: press(npoints) @@ -92,7 +93,7 @@ -subroutine EOS_Omni_EOS_DPressByDRho(eoskey,keytemp,npoints,& +subroutine EOS_Omni_EOS_DPressByDRho(eoskey,keytemp,rf_precision,npoints,& rho,eps,temp,ye,dpdrhoe,keyerr,anyerr) use EOS_Omni_Module @@ -102,6 +103,7 @@ CCTK_INT, intent(in) :: eoskey,keytemp,npoints CCTK_INT, intent(out) :: keyerr(npoints) CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision CCTK_REAL, intent(in) :: rho(npoints),ye(npoints) CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) CCTK_REAL, intent(out) :: dpdrhoe(npoints) @@ -179,7 +181,7 @@ end subroutine EOS_Omni_EOS_DPressByDRho -subroutine EOS_Omni_EOS_DPressByDEps(eoskey,keytemp,npoints,& +subroutine EOS_Omni_EOS_DPressByDEps(eoskey,keytemp,rf_precision,npoints,& rho,eps,temp,ye,dpdepsrho,keyerr,anyerr) use EOS_Omni_Module @@ -189,6 +191,7 @@ CCTK_INT, intent(in) :: eoskey,keytemp,npoints CCTK_INT, intent(out) :: keyerr(npoints) CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision CCTK_REAL, intent(in) :: rho(npoints),ye(npoints) CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) CCTK_REAL, intent(out) :: dpdepsrho(npoints) @@ -238,7 +241,7 @@ end subroutine EOS_Omni_EOS_DPressByDEps -subroutine EOS_Omni_EOS_cs2(eoskey,keytemp,npoints,& +subroutine EOS_Omni_EOS_cs2(eoskey,keytemp,rf_precision,npoints,& rho,eps,temp,ye,cs2,keyerr,anyerr) use EOS_Omni_Module @@ -248,6 +251,7 @@ CCTK_INT, intent(in) :: eoskey,keytemp,npoints CCTK_INT, intent(out) :: keyerr(npoints) CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision CCTK_REAL, intent(in) :: rho(npoints),ye(npoints) CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) CCTK_REAL, intent(out) :: cs2(npoints) @@ -328,7 +332,7 @@ end subroutine EOS_Omni_EOS_cs2 -subroutine EOS_Omni_EOS_eps_from_press(eoskey,keytemp,npoints,& +subroutine EOS_Omni_EOS_eps_from_press(eoskey,keytemp,rf_precision,npoints,& rho,eps,temp,ye,press,xeps,keyerr,anyerr) use EOS_Omni_Module @@ -338,6 +342,7 @@ CCTK_INT, intent(in) :: eoskey,keytemp,npoints CCTK_INT, intent(out) :: keyerr(npoints) CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision CCTK_REAL, intent(in) :: rho(npoints),ye(npoints),press(npoints) CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) CCTK_REAL, intent(out) :: xeps(npoints) @@ -377,8 +382,8 @@ end subroutine EOS_Omni_EOS_eps_from_press -subroutine EOS_Omni_EOS_RestMassDensityFromEpsPress(eoskey,keytemp,npoints,& - rho,eps,temp,ye,press,keyerr,anyerr) +subroutine EOS_Omni_EOS_RestMassDensityFromEpsPress(eoskey,keytemp,rf_precision,& + npoints,rho,eps,temp,ye,press,keyerr,anyerr) use EOS_Omni_Module implicit none @@ -387,6 +392,7 @@ CCTK_INT, intent(in) :: eoskey,keytemp,npoints CCTK_INT, intent(out) :: keyerr(npoints) CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision CCTK_REAL, intent(in) :: ye(npoints),press(npoints),eps(npoints) CCTK_REAL, intent(inout) :: rho(npoints),temp(npoints)

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 112)
by cott＠tapir.caltech.edu 18 Aug '10

18 Aug '10

User: cott Date: 2010/08/18 01:15 PM Modified: /trunk/ interface.ccl /trunk/src/ GRHydro_ReadConformalData.F90, GRHydro_SimpleWave.F90 Log: * add EOS Omni functions to interface.ccl * correct syntax in F90 files File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_ReadConformalData.F90 Delta lines: +7 -7 =================================================================== --- trunk/src/GRHydro_ReadConformalData.F90 2010-08-16 18:33:26 UTC (rev 111) +++ trunk/src/GRHydro_ReadConformalData.F90 2010-08-18 18:15:02 UTC (rev 112) @@ -61,11 +61,11 @@ integer :: keytemp = 0 integer :: anyerr = 0 integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 - poly_eoskey = GRHydro_poly_eoskey + real*8 :: xpress(1) = 0.0d0 + real*8 :: xeps(1) = 0.0d0 + real*8 :: xtemp(1) = 0.0d0 + real*8 :: xye(1) = 0.0d0 + poly_eoskey = EOS_Omni_GetHandle("2D_Polytrope") ! end EOS Omni vars #endif @@ -155,8 +155,8 @@ do j=1,cctk_lsh(2) do k=1,cctk_lsh(3) #ifdef USE_EOS_OMNI - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& - rho(i,j,k),xeps,xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr) + call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,rho(i,j,k),xeps,xtemp,xye,& + press(i,j,k),eps(i,j,k),keyerr,anyerr) #else eps(i,j,k) = EOS_SpecificIntEnergy(GRHydro_eos_handle,rho(i,j,k),press(i,j,k)) File [modified]: GRHydro_SimpleWave.F90 Delta lines: +6 -5 =================================================================== --- trunk/src/GRHydro_SimpleWave.F90 2010-08-16 18:33:26 UTC (rev 111) +++ trunk/src/GRHydro_SimpleWave.F90 2010-08-18 18:15:02 UTC (rev 112) @@ -62,10 +62,10 @@ integer :: keytemp = 0 integer :: anyerr = 0 integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + real*8 :: xpress(1) = 0.0d0 + real*8 :: xeps(1) = 0.0d0 + real*8 :: xtemp(1) = 0.0d0 + real*8 :: xye(1) = 0.0d0 ! end EOS Omni vars #endif @@ -149,8 +149,9 @@ velx(i,1,1) = 0.d0 w_lorentz(i,1,1) = 1.d0 #if USE_EOS_OMNI + xeps = 1.0d0 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& - rho(i,1,1),1.0d0,xtemp,xye,press(i,1,1),keyerr,anyerr) + rho(i,1,1),xeps,xtemp,xye,press(i,1,1),keyerr,anyerr) #else press(i,1,1) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,1,1), 1.0d0) #endif Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +35 -2 =================================================================== --- trunk/interface.ccl 2010-08-16 18:33:26 UTC (rev 111) +++ trunk/interface.ccl 2010-08-18 18:15:02 UTC (rev 112) @@ -4,9 +4,9 @@ implements: GRHydro_init_data inherits: GRHydro grid -USES INCLUDE: EOS_Base.inc +#USES INCLUDE: EOS_Base.inc USES INCLUDE: SpaceMask.h -USES INCLUDE: EOS_Base.h +#USES INCLUDE: EOS_Base.h SUBROUTINE SpatialDet(CCTK_REAL IN gxx, CCTK_REAL IN gxy, \ @@ -58,6 +58,39 @@ USES FUNCTION Prim2ConGen USES FUNCTION Con2PrimPoly +CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name) +USES FUNCTION EOS_Omni_GetHandle + + +void FUNCTION EOS_Omni_press(CCTK_INT IN eoshandle, \ + CCTK_INT IN havetemp, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY rho, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY press, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +USES FUNCTION EOS_Omni_press + +void FUNCTION EOS_Omni_EpsFromPress(CCTK_INT IN eoshandle, \ + CCTK_INT IN havetemp, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY rho, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL IN ARRAY press, \ + CCTK_REAL OUT ARRAY xeps, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +USES FUNCTION EOS_Omni_EpsFromPress + + + protected: CCTK_REAL simple_wave_grid_functions TYPE=GF TIMELEVELS=1 tags='checkpoint="no"'

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 148)
by cott＠tapir.caltech.edu 18 Aug '10

18 Aug '10

User: cott Date: 2010/08/18 01:03 PM Modified: /trunk/ interface.ccl Log: * add aliased call for EOS_Omni_GetHandle also to standard version of the .ccl file -- it does not hurt to be there. File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +4 -0 =================================================================== --- trunk/interface.ccl 2010-08-16 18:33:04 UTC (rev 147) +++ trunk/interface.ccl 2010-08-18 18:03:14 UTC (rev 148) @@ -162,6 +162,10 @@ ### Functions provided by the Omni EOS interface ### ####################################################### +CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name) +USES FUNCTION EOS_Omni_GetHandle + + void FUNCTION EOS_Omni_press(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ CCTK_INT IN npoints, \

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits August 2010