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

GasLiftStage2: drop type alias GLiftWellState

Browse Source
This commit is contained in:
Arne Morten Kvarving
2021-05-23 13:45:06 +02:00
parent b8ccdaa106
commit da41f27e8f
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,6 @@ namespace Opm
using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using BlackoilWellModel = ::Opm::BlackoilWellModel<TypeTag>;
using GasLiftSingleWell = ::Opm::GasLiftSingleWell<TypeTag>;
using GLiftWellState = GasLiftWellState;
using GLiftOptWells = typename BlackoilWellModel::GLiftOptWells;
using GLiftProdWells = typename BlackoilWellModel::GLiftProdWells;
using GLiftWellStateMap = typename BlackoilWellModel::GLiftWellStateMap;
@@ -93,7 +92,7 @@ namespace Opm
GradMap &grad_map, const std::string well_name, bool add);
std::optional<GradInfo> calcIncOrDecGrad_(
const std::string name, const GasLiftSingleWell &gs_well, bool increase);
bool checkRateAlreadyLimited_(GLiftWellState &state, bool increase);
bool checkRateAlreadyLimited_(GasLiftWellState &state, bool increase);
GradInfo deleteDecGradItem_(const std::string &name);
GradInfo deleteIncGradItem_(const std::string &name);
GradInfo deleteGrad_(const std::string &name, bool increase);

10
opm/simulators/wells/GasLiftStage2_impl.hpp
View File

@@ -108,7 +108,7 @@ addOrRemoveALQincrement_(GradMap &grad_map, const std::string well_name, bool ad
if (it == this->well_state_map_.end())
return;
GLiftWellState &state = *(it->second.get());
GasLiftWellState &state = *(it->second.get());
const GradInfo &gi = grad_map.at(well_name);
if (this->debug_) {
auto new_alq = gi.alq;
@@ -135,7 +135,7 @@ calcIncOrDecGrad_(
if(this->well_state_map_.count(well_name) == 0)
return std::nullopt;
GLiftWellState &state = *(this->well_state_map_.at(well_name).get());
GasLiftWellState &state = *(this->well_state_map_.at(well_name).get());
if (checkRateAlreadyLimited_(state, increase)) {
/*
const std::string msg = fmt::format(
@@ -167,7 +167,7 @@ calcIncOrDecGrad_(
template<typename TypeTag>
bool
GasLiftStage2<TypeTag>::
checkRateAlreadyLimited_(GLiftWellState &state, bool increase)
checkRateAlreadyLimited_(GasLiftWellState &state, bool increase)
{
auto current_increase = state.increase();
bool do_check = false;
@@ -354,7 +354,7 @@ getCurrentWellRates_(const std::string &well_name, const std::string &group_name
GasLiftSingleWell &gs_well = *(this->stage1_wells_.at(well_name).get());
const WellInterface<TypeTag> &well = gs_well.getStdWell();
well_ptr = &well;
GLiftWellState &state = *(this->well_state_map_.at(well_name).get());
GasLiftWellState &state = *(this->well_state_map_.at(well_name).get());
std::tie(oil_rate, gas_rate) = state.getRates();
success = true;
if ( this->debug_) debug_info = "(A)";
@@ -1135,7 +1135,7 @@ updateRates(const std::string &well_name)
// compute the delta on wells on own rank
if (this->parent.well_state_map_.count(well_name) > 0) {
const GradInfo &gi = this->parent.dec_grads_.at(well_name);
GLiftWellState &state = *(this->parent.well_state_map_.at(well_name).get());
GasLiftWellState &state = *(this->parent.well_state_map_.at(well_name).get());
GasLiftSingleWell &gs_well = *(this->parent.stage1_wells_.at(well_name).get());
const WellInterface<TypeTag> &well = gs_well.getStdWell();
// only get deltas for wells owned by this rank