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

PR review changes

Browse Source
This commit is contained in:
jakobtorben
2024-10-03 18:05:06 +02:00
parent ff20c1f809
commit b830208573
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/flow/BlackoilModel.hpp
View File

@@ -1154,12 +1154,10 @@ namespace Opm {
total_penaltyCard_ += report.getPenaltyCard(); total_penaltyCard_ += report.getPenaltyCard();
if (param_.convergence_monitoring_ && (total_penaltyCard_.total() > param_.convergence_monitoring_cutoff_)) { if (param_.convergence_monitoring_ && (total_penaltyCard_.total() > param_.convergence_monitoring_cutoff_)) {
report.setReservoirFailed({ConvergenceReport::ReservoirFailure::Type::ConvergenceMonitorFailure, report.setReservoirFailed({ConvergenceReport::ReservoirFailure::Type::ConvergenceMonitorFailure,
ConvergenceReport::Severity::ConvergenceMonitorFailure, ConvergenceReport::Severity::ConvergenceMonitorFailure,
-1}); // -1 indicates it's not specific to any component -1}); // -1 indicates it's not specific to any component
} }
} }

2
opm/simulators/timestepping/AdaptiveTimeStepping.hpp
View File

@@ -248,8 +248,8 @@ void registerAdaptiveParameters();
// since linearIterations is < 0 this will restart the solver // since linearIterations is < 0 this will restart the solver
} }
catch (const ConvergenceMonitorFailure& e) { catch (const ConvergenceMonitorFailure& e) {
causeOfFailure = "Convergence monitor failure";
substepReport = solver.failureReport(); substepReport = solver.failureReport();
causeOfFailure = "Convergence monitor failure";
} }
catch (const LinearSolverProblem& e) { catch (const LinearSolverProblem& e) {
substepReport = solver.failureReport(); substepReport = solver.failureReport();

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

@@ -45,13 +45,13 @@ namespace Opm
ReservoirFailed = 1 << 0, ReservoirFailed = 1 << 0,
WellFailed = 1 << 1, WellFailed = 1 << 1,
}; };
// More severe problems should have higher numbers
enum struct Severity { enum struct Severity {
None = 0, None = 0,
Normal = 1, Normal = 1,
TooLarge = 2, ConvergenceMonitorFailure = 2,
NotANumber = 3, TooLarge = 3,
ConvergenceMonitorFailure = 4, NotANumber = 4,
}; };
struct PenaltyCard { struct PenaltyCard {