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

Merge pull request #1073 from dr-robertk/PR/revert-1070

Browse Source 
Revert PR 1070 to use auto instead of preprocessor statements.
This commit is contained in:
Atgeirr Flø Rasmussen 2017-02-24 08:56:34 +01:00 committed by GitHub
commit 560b39e933
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
opm/autodiff/fastSparseOperations.hpp
View File

@ -187,23 +187,17 @@ equalSparsityPattern(const Lhs& lhs, const Rhs& rhs)
// check complete sparsity pattern
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;
#endif
typedef std::size_t Index;
const Index outerSize = lhs.outerSize();
if( outerSize != rhs.outerSize() )
const Index rhsOuterSize = rhs.outerSize();
if( outerSize != rhsOuterSize )
{
return false;
}
// outer indices
const Index* rhsOuter = rhs.outerIndexPtr();
const Index* lhsOuter = lhs.outerIndexPtr();
const auto rhsOuter = rhs.outerIndexPtr();
const auto lhsOuter = lhs.outerIndexPtr();
for(Index i=0; i<=outerSize; ++i )
{
if( lhsOuter[ i ] != rhsOuter[ i ] ) {
@ -212,8 +206,8 @@ equalSparsityPattern(const Lhs& lhs, const Rhs& rhs)
}
// inner indices
const Index* rhsInner = rhs.innerIndexPtr();
const Index* lhsInner = lhs.innerIndexPtr();
const auto rhsInner = rhs.innerIndexPtr();
const auto lhsInner = lhs.innerIndexPtr();
const Index nnz = lhs.nonZeros();
for( Index i=0; i<nnz; ++i)
@ -236,7 +230,7 @@ fastSparseAdd(Lhs& lhs, const Rhs& rhs)
if( equalSparsityPattern( lhs, rhs ) )
{
typedef typename Eigen::internal::remove_all<Lhs>::type::Scalar Scalar;
typedef typename Eigen::internal::remove_all<Lhs>::type::Index Index;
typedef std::size_t Index;
const Index nnz = lhs.nonZeros();
@ -265,7 +259,7 @@ fastSparseSubstract(Lhs& lhs, const Rhs& rhs)
if( equalSparsityPattern( lhs, rhs ) )
{
typedef typename Eigen::internal::remove_all<Lhs>::type::Scalar Scalar;
typedef typename Eigen::internal::remove_all<Lhs>::type::Index Index;
typedef std::size_t Index;
const Index nnz = lhs.nonZeros();