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

Fixed wrong assert() in operator*(sparse matrix, AD block).

Browse Source 
Also removed unnecessary debug output (that was wrong anyway).
This commit is contained in:
Atgeirr Flø Rasmussen
2013-05-01 21:25:50 +02:00
parent f85e74bcff
commit 8e7ae33724
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AutoDiffBlock.hpp
View File

@@ -114,7 +114,6 @@ namespace AutoDiff
D D1 = val_.matrix().asDiagonal();
D D2 = rhs.val_.matrix().asDiagonal();
for (int block = 0; block < num_blocks; ++block) {
std::cout << jac[block].rows() << ' ' << rhs.jac_[block].rows() << std::endl;
assert(jac_[block].rows() == rhs.jac_[block].rows());
assert(jac_[block].cols() == rhs.jac_[block].cols());
jac[block] = D2*jac_[block] + D1*rhs.jac_[block];
@@ -201,7 +200,7 @@ namespace AutoDiff
{
int num_blocks = rhs.numBlocks();
std::vector<typename ForwardBlock<Scalar>::M> jac(num_blocks);
assert(lhs.cols() == num_blocks);
assert(lhs.cols() == rhs.value().rows());
for (int block = 0; block < num_blocks; ++block) {
jac[block] = lhs*rhs.derivative()[block];
}