From 710501d36d68b194cb4273c8cd46e20b0108b78c Mon Sep 17 00:00:00 2001
From: knarf <knarf@ac85fae7-cede-4708-beff-ae01c7fa1c26>
Date: Mon, 16 Aug 2010 18:24:10 +0000
Subject: use eos handles

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@110 ac85fae7-cede-4708-beff-ae01c7fa1c26
---
 src/GRHydro_C2P2C.F90      | 6 ++----
 src/GRHydro_Con2Prim.F90   | 6 ++----
 src/GRHydro_SimpleWave.F90 | 4 +---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/GRHydro_C2P2C.F90 b/src/GRHydro_C2P2C.F90
index a2523a8..1ce1347 100644
--- a/src/GRHydro_C2P2C.F90
+++ b/src/GRHydro_C2P2C.F90
@@ -55,7 +55,6 @@ subroutine c2p2c(CCTK_ARGUMENTS)
 #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 @@ subroutine c2p2c(CCTK_ARGUMENTS)
   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 @@ subroutine c2p2c(CCTK_ARGUMENTS)
   
   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)
diff --git a/src/GRHydro_Con2Prim.F90 b/src/GRHydro_Con2Prim.F90
index 5172d29..d6950ab 100644
--- a/src/GRHydro_Con2Prim.F90
+++ b/src/GRHydro_Con2Prim.F90
@@ -62,7 +62,6 @@ subroutine GRHydro_con2primtest(CCTK_ARGUMENTS)
 #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 @@ subroutine GRHydro_con2primtest(CCTK_ARGUMENTS)
   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 @@ subroutine GRHydro_con2primtest(CCTK_ARGUMENTS)
   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)
diff --git a/src/GRHydro_SimpleWave.F90 b/src/GRHydro_SimpleWave.F90
index d1f10d4..2274790 100644
--- a/src/GRHydro_SimpleWave.F90
+++ b/src/GRHydro_SimpleWave.F90
@@ -59,7 +59,6 @@ subroutine GRHydro_SimpleWave(CCTK_ARGUMENTS)
 #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 @@ subroutine GRHydro_SimpleWave(CCTK_ARGUMENTS)
   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 @@ subroutine GRHydro_SimpleWave(CCTK_ARGUMENTS)
       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)  
-- 
cgit v1.2.3