diff options
| author | bmundim <bmundim@ac85fae7-cede-4708-beff-ae01c7fa1c26> | 2010-12-25 06:44:22 +0000 |
|---|---|---|
| committer | bmundim <bmundim@ac85fae7-cede-4708-beff-ae01c7fa1c26> | 2010-12-25 06:44:22 +0000 |
| commit | 85cb2e6f9c6191fc9889a1055017236c9a071192 (patch) | |
| tree | 8caf69ec858bd0a805b8eae902b7739208d1d387 /src/GRHydro_C2P2CM.F90 | |
| parent | 2b84e1494caf85bb43ab35d7208c669df61fdc85 (diff) | |
RIT MHD dev:
Update initial data routines to properly call out pressures and other
hydro quantities using EOS_Omni rather than now-defunct interfaces.
Add C2P_polytype interface.
Un-hardwire fixed values of gamma for all MHD Con2Prim routines.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@117 ac85fae7-cede-4708-beff-ae01c7fa1c26
Diffstat (limited to 'src/GRHydro_C2P2CM.F90')
| -rw-r--r-- | src/GRHydro_C2P2CM.F90 | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/GRHydro_C2P2CM.F90 b/src/GRHydro_C2P2CM.F90 index 12c1ed4..3bd61b6 100644 --- a/src/GRHydro_C2P2CM.F90 +++ b/src/GRHydro_C2P2CM.F90 @@ -34,13 +34,6 @@ subroutine c2p2cM(CCTK_ARGUMENTS) 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 didit,i,j,k,nx,ny,nz CCTK_REAL det CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz @@ -49,11 +42,10 @@ subroutine c2p2cM(CCTK_ARGUMENTS) CCTK_REAL rho_send,velx_send,vely_send,velz_send,eps_send CCTK_REAL press_send,w_lorentz_send,x_send,y_send,z_send,r_send CCTK_REAL bvcx_send, bvcy_send, bvcz_send, b2_send - CCTK_REAL pmin, epsmin + CCTK_REAL pmin, epsmin, local_gam CCTK_INT C2P_failed logical epsnegative -#if USE_EOS_OMNI ! begin EOS Omni vars integer :: n = 1 integer :: keytemp = 0 @@ -64,7 +56,6 @@ subroutine c2p2cM(CCTK_ARGUMENTS) real*8 :: xtemp = 0.0d0 real*8 :: xye = 0.0d0 ! end EOS Omni vars -#endif call CCTK_WARN(1,"This test works only with Ideal_Fluid EoS") @@ -110,16 +101,18 @@ subroutine c2p2cM(CCTK_ARGUMENTS) epsnegative = .false. GRHydro_rho_min = 1.e-10 -#if USE_EOS_OMNI - call EOS_Omni_press(GRHydro_eos_handle,keytemp,n,& + + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr) - call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,n,& + call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) -#else - pmin = EOS_Pressure(GRHydro_eos_handle, GRHydro_rho_min, 1.0d0) - epsmin = EOS_SpecificIntEnergy(GRHydro_eos_handle, GRHydro_rho_min, pmin) -#endif + + local_gam=0.0 + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + 1.d0,1.0d0,xtemp,xye,local_gam,keyerr,anyerr) + local_gam = local_gam+1.0 + C2P_failed = 0 write(*,*) 'C2P2CM test: initial values.' @@ -136,7 +129,7 @@ subroutine c2p2cM(CCTK_ARGUMENTS) write(*,*) ' Bvecz : ',bvcz_send write(*,*) 'C2P2CM test: getting the associated primitive variables.' - call GRHydro_Con2PrimM_pt(GRHydro_eos_handle,dens_send,sx_send,sy_send,sz_send, & + call GRHydro_Con2PrimM_pt(GRHydro_eos_handle,local_gam,dens_send,sx_send,sy_send,sz_send, & tau_send,rho_send,velx_send,vely_send,velz_send, & eps_send,press_send,w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& |