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

Updated integration of VFP tables. Produces almost identical results to bhp control

Browse Source
This commit is contained in:
babrodtk
2015-08-06 15:11:47 +02:00
parent 16a4580219
commit 7eb94caeba
5 changed files with 91 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/autodiff/AutoDiffHelpers.hpp
View File

@@ -354,7 +354,7 @@ spdiag(const AutoDiffBlock<double>::V& d)
public:
typedef AutoDiffBlock<Scalar> ADB;
enum CriterionForLeftElement { GreaterEqualZero, GreaterZero, Zero, NotEqualZero, LessZero, LessEqualZero };
enum CriterionForLeftElement { GreaterEqualZero, GreaterZero, Zero, NotEqualZero, LessZero, LessEqualZero, NotNaN };
Selector(const typename ADB::V& selection_basis,
CriterionForLeftElement crit = GreaterEqualZero)
@@ -385,6 +385,9 @@ spdiag(const AutoDiffBlock<double>::V& d)
case LessEqualZero:
chooseleft = selection_basis[i] <= 0.0;
break;
case NotNaN:
chooseleft = !isnan(selection_basis[i]);
break;
default:
OPM_THROW(std::logic_error, "No such criterion: " << crit);
}