aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrhaas <rhaas@ac85fae7-cede-4708-beff-ae01c7fa1c26>2012-11-09 01:59:23 +0000
committerrhaas <rhaas@ac85fae7-cede-4708-beff-ae01c7fa1c26>2012-11-09 01:59:23 +0000
commit215f1d7e371df0de2a524e2f2a61a6ded9c51f9d (patch)
treeb3b4416d8c42d6620d74f96f09062206f43f6d88 /src
parent96387687ac1bdb56c345fa736e666f78f6ccb407 (diff)
ng the interface for magentized con2prim for consistency
From: Josh Faber <jfaberrit@jfaber3.local> git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@185 ac85fae7-cede-4708-beff-ae01c7fa1c26
Diffstat (limited to 'src')
-rw-r--r--src/GRHydro_C2P2CM.F907
-rw-r--r--src/GRHydro_P2C2PM.F904
2 files changed, 6 insertions, 5 deletions
diff --git a/src/GRHydro_C2P2CM.F90 b/src/GRHydro_C2P2CM.F90
index dcea38f..c167504 100644
--- a/src/GRHydro_C2P2CM.F90
+++ b/src/GRHydro_C2P2CM.F90
@@ -90,7 +90,7 @@ subroutine c2p2cM(CCTK_ARGUMENTS)
sy_send = 0.166666658d0
sz_send = 0.166666658d0
tau_send = 0.484123939d0
-
+
bvcx_send = Bx_init
bvcy_send = By_init
bvcz_send = Bz_init
@@ -98,6 +98,7 @@ subroutine c2p2cM(CCTK_ARGUMENTS)
bconsy_send = By_init
bconsz_send = Bz_init
+ rho_send=1.0d-6
eps_send = 1.0d-6
press_send = 6.666666666666667d-7
w_lorentz_send = 1.0d0
@@ -138,8 +139,8 @@ subroutine c2p2cM(CCTK_ARGUMENTS)
write(*,*) ' Bvecz : ',bvcz_send
write(*,*) 'C2P2CM test: getting the associated primitive variables.'
- call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, &
- tau_send,bconsx_send,bconsy_send,bconsz_send,rho_send,velx_send,vely_send,velz_send, &
+ call Con2PrimGenM(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,local_gam(1),dens_send,sx_send,sy_send,sz_send, &
+ tau_send,bconsx_send,bconsy_send,bconsz_send,xtemp(1),xye(1),rho_send,velx_send,vely_send,velz_send, &
eps_send,press_send,bvcx_send,bvcy_send,bvcz_send,b2_send,w_lorentz_send, &
gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,&
uxx,uxy,uxz,uyy,uyz,uzz,det,&
diff --git a/src/GRHydro_P2C2PM.F90 b/src/GRHydro_P2C2PM.F90
index 1c1a9c7..8658cd6 100644
--- a/src/GRHydro_P2C2PM.F90
+++ b/src/GRHydro_P2C2PM.F90
@@ -153,9 +153,9 @@ subroutine p2c2pm(CCTK_ARGUMENTS)
write(*,*) 'P2C2PM test: getting the associated primitive variables.'
- call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, &
+ call Con2PrimGenM(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,local_gam(1),dens_send,sx_send,sy_send,sz_send, &
tau_send,bconsx_send,bconsy_send,bconsz_send,&
- rho_send(1),velx_send,vely_send,velz_send, &
+ xtemp(1),xye(1),rho_send(1),velx_send,vely_send,velz_send, &
eps_send(1),press_send(1), &
bvcx_send,bvcy_send,bvcz_send,b2_send,&
w_lorentz_send, &