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 #3083 from totto82/fixMPIThrow

Browse Source 
Fix MPI issues in the well model
This commit is contained in:
Bård Skaflestad 2021-03-02 12:04:39 +01:00 committed by GitHub
commit d78f5dc259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -326,9 +326,9 @@ namespace Opm {
well_state_ = previous_well_state_; well_state_ = previous_well_state_;
well_state_.disableGliftOptimization(); well_state_.disableGliftOptimization();
updateAndCommunicateGroupData();
const int reportStepIdx = ebosSimulator_.episodeIndex(); const int reportStepIdx = ebosSimulator_.episodeIndex();
const double simulationTime = ebosSimulator_.time(); const double simulationTime = ebosSimulator_.time();
int exception_thrown = 0; int exception_thrown = 0;
try { try {
// test wells // test wells
@ -403,7 +403,6 @@ namespace Opm {
const auto& comm = ebosSimulator_.vanguard().grid().comm(); const auto& comm = ebosSimulator_.vanguard().grid().comm();
WellGroupHelpers::updateGuideRatesForWells(schedule(), phase_usage_, reportStepIdx, simulationTime, well_state_, comm, guideRate_.get()); WellGroupHelpers::updateGuideRatesForWells(schedule(), phase_usage_, reportStepIdx, simulationTime, well_state_, comm, guideRate_.get());
try { try {
updateAndCommunicateGroupData();
// Compute initial well solution for new wells // Compute initial well solution for new wells
for (auto& well : well_container_) { for (auto& well : well_container_) {
const uint64_t effective_events_mask = ScheduleEvents::WELL_STATUS_CHANGE const uint64_t effective_events_mask = ScheduleEvents::WELL_STATUS_CHANGE

3
opm/simulators/wells/MultisegmentWell.hpp
View File

@ -465,7 +465,8 @@ namespace Opm
EvalWell getSegmentSurfaceVolume(const Simulator& ebos_simulator, const int seg_idx) const; EvalWell getSegmentSurfaceVolume(const Simulator& ebos_simulator, const int seg_idx) const;
std::vector<Scalar> getWellResiduals(const std::vector<Scalar>& B_avg) const; std::vector<Scalar> getWellResiduals(const std::vector<Scalar>& B_avg,
DeferredLogger& deferred_logger) const;
void detectOscillations(const std::vector<double>& measure_history, void detectOscillations(const std::vector<double>& measure_history,
const int it, bool& oscillate, bool& stagnate) const; const int it, bool& oscillate, bool& stagnate) const;

13
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -2720,7 +2720,7 @@ namespace Opm
const int max_iter_number = param_.max_inner_iter_ms_wells_; const int max_iter_number = param_.max_inner_iter_ms_wells_;
const WellState well_state0 = well_state; const WellState well_state0 = well_state;
const std::vector<Scalar> residuals0 = getWellResiduals(B_avg); const std::vector<Scalar> residuals0 = getWellResiduals(B_avg, deferred_logger);
std::vector<std::vector<Scalar> > residual_history; std::vector<std::vector<Scalar> > residual_history;
std::vector<double> measure_history; std::vector<double> measure_history;
int it = 0; int it = 0;
@ -2745,7 +2745,7 @@ namespace Opm
break; break;
} }
residual_history.push_back(getWellResiduals(B_avg)); residual_history.push_back(getWellResiduals(B_avg, deferred_logger));
measure_history.push_back(getResidualMeasureValue(well_state, residual_history[it], deferred_logger) ); measure_history.push_back(getResidualMeasureValue(well_state, residual_history[it], deferred_logger) );
bool is_oscillate = false; bool is_oscillate = false;
@ -3222,7 +3222,8 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
std::vector<typename MultisegmentWell<TypeTag>::Scalar> std::vector<typename MultisegmentWell<TypeTag>::Scalar>
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::
getWellResiduals(const std::vector<Scalar>& B_avg) const getWellResiduals(const std::vector<Scalar>& B_avg,
DeferredLogger& deferred_logger) const
{ {
assert(int(B_avg.size() ) == num_components_); assert(int(B_avg.size() ) == num_components_);
std::vector<Scalar> residuals(numWellEq + 1, 0.0); std::vector<Scalar> residuals(numWellEq + 1, 0.0);
@ -3238,8 +3239,8 @@ namespace Opm
} }
} }
if (std::isnan(residual) || std::isinf(residual)) { if (std::isnan(residual) || std::isinf(residual)) {
OPM_THROW(Opm::NumericalIssue, "nan or inf value for residal get for well " << name() OPM_DEFLOG_THROW(Opm::NumericalIssue, "nan or inf value for residal get for well " << name()
<< " segment " << seg << " eq_idx " << eq_idx); << " segment " << seg << " eq_idx " << eq_idx, deferred_logger);
} }
if (residual > residuals[eq_idx]) { if (residual > residuals[eq_idx]) {
@ -3252,7 +3253,7 @@ namespace Opm
{ {
const double control_residual = std::abs(resWell_[0][numWellEq - 1]); const double control_residual = std::abs(resWell_[0][numWellEq - 1]);
if (std::isnan(control_residual) || std::isinf(control_residual)) { if (std::isnan(control_residual) || std::isinf(control_residual)) {
OPM_THROW(Opm::NumericalIssue, "nan or inf value for control residal get for well " << name()); OPM_DEFLOG_THROW(Opm::NumericalIssue, "nan or inf value for control residal get for well " << name(), deferred_logger);
} }
residuals[numWellEq] = control_residual; residuals[numWellEq] = control_residual;
} }