User: bmundim Date: 2011/04/27 08:14 PM
Modified: /trunk/src/ GRHydro_CylindricalExplosionM.F90, GRHydro_MonopoleM.F90, GRHydro_P2C2PM.F90, GRHydro_ShockTubeM.F90
Log: A few fixes on the interface calls and related bugs.
File Changes:
Directory: /trunk/src/ ======================
File [modified]: GRHydro_CylindricalExplosionM.F90 Delta lines: +12 -6 =================================================================== --- trunk/src/GRHydro_CylindricalExplosionM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_CylindricalExplosionM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3)
/*@@ @@ -117,25 +120,28 @@ call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) else call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) end if + + enddo enddo - enddo enddo
densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0
return
File [modified]: GRHydro_MonopoleM.F90 Delta lines: +22 -17 =================================================================== --- trunk/src/GRHydro_MonopoleM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_MonopoleM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3)
/*@@ @routine GRHydro_MonopoleM @@ -77,23 +80,25 @@ Bvecz(i,j,k)=0.0
det=SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) - - if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then - call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& - gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& - velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) - else - call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& - gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& - velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) - end if
+ if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then + call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& + gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& + det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& + velx(i,j,k),vely(i,j,k),velz(i,j,k),& + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) + else + call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& + gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& + det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& + velx(i,j,k),vely(i,j,k),velz(i,j,k),& + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) + end if + enddo enddo enddo @@ -101,7 +106,7 @@ densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0
return
File [modified]: GRHydro_P2C2PM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_P2C2PM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_P2C2PM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -131,7 +131,7 @@ 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, & - bconsx_send,bcibsy_send,bconsz_send, & + bconsx_send,bconsy_send,bconsz_send, & rho_send(1),velx_send,vely_send,velz_send,eps_send(1),press_send(1), & bvcx_send,bvcy_send,bvcz_send,w_lorentz_send)
File [modified]: GRHydro_ShockTubeM.F90 Delta lines: +10 -5 =================================================================== --- trunk/src/GRHydro_ShockTubeM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_ShockTubeM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3)
#define OOSQRT2 (0.7071067811865475244008442) #define OOSQRT3 (0.5773502691896257645091489) @@ -611,16 +614,18 @@ call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) else call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) end if enddo enddo @@ -629,7 +634,7 @@ densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0
return