mirror of
https://github.com/paboyle/Grid.git
synced 2024-11-09 23:45:36 +00:00
No compile fixes
This commit is contained in:
parent
ca42fe6d32
commit
f35fc4b76c
@ -6,7 +6,7 @@ using namespace std;
|
||||
using namespace Grid;
|
||||
using namespace Grid::QCD;
|
||||
|
||||
class myclass {
|
||||
class myclass: Serializable {
|
||||
public:
|
||||
|
||||
GRID_DECL_CLASS_MEMBERS(myclass,
|
||||
@ -446,7 +446,7 @@ int main (int argc, char ** argv)
|
||||
{
|
||||
Grid_init(&argc,&argv);
|
||||
|
||||
XMLReader RD("params.xml");
|
||||
XmlReader RD("params.xml");
|
||||
read(RD,"params",params);
|
||||
std::cout<<"Params: Order "<<params.order<<"["<<params.lo<<","<<params.hi<<"]"<< " steps "<<params.steps<<std::endl;
|
||||
|
||||
|
@ -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++){
|
||||
|
Loading…
Reference in New Issue
Block a user