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

typo correction and message output adjustment for WTEST

Browse Source 
recovering the const for updateWellStateWithTarget

there is no functional change.
This commit is contained in:
Kai Bao 2018-11-23 13:11:48 +01:00
parent 680c45b8f8
commit 3dac7266b0
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilWellModel_impl.hpp
View File

@ -324,8 +324,6 @@ namespace Opm {
for (const auto& testWell : wellsForTesting) { for (const auto& testWell : wellsForTesting) {
const std::string& well_name = testWell.first; const std::string& well_name = testWell.first;
const std::string msg = std::string("well ") + well_name + std::string(" is tested");
OpmLog::info(msg);
// this is the well we will test // this is the well we will test
WellInterfacePtr well = createWellForWellTest(well_name, timeStepIdx); WellInterfacePtr well = createWellForWellTest(well_name, timeStepIdx);

4
opm/autodiff/MultisegmentWell.hpp
View File

@ -117,8 +117,8 @@ namespace Opm
WellState& well_state) override; WellState& well_state) override;
/// updating the well state based the current control mode /// updating the well state based the current control mode
virtual void updateWellStateWithTarget(/* const */ Simulator& ebos_simulator, virtual void updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state) /* const */ override; WellState& well_state) const override;
/// check whether the well equations get converged for this well /// check whether the well equations get converged for this well
virtual ConvergenceReport getWellConvergence(const std::vector<double>& B_avg) const override; virtual ConvergenceReport getWellConvergence(const std::vector<double>& B_avg) const override;

4
opm/autodiff/MultisegmentWell_impl.hpp
View File

@ -252,8 +252,8 @@ namespace Opm
template <typename TypeTag> template <typename TypeTag>
void void
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::
updateWellStateWithTarget(/* const */ Simulator& ebos_simulator, updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state) /* const */ WellState& well_state) const
{ {
// Updating well state bas on well control // Updating well state bas on well control
// Target values are used as initial conditions for BHP, THP, and SURFACE_RATE // Target values are used as initial conditions for BHP, THP, and SURFACE_RATE

4
opm/autodiff/StandardWell.hpp
View File

@ -139,8 +139,8 @@ namespace Opm
const double dt, const double dt,
WellState& well_state) override; WellState& well_state) override;
virtual void updateWellStateWithTarget(/* const */ Simulator& ebos_simulator, virtual void updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state) /* const */ override; WellState& well_state) const override;
/// check whether the well equations get converged for this well /// check whether the well equations get converged for this well
virtual ConvergenceReport getWellConvergence(const std::vector<double>& B_avg) const override; virtual ConvergenceReport getWellConvergence(const std::vector<double>& B_avg) const override;

6
opm/autodiff/StandardWell_impl.hpp
View File

@ -1088,8 +1088,8 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
void void
StandardWell<TypeTag>:: StandardWell<TypeTag>::
updateWellStateWithTarget(/* const */ Simulator& ebos_simulator, updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state) /* const */ WellState& well_state) const
{ {
// number of phases // number of phases
const int np = number_of_phases_; const int np = number_of_phases_;
@ -1337,7 +1337,7 @@ namespace Opm
// checking whether the well can operate under the THP constraints. // checking whether the well can operate under the THP constraints.
if (this->wellHasTHPConstraints()) { if (this->wellHasTHPConstraints()) {
this->operability_status_.has_thp_constaint = true; this->operability_status_.has_thp_constraint = true;
checkOperabilityUnderTHPLimitProducer(ebos_simulator); checkOperabilityUnderTHPLimitProducer(ebos_simulator);
this->operability_status_.can_produce_inject_with_current_bhp = this->operability_status_.can_produce_inject_with_current_bhp =
canProduceInjectWithCurrentBhp(ebos_simulator, well_state); canProduceInjectWithCurrentBhp(ebos_simulator, well_state);

10
opm/autodiff/WellInterface.hpp
View File

@ -172,8 +172,8 @@ namespace Opm
const WellState& well_state, const WellState& well_state,
std::vector<double>& well_potentials) = 0; std::vector<double>& well_potentials) = 0;
virtual void updateWellStateWithTarget(/* const */ Simulator& ebos_simulator, virtual void updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state) /* const */ = 0; WellState& well_state) const = 0;
void updateWellControl(/* const */ Simulator& ebos_simulator, void updateWellControl(/* const */ Simulator& ebos_simulator,
WellState& well_state, WellState& well_state,
@ -403,7 +403,7 @@ namespace Opm
return false; return false;
} else { } else {
return ( (isOperableUnderBHPLimit() || isOperableUnderTHPLimit()) && return ( (isOperableUnderBHPLimit() || isOperableUnderTHPLimit()) &&
!(has_thp_constaint && !can_produce_inject_with_current_bhp) ); !(has_thp_constraint && !can_produce_inject_with_current_bhp) );
} }
} }
@ -421,7 +421,7 @@ namespace Opm
can_obtain_bhp_with_thp_limit = true; can_obtain_bhp_with_thp_limit = true;
obey_bhp_limit_with_thp_limit = true; obey_bhp_limit_with_thp_limit = true;
can_produce_inject_with_current_bhp = true; can_produce_inject_with_current_bhp = true;
has_thp_constaint = false; has_thp_constraint = false;
} }
// whether the well can be operated under bhp limit // whether the well can be operated under bhp limit
@ -443,7 +443,7 @@ namespace Opm
// it might be updated with other criterion with investigation with more cases. // it might be updated with other criterion with investigation with more cases.
bool can_produce_inject_with_current_bhp = true; bool can_produce_inject_with_current_bhp = true;
// whether the well has a THP constraint // whether the well has a THP constraint
bool has_thp_constaint = false; bool has_thp_constraint = false;
}; };
} }

2
opm/autodiff/WellInterface_impl.hpp
View File

@ -949,6 +949,8 @@ namespace Opm
const double simulation_time, const int report_step, const bool terminal_output, const double simulation_time, const int report_step, const bool terminal_output,
const WellState& well_state, WellTestState& welltest_state) const WellState& well_state, WellTestState& welltest_state)
{ {
OpmLog::debug(" well " + name() + " is being tested for economic limits");
WellState well_state_copy = well_state; WellState well_state_copy = well_state;
updatePrimaryVariables(well_state_copy); updatePrimaryVariables(well_state_copy);