portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-15 06:17:05 +01:00
Code Releases Activity

No compile fixes

Browse Source
This commit is contained in:
Peter Boyle
2015-11-29 10:59:11 +00:00
parent ca42fe6d32
commit f35fc4b76c
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Test_stencil.cc
View File

@ -62,11 +62,7 @@ int main (int argc, char ** argv)
std::vector<int> directions(npoint,dir);
std::vector<int> displacements(npoint,disp);
<<<<<<< HEAD
CartesianStencil<vobj,vobj,SimpleCompressor<vobj> > myStencil(&Fine,npoint,0,directions,displacements);
=======
Stencil myStencil(&Fine,npoint,0,directions,displacements);
>>>>>>> bc4b2528835e646fab1b186506b4740d97b02243
std::vector<int> ocoor(4);
for(int o=0;o<Fine.oSites();o++){