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

Use fastSparseProduct(), do not use hijacked Eigen header.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2014-12-05 12:58:16 +01:00
parent e8b3524ffa
commit c43b9f4a22
2 changed files with 3 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/autodiff/AutoDiffBlock.hpp
View File

@@ -22,9 +22,9 @@
#include <opm/core/utility/platform_dependent/disable_warnings.h>
#include <opm/autodiff/ConservativeSparseSparseProduct.h>
#include <Eigen/Eigen>
#include <Eigen/Sparse>
#include <opm/autodiff/fastSparseProduct.hpp>
#include <opm/core/utility/platform_dependent/reenable_warnings.h>
@@ -441,7 +441,8 @@ namespace Opm
std::vector<typename AutoDiffBlock<Scalar>::M> jac(num_blocks);
assert(lhs.cols() == rhs.value().rows());
for (int block = 0; block < num_blocks; ++block) {
jac[block] = lhs*rhs.derivative()[block];
// jac[block] = lhs*rhs.derivative()[block];
fastSparseProduct(lhs, rhs.derivative()[block], jac[block]);
}
typename AutoDiffBlock<Scalar>::V val = lhs*rhs.value().matrix();
return AutoDiffBlock<Scalar>::function(val, jac);