Commits August 2010

commits@lists.einsteintoolkit.org

5 participants
29 discussions

[svn:einsteintoolkit] NoExcision/trunk/src/ (Rev. 27)
by diener＠cct.lsu.edu 17 Aug '10

17 Aug '10

User: diener Date: 2010/08/17 10:22 AM Modified: /trunk/src/ smooth.F90 Log: Replace an 'else where' with 'elsewhere'. I wonder why more compilers have not complained about this. File Changes: Directory: /trunk/src/ ====================== File [modified]: smooth.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/smooth.F90 2010-07-12 14:50:48 UTC (rev 26) +++ trunk/src/smooth.F90 2010-08-17 15:22:11 UTC (rev 27) @@ -42,7 +42,7 @@ & ((z - cz) / radz)**2) where (mask <= 0) mask = 0 ! outside - else where (mask >= smoothing_zone_width(n)) + elsewhere (mask >= smoothing_zone_width(n)) mask = 1 ! far inside elsewhere mask = mask / smoothing_zone_width(n) ! a bit inside

1 0

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

16 Aug '10

User: knarf Date: 2010/08/16 01:33 PM Added: /trunk/ interface.ccl.omni Log: ccl using omni File Changes: Directory: /trunk/ ================== File [added]: interface.ccl.omni Delta lines: +84 -0 =================================================================== --- trunk/interface.ccl.omni (rev 0) +++ trunk/interface.ccl.omni 2010-08-16 18:33:26 UTC (rev 111) @@ -0,0 +1,84 @@ +# Interface definition for thorn GRHydro_Init_Data +# $Header$ + +implements: GRHydro_init_data +inherits: GRHydro grid + +#USES INCLUDE: EOS_Base.inc +USES INCLUDE: SpaceMask.h +#USES INCLUDE: EOS_Base.h + + +SUBROUTINE SpatialDet(CCTK_REAL IN gxx, CCTK_REAL IN gxy, \ + CCTK_REAL IN gxz, CCTK_REAL IN gyy, \ + CCTK_REAL IN gyz, CCTK_REAL IN gzz, \ + CCTK_REAL OUT det) + + +SUBROUTINE Prim2ConPoly(CCTK_INT IN handle, \ + CCTK_REAL IN gxx, CCTK_REAL IN gxy, CCTK_REAL IN gxz, \ + CCTK_REAL IN gyy, CCTK_REAL IN gyz, CCTK_REAL IN gzz, \ + CCTK_REAL IN det, CCTK_REAL OUT dens, \ + CCTK_REAL OUT sx, CCTK_REAL OUT sy, \ + CCTK_REAL OUT sz, CCTK_REAL OUT tau, \ + CCTK_REAL IN rho, CCTK_REAL IN velx, \ + CCTK_REAL IN vely, \ + CCTK_REAL IN velz, CCTK_REAL OUT epsilon, \ + CCTK_REAL OUT press, CCTK_REAL OUT w_lorentz) + + +SUBROUTINE Prim2ConGen(CCTK_INT IN handle, \ + CCTK_REAL IN gxx, CCTK_REAL IN gxy, \ + CCTK_REAL IN gxz, CCTK_REAL IN gyy, \ + CCTK_REAL IN gyz, CCTK_REAL IN gzz, \ + CCTK_REAL IN det, CCTK_REAL OUT dens, \ + CCTK_REAL OUT sx, CCTK_REAL OUT sy, \ + CCTK_REAL OUT sz, CCTK_REAL OUT tau, \ + CCTK_REAL IN rho, CCTK_REAL IN velx, \ + CCTK_REAL IN vely, \ + CCTK_REAL IN velz, CCTK_REAL IN epsilon, \ + CCTK_REAL OUT press, CCTK_REAL OUT w_lorentz) + +SUBROUTINE Con2PrimPoly(CCTK_INT IN handle, CCTK_REAL OUT dens, \ + CCTK_REAL OUT sx, CCTK_REAL OUT sy, \ + CCTK_REAL OUT sz, CCTK_REAL OUT tau, \ + CCTK_REAL OUT rho, CCTK_REAL OUT velx, \ + CCTK_REAL OUT vely, CCTK_REAL OUT velz, \ + CCTK_REAL OUT epsilon, CCTK_REAL OUT press, \ + CCTK_REAL OUT w_lorentz, CCTK_REAL IN uxx, \ + CCTK_REAL IN uxy, CCTK_REAL IN uxz, CCTK_REAL IN uyy, \ + CCTK_REAL IN uyz, CCTK_REAL IN uzz, CCTK_REAL IN det, \ + CCTK_REAL IN x, CCTK_REAL IN y, CCTK_REAL IN z, \ + CCTK_REAL IN r, CCTK_REAL IN rho_min, \ + CCTK_INT IN GRHydro_reflevel, CCTK_REAL IN GRHydro_C2P_failed) + + +USES FUNCTION SpatialDet +USES FUNCTION Prim2ConPoly +USES FUNCTION Prim2ConGen +USES FUNCTION Con2PrimPoly + +protected: + +CCTK_REAL simple_wave_grid_functions TYPE=GF TIMELEVELS=1 tags='checkpoint="no"' +{ + simple_tmp + c_s +} "1D arrays for the simple-wave routine" + +CCTK_REAL simple_wave_scalars TYPE=scalar +{ + simple_rho_0 + simple_eps_0 +} "values at v=0" + +CCTK_REAL simple_wave_output TYPE=GF TIMELEVELS=1 tags='checkpoint="no"' +{ + simple_rho + simple_eps +# simple_entropy +} "output variables for the simple-wave routine" + +private: + +CCTK_INT GRHydro_init_data_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level GRHydro is working on right now"

