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, 35 insertions, 37 deletions

diff --git a/src/GRHydro_P2C2PM.F90 b/src/GRHydro_P2C2PM.F90
index 1abf1ca..62c998b 100644
--- a/src/GRHydro_P2C2PM.F90
+++ b/src/GRHydro_P2C2PM.F90
@@ -10,6 +10,7 @@
 #include "cctk.h"
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
+#include "cctk_Functions.h"
 
  /*@@
    @routine    p2c2pm
@@ -33,35 +34,27 @@ subroutine p2c2pm(CCTK_ARGUMENTS)
 
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
-
-  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, epsmin, local_gam
-  CCTK_INT C2P_failed
-  logical epsnegative
+  DECLARE_CCTK_FUNCTIONS
+
+  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(1),velx_send,vely_send,velz_send,eps_send(1)
+  CCTK_REAL :: press_send(1),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 = 1
-  integer :: keytemp = 0
-  integer :: anyerr = 0
-  integer :: keyerr(1) = 0
-  real*8  :: xpress = 0.0d0
-  real*8  :: xeps = 0.0d0
-  real*8  :: xtemp = 0.0d0
-  real*8  :: xye = 0.0d0
+  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
@@ -96,23 +89,26 @@ subroutine p2c2pm(CCTK_ARGUMENTS)
 
   w_lorentz_send = 1.d0/sqrt(1.0d0-velx_send*velx_send-vely_send*vely_send-velz_send*velz_send)
 
-  epsnegative = .false.
+  epsnegative = 0
   
-  GRHydro_rho_min = 1.e-10
+  xrho = 1.0d-10
+  epsval = 1.0d0
 
   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)
+       xrho,epsval,xtemp,xye,pmin,keyerr,anyerr)
 
   call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,&
-       GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr)
+       xrho,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr)
 
+  local_gam = 0.0d0
+  xrho = 1.0d0
   call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,&
-       1.0d0,1.0d0,xtemp,xye,local_gam,keyerr,anyerr)
-  local_gam=local_gam+1.0
+       xrho,epsval,xtemp,xye,local_gam,keyerr,anyerr)
+  local_gam = local_gam + 1.0
 
-  C2P_failed = 0
+  C2P_failed = 0.0d0
 
   write(*,*) 'P2C2PM test: the primitive variables are'
   write(*,*) '   primitive variables: '
@@ -128,9 +124,11 @@ subroutine p2c2pm(CCTK_ARGUMENTS)
   write(*,*) '   Bvecz  : ',bvcz_send
   
   write(*,*) 'P2C2PM test: converting back to conserved variables.'
-  call prim2conM(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) 
+  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(1), &
+       velx_send,vely_send,velz_send,eps_send(1),press_send(1),w_lorentz_send) 
 
   write(*,*) 'P2C2PM test: initial values.'
   write(*,*) '   conservative variables: '
@@ -147,9 +145,9 @@ subroutine p2c2pm(CCTK_ARGUMENTS)
   
   write(*,*) 'P2C2PM test: getting the associated primitive variables.'
   
-  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, &
+  call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, &
+       tau_send,rho_send(1),velx_send,vely_send,velz_send, &
+       eps_send(1),press_send(1),w_lorentz_send, &
        gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,&
        uxx,uxy,uxz,uyy,uyz,uzz,det,&
        bvcx_send,bvcy_send,bvcz_send,b2_send,&