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

Avoid infinite loop with two constant operands.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-10-24 13:41:55 +02:00
parent 1eec8b16d6
commit 258d8e0e24
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/AutoDiffBlock.hpp
View File

@ -197,6 +197,9 @@ namespace Opm
/// Elementwise operator + /// Elementwise operator +
AutoDiffBlock operator+(const AutoDiffBlock& rhs) const AutoDiffBlock operator+(const AutoDiffBlock& rhs) const
{ {
if (jac_.empty() && rhs.jac_.empty()) {
return constant(val_ + rhs.val_);
}
if (jac_.empty()) { if (jac_.empty()) {
return val_ + rhs; return val_ + rhs;
} }
@ -217,6 +220,9 @@ namespace Opm
/// Elementwise operator - /// Elementwise operator -
AutoDiffBlock operator-(const AutoDiffBlock& rhs) const AutoDiffBlock operator-(const AutoDiffBlock& rhs) const
{ {
if (jac_.empty() && rhs.jac_.empty()) {
return constant(val_ - rhs.val_);
}
if (jac_.empty()) { if (jac_.empty()) {
return val_ - rhs; return val_ - rhs;
} }
@ -237,6 +243,9 @@ namespace Opm
/// Elementwise operator * /// Elementwise operator *
AutoDiffBlock operator*(const AutoDiffBlock& rhs) const AutoDiffBlock operator*(const AutoDiffBlock& rhs) const
{ {
if (jac_.empty() && rhs.jac_.empty()) {
return constant(val_ * rhs.val_);
}
if (jac_.empty()) { if (jac_.empty()) {
return val_ * rhs; return val_ * rhs;
} }
@ -260,6 +269,9 @@ namespace Opm
/// Elementwise operator / /// Elementwise operator /
AutoDiffBlock operator/(const AutoDiffBlock& rhs) const AutoDiffBlock operator/(const AutoDiffBlock& rhs) const
{ {
if (jac_.empty() && rhs.jac_.empty()) {
return constant(val_ / rhs.val_);
}
if (jac_.empty()) { if (jac_.empty()) {
return val_ / rhs; return val_ / rhs;
} }