1 0

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

16 Aug '10

User: knarf Date: 2010/08/16 01:33 PM Added: /trunk/ configuration.ccl.omni, interface.ccl.omni, param.ccl.omni Log: ccl versions using EOS_OMNI File Changes: Directory: /trunk/ ================== File [added]: configuration.ccl.omni Delta lines: <Unavailable> File [added]: interface.ccl.omni Delta lines: <Unavailable> File [added]: param.ccl.omni Delta lines: <Unavailable>

1 0

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

16 Aug '10

User: knarf Date: 2010/08/16 01:28 PM Modified: /trunk/src/ GRHydro_Eigenproblem.F90 Log: even more EOS_OMNI #defines - why isn't this catched with the first compilation? File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +4 -0 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2010-08-16 18:27:37 UTC (rev 145) +++ trunk/src/GRHydro_Eigenproblem.F90 2010-08-16 18:28:57 UTC (rev 146) @@ -184,10 +184,12 @@ !!$ Warning, warning. Nasty hack follows +#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 @@ -567,10 +569,12 @@ !!$ Warning, warning. Nasty hack follows +#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

1 0

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

16 Aug '10

User: knarf Date: 2010/08/16 01:27 PM Modified: /trunk/src/ GRHydro_Eigenproblem.F90 Log: more #define File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +2 -0 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2010-08-16 18:23:38 UTC (rev 144) +++ trunk/src/GRHydro_Eigenproblem.F90 2010-08-16 18:27:37 UTC (rev 145) @@ -58,10 +58,12 @@ CCTK_INT handle CCTK_REAL dpdrho,dpdeps,press +#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

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 110)
by knarf＠cct.lsu.edu 16 Aug '10

16 Aug '10

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)

1 0

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

16 Aug '10

