OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 01:31:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3176 from totto82/refactorPrepareTimeStep

Browse Source 
move solveWellEquation inside prepareTimeStep
This commit is contained in:
Tor Harald Sandve 2021-05-10 16:35:16 +02:00 committed by GitHub
commit 55dfc84067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1056,13 +1056,6 @@ namespace Opm {
// Set the well primary variables based on the value of well solutions // Set the well primary variables based on the value of well solutions
initPrimaryVariablesEvaluation(); initPrimaryVariablesEvaluation();
if (param_.solve_welleq_initially_ && iterationIdx == 0) {
for (auto& well : well_container_) {
well->solveWellEquation(ebosSimulator_, this->wellState(), this->groupState(), local_deferredLogger);
}
updateWellControls(local_deferredLogger, /* check group controls */ false);
}
maybeDoGasLiftOptimize(local_deferredLogger); maybeDoGasLiftOptimize(local_deferredLogger);
assembleWellEq(dt, local_deferredLogger); assembleWellEq(dt, local_deferredLogger);
} catch (const std::runtime_error& e) { } catch (const std::runtime_error& e) {
@ -1682,10 +1675,7 @@ namespace Opm {
try { try {
for (const auto& well : well_container_) { for (const auto& well : well_container_) {
well->checkWellOperability(ebosSimulator_, this->wellState(), deferred_logger); well->checkWellOperability(ebosSimulator_, this->wellState(), deferred_logger);
}
// since the controls are all updated, we should update well_state accordingly
for (const auto& well : well_container_) {
const int w = well->indexOfWell();
if (!well->isOperable() ) continue; if (!well->isOperable() ) continue;
auto& events = this->wellState().events(); auto& events = this->wellState().events();
@ -1695,7 +1685,13 @@ namespace Opm {
// so next time step, the well does not consider to have effective events anymore. // so next time step, the well does not consider to have effective events anymore.
events.clearEvent(well->name(), WellStateFullyImplicitBlackoil::event_mask); events.clearEvent(well->name(), WellStateFullyImplicitBlackoil::event_mask);
} }
}
// solve the well equation initially to improve the initial solution of the well model
if (param_.solve_welleq_initially_) {
well->solveWellEquation(ebosSimulator_, this->wellState(), this->groupState(), deferred_logger);
}
} // end of for (const auto& well : well_container_)
updatePrimaryVariables(deferred_logger); updatePrimaryVariables(deferred_logger);
} catch (const std::runtime_error& e) { } catch (const std::runtime_error& e) {
exc_type = ExceptionType::RUNTIME_ERROR; exc_type = ExceptionType::RUNTIME_ERROR;