Commits

Sam Preston committed 4e648df Merge

Merge branch 'master' of ssh://bitbucket.org/scicompanat/pyca

  • Participants
  • Parent commits c85143e, 84f1adf

Comments (0)

Files changed (3)

Code/Cxx/src/math/CFieldOpers.cxx

 Resample(Field3D& a_o, const Field3D& a_i, StreamT stream)
 {
     if (a_o.size() == a_i.size()){
-       size_t nEl = a_o.nVox();
        Opers::Copy(a_o, a_i, stream);
        return;
     }
 
   //initialize
   Vec3Di size = ginv0t.size();
-  size_t nEl = ginv0t.nVox();
   Opers::Copy(ginv0t1, ginv0t, stream);
 
   for(unsigned int iter=0;iter<numIter;iter++){    

Code/Cxx/src/math/CImageFieldOpers.cxx

     size_t nVox = size.prod();
 
     size_t id = 0;
-    size_t planeSize = size.x * size.y;
 
     CMemOpers<float>::SetMem(a_o, 0.f, nVox, stream, false);
     CMemOpers<float>::SetMem(a_w, 0.f, nVox, stream, false);
     size_t nVox = size.prod();
 
     size_t id = 0;
-    size_t planeSize = size.x * size.y;
 
     CMemOpers<float>::SetMem(a_o, 0.f, nVox, stream, false);
         

Code/Cxx/src/math/GFieldOpers.cu

 Resample(Field3D& d_o, const Field3D& d_i, StreamT stream)
 {
     if (d_o.size() == d_i.size()) {
-        size_t nEl = d_o.nVox();
         Opers::Copy(d_o, d_i, stream);
         return;
     }
   dim3 threads(16,16);
   dim3 grids(iDivUp(size.x, threads.x), iDivUp(size.y, threads.y));
 
-  size_t nEl = ginv0t.nVox();
   Opers::Copy(ginv0t1, ginv0t, stream);
   for(unsigned int iter=0;iter<numIter;iter++){    
     // compute w\circ g_{t+1,0}