OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-26 03:00:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5397 from GitPaean/renaming_calcRates

Browse Source 
renaming calcRates to calcResvCoeff, and calcInjRates to calcInjResvCoeff.
This commit is contained in:
Bård Skaflestad 2024-05-30 08:45:38 +02:00 committed by GitHub
commit 8b17c18ead
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -547,14 +547,14 @@ class WellContributions;
void wellTesting(const int timeStepIdx, const double simulationTime, DeferredLogger& deferred_logger);
void calcRates(const int fipnum,
const int pvtreg,
const std::vector<Scalar>& production_rates,
std::vector<Scalar>& resv_coeff) override;
void calcResvCoeff(const int fipnum,
const int pvtreg,
const std::vector<Scalar>& production_rates,
std::vector<Scalar>& resv_coeff) override;
void calcInjRates(const int fipnum,
const int pvtreg,
std::vector<Scalar>& resv_coeff) override;
void calcInjResvCoeff(const int fipnum,
const int pvtreg,
std::vector<Scalar>& resv_coeff) override;
void computeWellTemperature();

4
opm/simulators/wells/BlackoilWellModelGeneric.cpp
View File

@ -598,7 +598,7 @@ checkGroupHigherConstraints(const Group& group,
if (!isField && group.isInjectionGroup()) {
// Obtain rates for group.
std::vector<Scalar> resv_coeff_inj(phase_usage_.num_phases, 0.0);
calcInjRates(fipnum, pvtreg, resv_coeff_inj);
calcInjResvCoeff(fipnum, pvtreg, resv_coeff_inj);
for (int phasePos = 0; phasePos < phase_usage_.num_phases; ++phasePos) {
const Scalar local_current_rate = WellGroupHelpers<Scalar>::sumWellSurfaceRates(group,
@ -664,7 +664,7 @@ checkGroupHigherConstraints(const Group& group,
rates[phasePos] = -comm_.sum(local_current_rate);
}
std::vector<Scalar> resv_coeff(phase_usage_.num_phases, 0.0);
calcRates(fipnum, pvtreg, this->groupState().production_rates(group.name()), resv_coeff);
calcResvCoeff(fipnum, pvtreg, this->groupState().production_rates(group.name()), resv_coeff);
// Check higher up only if under individual (not FLD) control.
const Group::ProductionCMode& currentControl = this->groupState().production_control(group.name());
if (currentControl != Group::ProductionCMode::FLD && group.productionGroupControlAvailable()) {

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

@ -339,13 +339,13 @@ protected:
void setWsolvent(const Group& group,
const int reportStepIdx,
Scalar wsolvent);
virtual void calcRates(const int fipnum,
const int pvtreg,
const std::vector<Scalar>& production_rates,
std::vector<Scalar>& resv_coeff) = 0;
virtual void calcInjRates(const int fipnum,
const int pvtreg,
std::vector<Scalar>& resv_coeff) = 0;
virtual void calcResvCoeff(const int fipnum,
const int pvtreg,
const std::vector<Scalar>& production_rates,
std::vector<Scalar>& resv_coeff) = 0;
virtual void calcInjResvCoeff(const int fipnum,
const int pvtreg,
std::vector<Scalar>& resv_coeff) = 0;
void assignShutConnections(data::Wells& wsrpt,
const int reportStepIndex) const;

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

@ -2530,10 +2530,10 @@ namespace Opm {
template<typename TypeTag>
void
BlackoilWellModel<TypeTag>::
calcRates(const int fipnum,
const int pvtreg,
const std::vector<Scalar>& production_rates,
std::vector<Scalar>& resv_coeff)
calcResvCoeff(const int fipnum,
const int pvtreg,
const std::vector<Scalar>& production_rates,
std::vector<Scalar>& resv_coeff)
{
rateConverter_->calcCoeff(fipnum, pvtreg, production_rates, resv_coeff);
}
@ -2541,9 +2541,9 @@ namespace Opm {
template<typename TypeTag>
void
BlackoilWellModel<TypeTag>::
calcInjRates(const int fipnum,
const int pvtreg,
std::vector<Scalar>& resv_coeff)
calcInjResvCoeff(const int fipnum,
const int pvtreg,
std::vector<Scalar>& resv_coeff)
{
rateConverter_->calcInjCoeff(fipnum, pvtreg, resv_coeff);
}

4
tests/test_RestartSerialization.cpp
View File

@ -321,10 +321,10 @@ public:
closed_offending_wells_ = {{"test4", {"test5", "test6"}}};
}
void calcRates(const int, const int, const std::vector<double>&, std::vector<double>&) override
void calcResvCoeff(const int, const int, const std::vector<double>&, std::vector<double>&) override
{}
void calcInjRates(const int, const int, std::vector<double>&) override
void calcInjResvCoeff(const int, const int, std::vector<double>&) override
{}
void computePotentials(const std::size_t,