User: knarf Date: 2010/08/16 01:23 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Eigenproblem.F90, GRHydro_Eigenproblem_Marquina.F90, GRHydro_EoSChangeGamma.F90, GRHydro_Prim2Con.F90 Log: more #defines, use integer handles if given, remove eos_key usage File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +32 -42 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-08-16 17:52:56 UTC (rev 143) +++ trunk/src/GRHydro_Con2Prim.F90 2010-08-16 18:23:38 UTC (rev 144) @@ -68,7 +68,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 @@ -76,7 +75,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 @@ -96,9 +94,9 @@ #if USE_EOS_OMNI ! this is a poly call - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& GRHydro_rho_min,xeps,xtemp,xye,pmin,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) #else pmin = EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0) @@ -160,10 +158,10 @@ vel(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 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,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,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)) @@ -214,10 +212,10 @@ vel(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 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,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,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)) @@ -297,14 +295,12 @@ #if USE_EOS_OMNI ! begin EOS Omni vars integer :: n = 1 - integer :: eoskey = 0 integer :: keytemp = 0 integer :: anyerr = 0 integer :: keyerr(1) = 0 real*8 :: xpress = 0.0d0 real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 - eoskey = GRHydro_eoskey ! end EOS Omni vars #endif @@ -321,7 +317,7 @@ !!$ Set initial guess for pressure: #if USE_EOS_OMNI - call EOS_Omni_press(eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rho,epsilon,xtemp,xye,xpress,keyerr,anyerr) pold = max(1.d-10,xpress) #else @@ -356,7 +352,7 @@ !!$ Calculate the function #if USE_EOS_OMNI - call EOS_Omni_press(eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rho,epsilon,xtemp,xye,xpress,keyerr,anyerr) f = pold - xpress @@ -408,10 +404,10 @@ end if #if USE_EOS_OMNI - call EOS_Omni_DPressByDRho(eoskey,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,n,& rho,epsilon,xtemp,xye,dpressbydrho,keyerr,anyerr) - call EOS_Omni_DPressByDEps(eoskey,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,n,& rho,epsilon,xtemp,xye,dpressbydeps,keyerr,anyerr) #else dpressbydrho = EOS_DPressByDRho(handle,rho,epsilon) @@ -437,7 +433,7 @@ udens)/udens #if USE_EOS_OMNI - call EOS_Omni_press(eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rho,epsilon,xtemp,xye,xpress,keyerr,anyerr) f = pnew - xpress @@ -452,10 +448,10 @@ do i=1,GRHydro_polish #if USE_EOS_OMNI - call EOS_Omni_DPressByDRho(eoskey,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,n,& rho,epsilon,xtemp,xye,dpressbydrho,keyerr,anyerr) - call EOS_Omni_DPressByDEps(eoskey,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,n,& rho,epsilon,xtemp,xye,dpressbydeps,keyerr,anyerr) #else dpressbydrho = EOS_DPressByDRho(handle,rho,epsilon) @@ -479,7 +475,7 @@ udens)/udens #if USE_EOS_OMNI - call EOS_Omni_press(eoskey,keytemp,n, & + call EOS_Omni_press(handle,keytemp,n, & rho,epsilon,xtemp,xye,xpress,keyerr,anyerr) f = pold - xpress @@ -579,8 +575,6 @@ #if USE_EOS_OMNI ! begin EOS omni - CCTK_INT :: eoskey = 0 - CCTK_INT :: poly_eoskey = 0 CCTK_INT :: keyerr(1) = 0 CCTK_INT :: anyerr = 0 CCTK_INT :: keytemp = 0 @@ -588,18 +582,16 @@ CCTK_REAL :: xye = 0.0d0 CCTK_REAL :: xeps = 0.0d0 CCTK_REAL :: xtemp = 0.0d0 - eoskey = GRHydro_eoskey - poly_eoskey = GRHydro_poly_eoskey ! end EOS omni #endif #if USE_EOS_OMNI ! this is a poly call - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_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_polytrope_handle,keytemp,n,& GRHydro_rho_min,epsmin,xtemp,xye,pmin,epsmin,keyerr,anyerr) #else pmin=EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0) @@ -937,7 +929,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 @@ -945,7 +936,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 @@ -964,10 +954,10 @@ rhoold = max(GRHydro_rho_min,rho) #if USE_EOS_OMNI -! call EOS_Omni_press(poly_eoskey,keytemp,n,& +! call EOS_Omni_press(handle,keytemp,n,& ! rhoold,xeps,xtemp,xye,xpress,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,n,& rhoold,xeps,xtemp,xye,press,xeps,keyerr,anyerr) enthalpy = 1.0d0 + xeps + press / rhoold @@ -979,7 +969,7 @@ w_lorentz = sqrt(1.d0 + s2 / ( (udens*enthalpy)**2 )) #if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhoold,epsilon,xtemp,xye,press,keyerr,anyerr) #else press = EOS_Pressure(handle, rhoold, epsilon) @@ -1017,10 +1007,10 @@ udens = rhonew dens = sqrtdet * rhonew #if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhonew,1.0d0,xtemp,xye,press,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) #else press = EOS_Pressure(handle, rhonew, 1.d0) @@ -1042,7 +1032,7 @@ !!$ 2D_Polytrope it gives the right answers. #if USE_EOS_OMNI - call EOS_Omni_DPressByDrho(poly_eoskey,keytemp,n,& + call EOS_Omni_DPressByDrho(handle,keytemp,n,& rhonew,epsilon,xtemp,xye,denthalpy,keyerr,anyerr) denthalpy = denthalpy / rhonew #else @@ -1069,10 +1059,10 @@ !!$ Recalculate primitive variables and function #if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhonew,epsilon,xtemp,xye,press,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) enthalpy = 1.0d0 + epsilon + press / rhonew @@ -1100,10 +1090,10 @@ dens = sqrtdet * rhonew #if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhonew,1.0d0,xtemp,xye,press,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) #else press = EOS_Pressure(handle, rhonew, 1.d0) @@ -1124,10 +1114,10 @@ 50 rho = rhonew #if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhonew,epsilon,xtemp,xye,press,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) enthalpy = 1.0d0 + epsilon + press / rhonew @@ -1138,10 +1128,10 @@ #endif #if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhonew,epsilon,xtemp,xye,press,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,n,& rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) #else press = EOS_Pressure(handle, rhonew, epsilon) @@ -1166,9 +1156,9 @@ rho = GRHydro_rho_min dens = sqrtdet * rho #if USE_EOS_OMNI - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhonew,1.d0,xtemp,xye,press,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(handle,keytemp,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 -16 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2010-08-16 17:52:56 UTC (rev 143) +++ trunk/src/GRHydro_Eigenproblem.F90 2010-08-16 18:23:38 UTC (rev 144) @@ -66,7 +66,6 @@ #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 @@ 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 @@ #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 @@ #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 @@ 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 @@ !!$ 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 @@ #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 @@ 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 @@ !!$ 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) File [modified]: GRHydro_Eigenproblem_Marquina.F90 Delta lines: +10 -10 =================================================================== --- trunk/src/GRHydro_Eigenproblem_Marquina.F90 2010-08-16 17:52:56 UTC (rev 143) +++ trunk/src/GRHydro_Eigenproblem_Marquina.F90 2010-08-16 18:23:38 UTC (rev 144) @@ -92,15 +92,16 @@ !!$ Warning, warning. Nasty hack follows +#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 :: eoskey = 0 integer :: keytemp = 0 integer :: anyerr = 0 integer :: keyerr(1) = 0 @@ -108,7 +109,6 @@ real*8 :: xeps = 0.0d0 real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 - eoskey = GRHydro_eoskey ! end EOS Omni vars #endif @@ -120,13 +120,13 @@ !!$ Set required fluid quantities invrhol = one / rhol #if USE_EOS_OMNI - call EOS_Omni_press(eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhol,epsl,xtemp,xye,pressl,keyerr,anyerr) -! call EOS_Omni_cs2(eoskey,keytemp,n,& +! call EOS_Omni_cs2(handle,keytemp,n,& ! rhol,epsl,xtemp,xye,cs2l,keyerr,anyerr) - call EOS_Omni_DPressByDEps(eoskey,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,n,& rhol,epsl,xtemp,xye,dpdepsl,keyerr,anyerr) - call EOS_Omni_DPressByDRho(eoskey,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,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(eoskey,keytemp,n,& + call EOS_Omni_press(handle,keytemp,n,& rhor,epsr,xtemp,xye,pressr,keyerr,anyerr) -! call EOS_Omni_cs2(eoskey,keytemp,n,& +! call EOS_Omni_cs2(handle,keytemp,n,& ! rhor,epsr,xtemp,xye,cs2r,keyerr,anyerr) - call EOS_Omni_DPressByDEps(eoskey,keytemp,n,& + call EOS_Omni_DPressByDEps(handle,keytemp,n,& rhor,epsr,xtemp,xye,dpdepsr,keyerr,anyerr) - call EOS_Omni_DPressByDRho(eoskey,keytemp,n,& + call EOS_Omni_DPressByDRho(handle,keytemp,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 -12 =================================================================== --- trunk/src/GRHydro_EoSChangeGamma.F90 2010-08-16 17:52:56 UTC (rev 143) +++ trunk/src/GRHydro_EoSChangeGamma.F90 2010-08-16 18:23:38 UTC (rev 144) @@ -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,12 +69,11 @@ real*8 :: xeps = 0.0d0 real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 - poly_eoskey = GRHydro_poly_eoskey ! end EOS Omni vars - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& 1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr) local_Gamma = 1.0d0 + xpress/xeps @@ -161,7 +159,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 @@ -169,12 +166,11 @@ real*8 :: xeps = 0.0d0 real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 - poly_eoskey = GRHydro_poly_eoskey ! end EOS Omni vars - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& 1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr) local_Gamma = 1.0d0 + xpress/xeps @@ -267,7 +263,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 @@ -275,12 +270,11 @@ real*8 :: xeps = 0.0d0 real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 - poly_eoskey = GRHydro_poly_eoskey ! end EOS Omni vars - call EOS_Omni_press(poly_eoskey,keytemp,n,& + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr) - call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,n,& 1.0d0,1.0d0,xtemp,xye,xpress,xeps,keyerr,anyerr) local_Gamma = 1.0d0 + xpress/xeps File [modified]: GRHydro_Prim2Con.F90 Delta lines: +7 -7 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2010-08-16 17:52:56 UTC (rev 143) +++ trunk/src/GRHydro_Prim2Con.F90 2010-08-16 18:23:38 UTC (rev 144) @@ -129,12 +129,13 @@ 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 @@ 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 @@ *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 @@ 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 @@ 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 @@ 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

