diff options
| author | knarf <knarf@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2010-11-26 20:02:43 +0000 |
|---|---|---|
| committer | knarf <knarf@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2010-11-26 20:02:43 +0000 |
| commit | 658e7648d888ae72d7b52a297e3bc11b3bcf6c55 (patch) | |
| tree | 771cb80df886e9e58b386dabf1b05cdf36464686 /src/GRHydro_EOS.c | |
| parent | 9326e8cbc58743e70ef79f914950ea997af66b93 (diff) | |
merge branch hot_and_MHD_temp_dev into branch at revision r185
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@186 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
Diffstat (limited to 'src/GRHydro_EOS.c')
| -rw-r--r-- | src/GRHydro_EOS.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/GRHydro_EOS.c b/src/GRHydro_EOS.c index 1c0b4c9..77fcd96 100644 --- a/src/GRHydro_EOS.c +++ b/src/GRHydro_EOS.c @@ -3,7 +3,7 @@ @date Wed Feb 6 18:25:33 2002 @author @desc - Sets the EOS handle number from EOS_Base for use by + Sets the EOS handle number for use by all the GRHydro routines @enddesc @@*/ @@ -15,10 +15,6 @@ #include <stdio.h> #include <stdlib.h> -#if !USE_EOS_OMNI -#include "EOS_Base.h" -#endif - /*@@ @routine GRHydro_EOSHandle @date Wed Feb 6 18:28:01 2002 @@ -40,7 +36,6 @@ void GRHydro_EOSHandle(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; -#ifdef USE_EOS_OMNI CCTK_INFO("Trying to get EOS handles"); EOS_Omni_GetHandle("2D_Polytrope"); CCTK_INFO("Trying to get EOS handles"); @@ -50,12 +45,5 @@ void GRHydro_EOSHandle(CCTK_ARGUMENTS) 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 + } |