Clean up a few routines and make them to conform to

EOS Omni interface.



git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@119 ac85fae7-cede-4708-beff-ae01c7fa1c26

1 files changed, 21 insertions, 34 deletions

diff --git a/src/GRHydro_C2P2CM.F90 b/src/GRHydro_C2P2CM.F90
index c382037..6c4cd43 100644
--- a/src/GRHydro_C2P2CM.F90
+++ b/src/GRHydro_C2P2CM.F90
@@ -37,33 +37,25 @@ subroutine c2p2cM(CCTK_ARGUMENTS)
   DECLARE_CCTK_PARAMETERS
   DECLARE_CCTK_FUNCTIONS
 
-  integer didit,i,j,k,nx,ny,nz
-  CCTK_REAL det
-  CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz
-  CCTK_REAL gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send
-  CCTK_REAL dens_send,sx_send,sy_send,sz_send,tau_send
-  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(1), epsmin(1), local_gam(1)
-  CCTK_REAL C2P_failed
-  CCTK_INT epsnegative
-
-  CCTK_REAL :: rhoval(1), epsval(1)
-  CCTK_REAL :: gamval
+  CCTK_REAL :: det
+  CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz
+  CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send
+  CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send
+  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 :: C2P_failed
+  CCTK_INT :: epsnegative
 
 ! begin EOS Omni vars
-  integer :: n,keytemp,anyerr,keyerr(1)
-  real*8  :: xpress(1),xtemp(1),xye(1),xeps(1),xrho(1)
+  CCTK_REAL :: pmin(1), epsmin(1), local_gam(1), epsval(1)
+  CCTK_INT :: n,keytemp,anyerr,keyerr(1)
+  CCTK_REAL :: xpress(1),xtemp(1),xye(1),xeps(1),xrho(1)
   n=1;keytemp=0;anyerr=0;keyerr(1)=0
   xpress(1)=0.0d0;xtemp(1)=0.0d0;xye(1)=0.0d0;xeps(1)=0.0d0
 ! end EOS Omni vars
 
   call CCTK_WARN(1,"This test works only with Ideal_Fluid EoS")
-
-  nx = cctk_lsh(1)
-  ny = cctk_lsh(2)
-  nz = cctk_lsh(3)
   
   x_send = 0.0d0
   y_send = 0.0d0
@@ -106,25 +98,22 @@ subroutine c2p2cM(CCTK_ARGUMENTS)
   press_send = 6.666666666666667d-7
   w_lorentz_send = 1.0d0
 
-!  epsnegative = .false.
   epsnegative = 0
   
-  GRHydro_rho_min = 1.0d-10
-  rhoval(1) = GRHydro_rho_min
-  epsval(1) = 1.0d0
+  xrho = 1.0d-10
+  epsval = 1.0d0
 
   call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,&
-       rhoval,epsval,xtemp,xye,pmin,keyerr,anyerr)
+       xrho,epsval,xtemp,xye,pmin,keyerr,anyerr)
 
   call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,&
-       rhoval,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr)
+       xrho,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr)
 
-  local_gam(1)=0.0d0
-  rhoval(1) = 1.0d0
+  local_gam = 0.0d0
+  xrho = 1.0d0
   call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,&
-       rhoval,epsval,xtemp,xye,local_gam,keyerr,anyerr)
-  local_gam(1) = local_gam(1)+1.0
-  gamval = local_gam(1)
+       xrho,epsval,xtemp,xye,local_gam,keyerr,anyerr)
+  local_gam = local_gam + 1.0
 
   C2P_failed = 0.0d0
 
@@ -142,8 +131,7 @@ subroutine c2p2cM(CCTK_ARGUMENTS)
   write(*,*) '   Bvecz  : ',bvcz_send
   
   write(*,*) 'C2P2CM test: getting the associated primitive variables.'
-!  call GRHydro_Con2PrimM_pt(GRHydro_eos_handle,local_gam,dens_send,sx_send,sy_send,sz_send, &
-  call Con2PrimGenM(GRHydro_eos_handle,gamval,dens_send,sx_send,sy_send,sz_send, &
+  call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),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,&
@@ -166,7 +154,6 @@ subroutine c2p2cM(CCTK_ARGUMENTS)
   write(*,*) '   C2P_failed : ',C2P_failed
   
   write(*,*) 'C2P2CM test: converting back to conserved variables.'
-!  call prim2conM(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, &
   call Prim2ConGenM(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, &
        dens_send, sx_send, sy_send, sz_send, tau_send, bvcx_send, bvcy_send, bvcz_send, rho_send, &
        velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send)