1 0

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

16 Aug '10

User: knarf Date: 2010/08/16 12:52 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_EOS.c, GRHydro_EoSChangeGamma.F90 Log: some more #defines for EOS_Omni, use handle-function to get EOS_Handle from EOS_Omni File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +15 -0 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-07-30 03:20:39 UTC (rev 142) +++ trunk/src/GRHydro_Con2Prim.F90 2010-08-16 17:52:56 UTC (rev 143) @@ -48,10 +48,12 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS +#if !USE_EOS_OMNI #ifdef _EOS_BASE_INC_ #undef _EOS_BASE_INC_ #endif #include "EOS_Base.inc" +#endif integer :: i, j, k, itracer, nx, ny, nz CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt, pmin, epsmin @@ -284,10 +286,12 @@ character(len=200) warnline logical epsnegative +#if !USE_EOS_OMNI #ifdef _EOS_BASE_INC_ #undef _EOS_BASE_INC_ #endif #include "EOS_Base.inc" +#endif #if USE_EOS_OMNI @@ -565,10 +569,12 @@ CCTK_REAL :: local_min_tracer +#if !USE_EOS_OMNI #ifdef _EOS_BASE_INC_ #undef _EOS_BASE_INC_ #endif #include "EOS_Base.inc" +#endif #if USE_EOS_OMNI @@ -920,10 +926,12 @@ enthalpy, denthalpy, sqrtdet, invsqrtdet, invfac, GRHydro_C2P_failed character(len=200) warnline +#if !USE_EOS_OMNI #ifdef _EOS_BASE_INC_ #undef _EOS_BASE_INC_ #endif #include "EOS_Base.inc" +#endif #if USE_EOS_OMNI @@ -1157,8 +1165,15 @@ rho = GRHydro_rho_min dens = sqrtdet * rho +#if USE_EOS_OMNI + call EOS_Omni_press(poly_eoskey,keytemp,n,& + rhonew,1.d0,xtemp,xye,press,keyerr,anyerr) + call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + rhonew,xeps,xtemp,xye,press,epsilon,keyerr,anyerr) +#else press = EOS_Pressure(handle, rhonew, 1.d0) epsilon = EOS_SpecificIntEnergy(handle, rhonew, press) +#endif ! w_lorentz=1, so the expression for tau reduces to: tau = sqrtdet * (rho+rho*epsilon) - dens usx = 0.d0 File [modified]: GRHydro_EOS.c Delta lines: +19 -29 =================================================================== --- trunk/src/GRHydro_EOS.c 2010-07-30 03:20:39 UTC (rev 142) +++ trunk/src/GRHydro_EOS.c 2010-08-16 17:52:56 UTC (rev 143) @@ -15,7 +15,9 @@ #include <stdio.h> #include <stdlib.h> +#if !USE_EOS_OMNI #include "EOS_Base.h" +#endif /*@@ @routine GRHydro_EOSHandle @@ -38,34 +40,22 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; -#ifndef USE_EOS_OMNI - int ierr = 0; - char *infoline; - - *GRHydro_eos_handle = EOS_Handle(GRHydro_eos_table); - - if (*GRHydro_eos_handle < 0) { - ierr = *GRHydro_eos_handle; - CCTK_WARN(0, "Table handle is incorrect"); - } - - *GRHydro_polytrope_handle = EOS_Handle("2D_Polytrope"); - - if (*GRHydro_polytrope_handle < 0) { - ierr = *GRHydro_polytrope_handle; - CCTK_WARN(0, "GRHydro requires the 2D_Polytrope or the 2D_HybridPolytrope EoSs to be registered, for the atmosphere"); - } - - infoline = (char *)malloc(100*sizeof(char)); - if (!infoline) { - CCTK_WARN(0, "Failed to malloc an array of 100 chars in GRHydro_EOS."); - } - else { - sprintf(infoline,"GRHydro will use the %s equation of state.", - GRHydro_eos_table); - CCTK_INFO(infoline); - } - free(infoline); - infoline = NULL; +#ifdef USE_EOS_OMNI + CCTK_INFO("Trying to get EOS handles"); + EOS_Omni_GetHandle("2D_Polytrope"); + CCTK_INFO("Trying to get EOS handles"); + if (!(*GRHydro_eos_handle = EOS_Omni_GetHandle(GRHydro_eos_table))) + CCTK_WARN(0, "Cannot get EOS handle, aborting."); + if (!(*GRHydro_polytrope_handle = EOS_Omni_GetHandle("2D_Polytrope"))) + CCTK_WARN(0, "Cannot get polytrope EOS handle, aborting."); + CCTK_VInfo(CCTK_THORNSTRING, "GRHydro will use the %s equation of state.", + GRHydro_eos_table); +#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); + CCTK_WARN(0, "Cannot get polytrope EOS handle, aborting."); + CCTK_VInfo(CCTK_THORNSTRING, "GRHydro will use the %s equation of state.", + GRHydro_eos_table); #endif } File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: +8 -0 =================================================================== --- trunk/src/GRHydro_EoSChangeGamma.F90 2010-07-30 03:20:39 UTC (rev 142) +++ trunk/src/GRHydro_EoSChangeGamma.F90 2010-08-16 17:52:56 UTC (rev 143) @@ -54,7 +54,9 @@ CCTK_REAL :: local_gamma +#if !USE_EOS_OMNI #include "EOS_Base.inc" +#endif !!$ Set up the fluid constants #if USE_EOS_OMNI @@ -135,7 +137,9 @@ subroutine GRHydro_EoSChangeK(CCTK_ARGUMENTS) +#if !USE_EOS_OMNI USE EOS_Polytrope_Scalars +#endif implicit none @@ -149,7 +153,9 @@ CCTK_REAL, dimension(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)) :: Q +#if !USE_EOS_OMNI #include "EOS_Base.inc" +#endif !!$ Set up the fluid constants #if USE_EOS_OMNI @@ -253,7 +259,9 @@ character(len=100) infoline +#if !USE_EOS_OMNI #include "EOS_Base.inc" +#endif !!$ Set up the fluid constants #if USE_EOS_OMNI

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 6)
by knarf＠cct.lsu.edu 16 Aug '10

