[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 276) - Commits

19 Sep 2011

User: rhaas
Date: 2011/09/19 06:16 PM
Modified:
 /trunk/src/
  GRHydro_ENOReconstruct_drv.F90, GRHydro_PPMMReconstruct_drv.F90, GRHydro_TVDReconstruct_drv.F90
Log:
 fix non-multipatch support for MHD
File Changes:
Directory: /trunk/src/
======================
File [modified]: GRHydro_ENOReconstruct_drv.F90
Delta lines: +7 -4
===================================================================

--- trunk/src/GRHydro_ENOReconstruct_drv.F90	2011-09-19 23:15:08 UTC (rev 275)
+++ trunk/src/GRHydro_ENOReconstruct_drv.F90	2011-09-19 23:16:09 UTC (rev 276)
@@ -20,9 +20,9 @@
 #define sx(i,j,k) scon(i,j,k,1)
 #define sy(i,j,k) scon(i,j,k,2)
 #define sz(i,j,k) scon(i,j,k,3)
-#define Bvecx(i,j,k) lBvec(i,j,k,1)
-#define Bvecy(i,j,k) lBvec(i,j,k,2)
-#define Bvecz(i,j,k) lBvec(i,j,k,3)
+#define Bvecx(i,j,k) Bprim(i,j,k,1)
+#define Bvecy(i,j,k) Bprim(i,j,k,2)
+#define Bvecz(i,j,k) Bprim(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)
@@ -67,12 +67,15 @@
   ! save memory when MP is not used
   CCTK_INT :: GRHydro_UseGeneralCoordinates
   TARGET vel, lvel
-  CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup
+  TARGET Bvec, lBvec
+  CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup, Bprim
if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then
     vup => lvel
+    Bprim => lBvec
   else
     vup => vel
+    Bprim => Bvec
   end if
allocate(trivial_rp(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),STAT=ierr)
File [modified]: GRHydro_PPMMReconstruct_drv.F90
Delta lines: +7 -4
===================================================================
--- trunk/src/GRHydro_PPMMReconstruct_drv.F90	2011-09-19 23:15:08 UTC (rev 275)
+++ trunk/src/GRHydro_PPMMReconstruct_drv.F90	2011-09-19 23:16:09 UTC (rev 276)
@@ -20,9 +20,9 @@
 #define sx(i,j,k) scon(i,j,k,1)
 #define sy(i,j,k) scon(i,j,k,2)
 #define sz(i,j,k) scon(i,j,k,3)
-#define Bvecx(i,j,k) lBvec(i,j,k,1)
-#define Bvecy(i,j,k) lBvec(i,j,k,2)
-#define Bvecz(i,j,k) lBvec(i,j,k,3)
+#define Bvecx(i,j,k) Bprim(i,j,k,1)
+#define Bvecy(i,j,k) Bprim(i,j,k,2)
+#define Bvecz(i,j,k) Bprim(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)
@@ -71,9 +71,10 @@
   TARGET betaa, betab, betac
   TARGET betax, betay, betaz
   TARGET lvel, vel
+  TARGET lBvec, Bvec
   CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33
   CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3
-  CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup
+  CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup, Bprim
if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then
     g11 => gaa
@@ -86,6 +87,7 @@
     beta2 => betab
     beta3 => betac
     vup => lvel
+    Bprim => lBvec
   else
     g11 => gxx
     g12 => gxy
@@ -97,6 +99,7 @@
     beta2 => betay
     beta3 => betaz
     vup => vel
+    Bprim => Bvec
   end if
allocate(trivial_rp(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),STAT=ierr)
File [modified]: GRHydro_TVDReconstruct_drv.F90
Delta lines: +10 -7
===================================================================
--- trunk/src/GRHydro_TVDReconstruct_drv.F90	2011-09-19 23:15:08 UTC (rev 275)
+++ trunk/src/GRHydro_TVDReconstruct_drv.F90	2011-09-19 23:16:09 UTC (rev 276)
@@ -20,9 +20,9 @@
 #define sx(i,j,k) scon(i,j,k,1)
 #define sy(i,j,k) scon(i,j,k,2)
 #define sz(i,j,k) scon(i,j,k,3)
-#define Bvecx(i,j,k) lBvec(i,j,k,1)
-#define Bvecy(i,j,k) lBvec(i,j,k,2)
-#define Bvecz(i,j,k) lBvec(i,j,k,3)
+#define Bvecx(i,j,k) Bprim(i,j,k,1)
+#define Bvecy(i,j,k) Bprim(i,j,k,2)
+#define Bvecz(i,j,k) Bprim(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)
@@ -65,12 +65,15 @@
   ! save memory when MP is not used
   CCTK_INT :: GRHydro_UseGeneralCoordinates
   TARGET vel, lvel
-  CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup
+  TARGET Bvec, lBvec
+  CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup, Bprim
if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then
     vup => lvel
+    Bprim => lBvec
   else
     vup => vel
+    Bprim => Bvec
   end if
allocate(trivial_rp(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),STAT=ierr)
@@ -175,11 +178,11 @@
            eps, epsplus, epsminus, trivial_rp, hydro_excision_mask)
       if(evolve_mhd.ne.0) then
          call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
-              lBvec(:,:,:,1), Bvecxplus, Bvecxminus, trivial_rp, hydro_excision_mask)
+              Bprim(:,:,:,1), Bvecxplus, Bvecxminus, trivial_rp, hydro_excision_mask)
          call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
-              lBvec(:,:,:,2), Bvecyplus, Bvecyminus, trivial_rp, hydro_excision_mask)
+              Bprim(:,:,:,2), Bvecyplus, Bvecyminus, trivial_rp, hydro_excision_mask)
          call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
-              lBvec(:,:,:,3), Bveczplus, Bveczminus, trivial_rp, hydro_excision_mask)
+              Bprim(:,:,:,3), Bveczplus, Bveczminus, trivial_rp, hydro_excision_mask)
       endif
else if (CCTK_EQUALS(recon_vars,"conservative")) then

    