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

[rhaas at tapir.caltech.edu]

User: rhaas
Date: 2014/04/15 02:48 PM

Modified:
 /trunk/src/
  GRHydro_PPMReconstruct_drv_opt.cc

Log:
 GRHydro: add MHD multipatch support to optimized C++ PPM

File Changes:

Directory: /trunk/src/
======================

File [modified]: GRHydro_PPMReconstruct_drv_opt.cc
Delta lines: +12 -9
===================================================================
--- trunk/src/GRHydro_PPMReconstruct_drv_opt.cc	2014-04-15 19:48:54 UTC (rev 613)
+++ trunk/src/GRHydro_PPMReconstruct_drv_opt.cc	2014-04-15 19:48:56 UTC (rev 614)
@@ -54,12 +54,15 @@
   DECLARE_CCTK_PARAMETERS;
 
   CCTK_REAL * restrict vup;
+  CCTK_REAL * restrict Bprim;
 
   //Multipatch related pointers
   if(GRHydro_UseGeneralCoordinates(cctkGH)) {
     vup=lvel;
+    Bprim=lBvec;
   } else {
     vup=vel;
+    Bprim=Bvec;
   }
 
   int nx=cctk_lsh[0];
@@ -293,9 +296,9 @@
         }
         
         if(Bvec!=NULL) {
-          oned_slice(nx,nstart,       1,Bvec,Bvcx1d);
-          oned_slice(nx,nstart+nxyz,  1,Bvec,Bvcy1d);
-          oned_slice(nx,nstart+2*nxyz,1,Bvec,Bvcz1d);
+          oned_slice(nx,nstart,       1,Bprim,Bvcx1d);
+          oned_slice(nx,nstart+nxyz,  1,Bprim,Bvcy1d);
+          oned_slice(nx,nstart+2*nxyz,1,Bprim,Bvcz1d);
           if(clean_divergence) {
             oned_slice(nx,nstart,1,psidc,psidc1d);
           }
@@ -383,9 +386,9 @@
         }
         
         if(Bvec!=NULL) {
-          oned_slice(ny,nstart,       nx,Bvec,Bvcx1d);
-          oned_slice(ny,nstart+nxyz,  nx,Bvec,Bvcy1d);
-          oned_slice(ny,nstart+2*nxyz,nx,Bvec,Bvcz1d);
+          oned_slice(ny,nstart,       nx,Bprim,Bvcx1d);
+          oned_slice(ny,nstart+nxyz,  nx,Bprim,Bvcy1d);
+          oned_slice(ny,nstart+2*nxyz,nx,Bprim,Bvcz1d);
           if(clean_divergence) {
             oned_slice(ny,nstart,nx,psidc,psidc1d);
           }
@@ -475,9 +478,9 @@
         }
         
         if(Bvec!=NULL) {
-          oned_slice(nz,nstart,       nxy,Bvec,Bvcx1d);
-          oned_slice(nz,nstart+nxyz,  nxy,Bvec,Bvcy1d);
-          oned_slice(nz,nstart+2*nxyz,nxy,Bvec,Bvcz1d);
+          oned_slice(nz,nstart,       nxy,Bprim,Bvcx1d);
+          oned_slice(nz,nstart+nxyz,  nxy,Bprim,Bvcy1d);
+          oned_slice(nz,nstart+2*nxyz,nxy,Bprim,Bvcz1d);
           if(clean_divergence) {
             oned_slice(nz,nstart,nxy,psidc,psidc1d);
           }