16 Aug '10

User: knarf Date: 2010/08/16 12:52 PM Added: /EOS_Omni/src/ EOS_Omni_Handles.c Removed: /EOS_Omni/src/ EOS_Omni_Names.cpp Modified: /EOS_Omni/ interface.ccl /EOS_Omni/src/ make.code.defn Log: actually provide the handle function, change to c for simplicity (from c++) File Changes: Directory: /EOS_Omni/ ===================== File [modified]: interface.ccl Delta lines: +2 -0 =================================================================== --- EOS_Omni/interface.ccl 2010-08-16 14:12:22 UTC (rev 5) +++ EOS_Omni/interface.ccl 2010-08-16 17:52:05 UTC (rev 6) @@ -6,6 +6,8 @@ CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name) +PROVIDES FUNCTION EOS_Omni_GetHandle with EOS_Omni_GetHandle_ LANGUAGE C + void FUNCTION EOS_Omni_press(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ CCTK_INT IN npoints, \ Directory: /EOS_Omni/src/ ========================= File [added]: EOS_Omni_Handles.c Delta lines: +15 -0 =================================================================== --- EOS_Omni/src/EOS_Omni_Handles.c (rev 0) +++ EOS_Omni/src/EOS_Omni_Handles.c 2010-08-16 17:52:05 UTC (rev 6) @@ -0,0 +1,15 @@ +#include <cctk.h> +#include <cctk_Arguments.h> + +CCTK_INT EOS_Omni_GetHandle_(CCTK_STRING name) +{ + CCTK_INFO("GetHandle"); + if (CCTK_EQUALS(name, "2D_Polytrope")) + return 1; + if (CCTK_EQUALS(name, "Ideal_Fluid")) + return 2; + if (CCTK_EQUALS(name, "Hybrid")) + return 3; + return 0; +} + File [removed]: EOS_Omni_Names.cpp Delta lines: +0 -15 =================================================================== --- EOS_Omni/src/EOS_Omni_Names.cpp 2010-08-16 14:12:22 UTC (rev 5) +++ EOS_Omni/src/EOS_Omni_Names.cpp 2010-08-16 17:52:05 UTC (rev 6) @@ -1,15 +0,0 @@ -#include <cctk.h> -#include <cctk_Arguments.h> -#include <cctk_Parameters.h> - -CCTK_INT EOS_Omni_GetHandle(CCTK_STRING name) -{ - if (CCTK_EQUALS(name, "2D_Polytrope")) - return 1; - if (CCTK_EQUALS(name, "Ideal_Fluid")) - return 2; - if (CCTK_EQUALS(name, "Hybrid")) - return 3; - return 0; -} - File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- EOS_Omni/src/make.code.defn 2010-08-16 14:12:22 UTC (rev 5) +++ EOS_Omni/src/make.code.defn 2010-08-16 17:52:05 UTC (rev 6) @@ -1,7 +1,7 @@ # 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_Names.cpp +SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 EOS_Omni_Handles.c # Subdirectories containing source files SUBDIRS =

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 5)
by knarf＠cct.lsu.edu 16 Aug '10

