Merge pull request #1832 from GitPaean/upding_well_control_inner_msw

updating well control during iterateWellEquations in MSW
This commit is contained in:
Atgeirr Flø Rasmussen 2019-05-13 12:47:10 +02:00 committed by GitHub
commit 8197bcfc54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

View File

@ -1853,6 +1853,9 @@ namespace Opm
updateWellState(dx_well, well_state, deferred_logger, relaxation_factor);
// TODO: should we do something more if a switching of control happens
this->updateWellControl(ebosSimulator, well_state, deferred_logger);
initPrimaryVariablesEvaluation();
}

View File

@ -190,7 +190,7 @@ namespace Opm
WellState& well_state,
Opm::DeferredLogger& deferred_logger) const = 0;
void updateWellControl(/* const */ Simulator& ebos_simulator,
void updateWellControl(const Simulator& ebos_simulator,
WellState& well_state,
Opm::DeferredLogger& deferred_logger) /* const */;

View File

@ -430,7 +430,7 @@ namespace Opm
template<typename TypeTag>
void
WellInterface<TypeTag>::
updateWellControl(/* const */ Simulator& ebos_simulator,
updateWellControl(const Simulator& ebos_simulator,
WellState& well_state,
Opm::DeferredLogger& deferred_logger) /* const */
{