diff options
Diffstat (limited to 'src/GRHydro_P2C2P.F90')
| -rw-r--r-- | src/GRHydro_P2C2P.F90 | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/GRHydro_P2C2P.F90 b/src/GRHydro_P2C2P.F90 index 10258c3..ba13d12 100644 --- a/src/GRHydro_P2C2P.F90 +++ b/src/GRHydro_P2C2P.F90 @@ -34,13 +34,6 @@ subroutine p2c2p(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 @@ -52,7 +45,6 @@ subroutine p2c2p(CCTK_ARGUMENTS) CCTK_INT C2P_failed logical epsnegative -#if USE_EOS_OMNI ! begin EOS Omni vars integer :: n = 1 integer :: keytemp = 0 @@ -63,7 +55,6 @@ subroutine p2c2p(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") @@ -103,19 +94,15 @@ subroutine p2c2p(CCTK_ARGUMENTS) epsnegative = .false. GRHydro_rho_min = 1.e-10 -#if USE_EOS_OMNI - call EOS_Omni_press(GRHydro_eos_handle,keytemp,n,& - rho_send,1.0d0,xtemp,eps_send,press_send,keyerr,anyerr) - call EOS_Omni_press(GRHydro_eos_handle,keytemp,n,& + + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho_send,eps_send,xtemp,xye,press_send,keyerr,anyerr) + 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 - press_send = EOS_Pressure(GRHydro_eos_handle, rho_send, eps_send) - pmin = EOS_Pressure(GRHydro_eos_handle, GRHydro_rho_min, 1.0d0) - epsmin = EOS_SpecificIntEnergy(GRHydro_eos_handle, GRHydro_rho_min, pmin) -#endif + C2P_failed = 0 write(*,*) 'P2C2P test: the primitive variables are' |