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

wbpCalcMap_: move to BlackoilWellModelGeneric

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-11-18 11:33:44 +01:00
parent 3d10b549e7
commit 7ab8d1938f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/simulators/wells/BlackoilWellModel.hpp
View File

@@ -425,14 +425,6 @@ template<class Scalar> class WellContributions;
std::unique_ptr<RateConverterType> rateConverter_{}; std::unique_ptr<RateConverterType> rateConverter_{};
std::map<std::string, std::unique_ptr<AverageRegionalPressureType>> regionalAveragePressureCalculator_{}; std::map<std::string, std::unique_ptr<AverageRegionalPressureType>> regionalAveragePressureCalculator_{};
struct WBPCalcID
{
std::optional<typename std::vector<WellInterfacePtr>::size_type> openWellIdx_{};
std::size_t wbpCalcIdx_{};
};
std::vector<WBPCalcID> wbpCalcMap_{};
SimulatorReportSingle last_report_{}; SimulatorReportSingle last_report_{};
// Pre-step network solve at static reservoir conditions (group and well states might be updated) // Pre-step network solve at static reservoir conditions (group and well states might be updated)

8
opm/simulators/wells/BlackoilWellModelGeneric.hpp
View File

@@ -581,6 +581,14 @@ protected:
std::vector<WellProdIndexCalculator<Scalar>> prod_index_calc_; std::vector<WellProdIndexCalculator<Scalar>> prod_index_calc_;
mutable ParallelWBPCalculation<Scalar> wbpCalculationService_; mutable ParallelWBPCalculation<Scalar> wbpCalculationService_;
struct WBPCalcID
{
std::optional<typename std::vector<WellInterfaceGeneric<Scalar>*>::size_type> openWellIdx_{};
std::size_t wbpCalcIdx_{};
};
std::vector<WBPCalcID> wbpCalcMap_{};
std::vector<int> pvt_region_idx_; std::vector<int> pvt_region_idx_;
mutable std::unordered_set<std::string> closed_this_step_; mutable std::unordered_set<std::string> closed_this_step_;