Merge branch 'develop' into feature/scalar_adjointFT

This commit is contained in:
Guido Cossu committed 2017-10-25 10:49:50 +01:00
commit e0cae833da
6 files changed
+22 -5

No files matched your search

+2 -1
View File
@@ -81,6 +81,8 @@ public:
Init(dimensions,simd_layout,processor_grid);
}
virtual ~GridCartesian() = default;
void Init(const std::vector<int> &dimensions,
const std::vector<int> &simd_layout,
const std::vector<int> &processor_grid)
@@ -159,7 +161,6 @@ public:
}
};
virtual ~GridCartesian() = default;
};
}
#endif
+2
View File
@@ -133,6 +133,8 @@ public:
{
Init(base->_fdimensions,base->_simd_layout,base->_processors,checker_dim_mask,checker_dim) ;
}
virtual ~GridRedBlackCartesian() = default;
#if 0
////////////////////////////////////////////////////////////
// Create redblack grid ;; deprecate these. Should not