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

Merge pull request #115 from atgeirr/expand-selector-options

Browse Source 
Add more options for Selector class.
This commit is contained in:
Bård Skaflestad
2014-04-02 13:14:33 +02:00
parent c89e9ed53d 6c4114ea69
commit 1f8276b3d4
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
opm/autodiff/AutoDiffHelpers.hpp
View File

@@ -292,7 +292,10 @@ spdiag(const AutoDiffBlock<double>::V& d)
public: public:
typedef AutoDiffBlock<Scalar> ADB; typedef AutoDiffBlock<Scalar> ADB;
Selector(const typename ADB::V& selection_basis) enum CriterionForLeftElement { GreaterEqualZero, GreaterZero, Zero, NotEqualZero, LessZero, LessEqualZero };
Selector(const typename ADB::V& selection_basis,
CriterionForLeftElement crit = GreaterEqualZero)
{ {
// Define selector structure. // Define selector structure.
const int n = selection_basis.size(); const int n = selection_basis.size();
@@ -300,10 +303,33 @@ spdiag(const AutoDiffBlock<double>::V& d)
left_elems_.reserve(n); left_elems_.reserve(n);
right_elems_.reserve(n); right_elems_.reserve(n);
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
if (selection_basis[i] < 0.0) { bool chooseleft = false;
right_elems_.push_back(i); switch (crit) {
} else { case GreaterEqualZero:
chooseleft = selection_basis[i] >= 0.0;
break;
case GreaterZero:
chooseleft = selection_basis[i] > 0.0;
break;
case Zero:
chooseleft = selection_basis[i] == 0.0;
break;
case NotEqualZero:
chooseleft = selection_basis[i] != 0.0;
break;
case LessZero:
chooseleft = selection_basis[i] < 0.0;
break;
case LessEqualZero:
chooseleft = selection_basis[i] <= 0.0;
break;
default:
OPM_THROW(std::logic_error, "No such criterion: " << crit);
}
if (chooseleft) {
left_elems_.push_back(i); left_elems_.push_back(i);
} else {
right_elems_.push_back(i);
} }
} }
} }