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

Bugfixes for AutoDiffMatrix.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-08-25 16:15:13 +02:00 committed by babrodtk
parent ffeaa5143d
commit c712d0070d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
opm/autodiff/AutoDiffMatrix.hpp
View File

@ -87,6 +87,8 @@ namespace Opm
AutoDiffMatrix operator+(const AutoDiffMatrix& rhs) const AutoDiffMatrix operator+(const AutoDiffMatrix& rhs) const
{ {
assert(rows_ == rhs.rows_);
assert(cols_ == rhs.cols_);
switch (type_) { switch (type_) {
case Z: case Z:
return rhs; return rhs;
@ -128,9 +130,10 @@ namespace Opm
AutoDiffMatrix operator*(const AutoDiffMatrix& rhs) const AutoDiffMatrix operator*(const AutoDiffMatrix& rhs) const
{ {
assert(cols_ == rhs.rows_);
switch (type_) { switch (type_) {
case Z: case Z:
return *this; return AutoDiffMatrix(rows_, rhs.cols_);
case I: case I:
switch (rhs.type_) { switch (rhs.type_) {
case Z: case Z:
@ -145,7 +148,7 @@ namespace Opm
case D: case D:
switch (rhs.type_) { switch (rhs.type_) {
case Z: case Z:
return rhs; return AutoDiffMatrix(rows_, rhs.cols_);
case I: case I:
return *this; return *this;
case D: case D:
@ -156,7 +159,7 @@ namespace Opm
case S: case S:
switch (rhs.type_) { switch (rhs.type_) {
case Z: case Z:
return rhs; return AutoDiffMatrix(rows_, rhs.cols_);
case I: case I:
return *this; return *this;
case D: case D:
@ -336,14 +339,14 @@ namespace Opm
static AutoDiffMatrix prodDS(const AutoDiffMatrix& lhs, const AutoDiffMatrix& rhs) static AutoDiffMatrix prodDS(const AutoDiffMatrix& lhs, const AutoDiffMatrix& rhs)
{ {
assert(lhs.type_ == S); assert(lhs.type_ == D);
assert(rhs.type_ == D); assert(rhs.type_ == S);
AutoDiffMatrix retval; AutoDiffMatrix retval;
Eigen::SparseMatrix<double> diag = spdiag(rhs.d_.diagonal()); Eigen::SparseMatrix<double> diag = spdiag(lhs.d_.diagonal());
retval.type_ = S; retval.type_ = S;
retval.rows_ = lhs.rows_; retval.rows_ = lhs.rows_;
retval.cols_ = rhs.cols_; retval.cols_ = rhs.cols_;
retval.s_ = lhs.s_ * diag; fastSparseProduct(diag, rhs.s_, retval.s_);
return retval; return retval;
} }
@ -356,7 +359,7 @@ namespace Opm
retval.type_ = S; retval.type_ = S;
retval.rows_ = lhs.rows_; retval.rows_ = lhs.rows_;
retval.cols_ = rhs.cols_; retval.cols_ = rhs.cols_;
retval.s_ = diag * lhs.s_; fastSparseProduct(lhs.s_, diag, retval.s_);
return retval; return retval;
} }
@ -368,7 +371,6 @@ namespace Opm
retval.type_ = S; retval.type_ = S;
retval.rows_ = lhs.rows_; retval.rows_ = lhs.rows_;
retval.cols_ = rhs.cols_; retval.cols_ = rhs.cols_;
// retval.s_ = lhs.s_ * rhs.s_;
fastSparseProduct(lhs.s_, rhs.s_, retval.s_); fastSparseProduct(lhs.s_, rhs.s_, retval.s_);
return retval; return retval;
} }