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

Merge branch 'develop' into feature/scalar_adjointFT

Browse Source 
# Conflicts:
#	lib/communicator/Communicator_mpi3.cc
This commit is contained in:
Antonin Portelli
2017-11-11 18:09:55 +00:00
parent e0cae833da 25f73018f4
commit 074d17429f
45 changed files with 2099 additions and 1505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/cartesian/Cartesian_full.h
View File

@ -38,7 +38,7 @@ namespace Grid{
class GridCartesian: public GridBase {
public:
int dummy;
virtual int CheckerBoardFromOindexTable (int Oindex) {
return 0;
}
@ -67,7 +67,14 @@ public:
GridCartesian(const std::vector<int> &dimensions,
const std::vector<int> &simd_layout,
const std::vector<int> &processor_grid,
const GridCartesian &parent) : GridBase(processor_grid,parent)
const GridCartesian &parent) : GridBase(processor_grid,parent,dummy)
{
Init(dimensions,simd_layout,processor_grid);
}
GridCartesian(const std::vector<int> &dimensions,
const std::vector<int> &simd_layout,
const std::vector<int> &processor_grid,
const GridCartesian &parent,int &split_rank) : GridBase(processor_grid,parent,split_rank)
{
Init(dimensions,simd_layout,processor_grid);
}