OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1070 from babrodtk/eigen_3.3_fix

Browse Source 
This enables compiling with Eigen 3.3
This commit is contained in:
Atgeirr Flø Rasmussen 2017-02-23 14:04:51 +01:00 committed by GitHub
commit 6024a7ad78
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/autodiff/fastSparseOperations.hpp
View File

@ -187,7 +187,14 @@ equalSparsityPattern(const Lhs& lhs, const Rhs& rhs)
// check complete sparsity pattern // check complete sparsity pattern
if( equal ) if( equal )
{ {
//Eigen 3.3 series uses StorageIndex instead of Index
#if (EIGEN_WORLD_VERSION > 3) \
|| (EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3) \
|| (EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION == 2 && EIGEN_MINOR_VERSION >= 90)
typedef typename Eigen::internal::remove_all<Lhs>::type::StorageIndex Index;
#else
typedef typename Eigen::internal::remove_all<Lhs>::type::Index Index; typedef typename Eigen::internal::remove_all<Lhs>::type::Index Index;
#endif
const Index outerSize = lhs.outerSize(); const Index outerSize = lhs.outerSize();
if( outerSize != rhs.outerSize() ) if( outerSize != rhs.outerSize() )
{ {