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

Improve performance of subset() and superset().

Browse Source 
Using a different construction method for the sparse matrix
used makes the methods a little faster. There is probably
still room for improvement by refactoring to avoid the
sparse matrix products.
This commit is contained in:
Atgeirr Flø Rasmussen
2014-09-25 11:38:48 +02:00
parent 7fffc2c99a
commit 6c7061096a
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
opm/autodiff/AutoDiffHelpers.hpp
View File

@@ -187,26 +187,18 @@ struct HelperOps
namespace { namespace {
template <typename Scalar, class IntVec>
Eigen::SparseMatrix<Scalar>
constructSubsetSparseMatrix(const int full_size, const IntVec& indices)
{
typedef Eigen::Triplet<Scalar> Tri;
const int subset_size = indices.size();
std::vector<Tri> triplets(subset_size);
for (int i = 0; i < subset_size; ++i) {
triplets[i] = Tri(i, indices[i], 1);
}
Eigen::SparseMatrix<Scalar> sub(subset_size, full_size);
sub.setFromTriplets(triplets.begin(), triplets.end());
return sub;
}
template <typename Scalar, class IntVec> template <typename Scalar, class IntVec>
Eigen::SparseMatrix<Scalar> Eigen::SparseMatrix<Scalar>
constructSupersetSparseMatrix(const int full_size, const IntVec& indices) constructSupersetSparseMatrix(const int full_size, const IntVec& indices)
{ {
return constructSubsetSparseMatrix<Scalar>(full_size, indices).transpose(); const int subset_size = indices.size();
Eigen::SparseMatrix<Scalar> mat(full_size, subset_size);
mat.reserve(Eigen::VectorXi::Constant(subset_size, 1));
for (int i = 0; i < subset_size; ++i) {
mat.insert(indices[i], i) = 1;
}
return mat;
} }
} // anon namespace } // anon namespace
@@ -218,7 +210,9 @@ AutoDiffBlock<Scalar>
subset(const AutoDiffBlock<Scalar>& x, subset(const AutoDiffBlock<Scalar>& x,
const IntVec& indices) const IntVec& indices)
{ {
return constructSubsetSparseMatrix<Scalar>(x.value().size(), indices) * x; Eigen::SparseMatrix<Scalar> sub
= constructSupersetSparseMatrix<Scalar>(x.value().size(), indices).transpose();
return sub * x;
} }
@@ -229,7 +223,7 @@ Eigen::Array<Scalar, Eigen::Dynamic, 1>
subset(const Eigen::Array<Scalar, Eigen::Dynamic, 1>& x, subset(const Eigen::Array<Scalar, Eigen::Dynamic, 1>& x,
const IntVec& indices) const IntVec& indices)
{ {
return (constructSubsetSparseMatrix<Scalar>(x.size(), indices) * x.matrix()).array(); return (constructSupersetSparseMatrix<Scalar>(x.size(), indices).transpose() * x.matrix()).array();
} }