OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-11-02 20:30:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

dont check if group has converged in solveWellEq

Browse Source
This commit is contained in:
Tor Harald Sandve authored and Atgeirr Flø Rasmussen committed 2020-04-02 13:57:38 +02:00
1 parent f30ddffdb7
commit 70b7bed057
2 files changed
+8 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/simulators/wells/BlackoilWellModel.hpp
+1 -1
View File
@@ -243,7 +243,7 @@ namespace Opm {
void applyScaleAdd(const Scalar alpha, const BVector& x, BVector& Ax) const;
// Check if well equations is converged.
ConvergenceReport getWellConvergence(const std::vector<Scalar>& B_avg) const;
ConvergenceReport getWellConvergence(const std::vector<Scalar>& B_avg, const bool checkGroupConvergence = false) const;
// return the internal well state, ignore the passed one.
// Used by the legacy code to make it compatible with the legacy well models.
opm/simulators/wells/BlackoilWellModel_impl.hpp
+7 -5
View File
@@ -1103,7 +1103,7 @@ namespace Opm {
template<typename TypeTag>
ConvergenceReport
BlackoilWellModel<TypeTag>::
getWellConvergence(const std::vector<Scalar>& B_avg) const
getWellConvergence(const std::vector<Scalar>& B_avg, bool checkGroupConvergence) const
{
Opm::DeferredLogger local_deferredLogger;
@@ -1132,10 +1132,12 @@ namespace Opm {
}
}
const int reportStepIdx = ebosSimulator_.episodeIndex();
const Group& fieldGroup = schedule().getGroup("FIELD", reportStepIdx);
bool violated = checkGroupConstraints(fieldGroup, global_deferredLogger);
report.setGroupConverged(!violated);
if (checkGroupConvergence) {
const int reportStepIdx = ebosSimulator_.episodeIndex();
const Group& fieldGroup = schedule().getGroup("FIELD", reportStepIdx);
bool violated = checkGroupConstraints(fieldGroup, global_deferredLogger);
report.setGroupConverged(!violated);
}
return report;
}