16 Aug '10

User: knarf Date: 2010/08/16 09:12 AM Added: /EOS_Omni/src/ EOS_Omni_Names.cpp Modified: /EOS_Omni/ interface.ccl /EOS_Omni/src/ make.code.defn Log: provide function to get EOS key/handle by string/name: EOS_Omni_GetHandle File Changes: Directory: /EOS_Omni/ ===================== File [modified]: interface.ccl Delta lines: +2 -0 =================================================================== --- EOS_Omni/interface.ccl 2010-08-09 14:20:16 UTC (rev 4) +++ EOS_Omni/interface.ccl 2010-08-16 14:12:22 UTC (rev 5) @@ -4,6 +4,8 @@ inherits: +CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name) + void FUNCTION EOS_Omni_press(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ CCTK_INT IN npoints, \ Directory: /EOS_Omni/src/ ========================= File [added]: EOS_Omni_Names.cpp Delta lines: +15 -0 =================================================================== --- EOS_Omni/src/EOS_Omni_Names.cpp (rev 0) +++ EOS_Omni/src/EOS_Omni_Names.cpp 2010-08-16 14:12:22 UTC (rev 5) @@ -0,0 +1,15 @@ +#include <cctk.h> +#include <cctk_Arguments.h> +#include <cctk_Parameters.h> + +CCTK_INT EOS_Omni_GetHandle(CCTK_STRING name) +{ + if (CCTK_EQUALS(name, "2D_Polytrope")) + return 1; + if (CCTK_EQUALS(name, "Ideal_Fluid")) + return 2; + if (CCTK_EQUALS(name, "Hybrid")) + return 3; + return 0; +} + File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- EOS_Omni/src/make.code.defn 2010-08-09 14:20:16 UTC (rev 4) +++ EOS_Omni/src/make.code.defn 2010-08-16 14:12:22 UTC (rev 5) @@ -1,7 +1,7 @@ # 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 +SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 EOS_Omni_Names.cpp # Subdirectories containing source files SUBDIRS =

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits August 2010