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

Made ReservoirFailure and WellFailure into classes.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2018-10-25 13:08:16 +02:00
parent 852765a65b
commit 671ed75535
3 changed files with 68 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
opm/simulators/timestepping/ConvergenceReport.hpp
View File

@@ -45,21 +45,41 @@ namespace Opm
Normal = 1,
TooLarge = 2,
NotANumber = 3 };
struct ReservoirFailure
class ReservoirFailure
{
public:
enum struct Type { Invalid, MassBalance, Cnv };
Type type;
Severity severity;
int phase;
int cell_index;
ReservoirFailure(Type t, Severity s, int phase, int cell_index)
: type_(t), severity_(s), phase_(phase), cell_index_(cell_index)
{
}
Type type() const { return type_; }
Severity severity() const { return severity_; }
int phase() const { return phase_; }
int cellIndex() const { return cell_index_; }
private:
Type type_;
Severity severity_;
int phase_;
int cell_index_;
};
struct WellFailure
class WellFailure
{
public:
enum struct Type { Invalid, MassBalance, Pressure, ControlBHP, ControlTHP, ControlRate };
Type type;
Severity severity;
int phase;
std::string well_name;
WellFailure(Type t, Severity s, int phase, const std::string& well_name)
: type_(t), severity_(s), phase_(phase), well_name_(well_name)
{
}
Type type() const { return type_; }
Severity severity() const { return severity_; }
int phase() const { return phase_; }
const std::string& wellName() const { return well_name_; }
private:
Type type_;
Severity severity_;
int phase_;
std::string well_name_;
};
// ----------- Mutating member functions -----------
@@ -135,10 +155,10 @@ namespace Opm
};
auto s = Severity::None;
for (const auto f : res_failures_) {
s = smax(s, f.severity);
s = smax(s, f.severity());
}
for (const auto f : well_failures_) {
s = smax(s, f.severity);
s = smax(s, f.severity());
}
return s;
}