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

WellGroupHelpers: use type alias instead of template parameter for Comm

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-19 11:20:06 +01:00
parent 3087950c35
commit dc95f0534c
2 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
opm/simulators/wells/WellGroupHelpers.cpp
View File

@ -1549,7 +1549,6 @@ namespace WellGroupHelpers
} }
} }
template <class Comm>
void updateGuideRates(const Group& group, void updateGuideRates(const Group& group,
const Schedule& schedule, const Schedule& schedule,
const SummaryState& summary_state, const SummaryState& summary_state,
@ -1558,7 +1557,7 @@ namespace WellGroupHelpers
const double sim_time, const double sim_time,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Comm& comm, const Parallel::Communication& comm,
GuideRate* guide_rate, GuideRate* guide_rate,
std::vector<double>& pot, std::vector<double>& pot,
Opm::DeferredLogger& deferred_logger) Opm::DeferredLogger& deferred_logger)
@ -1569,7 +1568,6 @@ namespace WellGroupHelpers
updateGuideRatesForWells(schedule, pu, report_step, sim_time, well_state, comm, guide_rate); updateGuideRatesForWells(schedule, pu, report_step, sim_time, well_state, comm, guide_rate);
} }
template <class Comm>
void updateGuideRateForProductionGroups(const Group& group, void updateGuideRateForProductionGroups(const Group& group,
const Schedule& schedule, const Schedule& schedule,
const PhaseUsage& pu, const PhaseUsage& pu,
@ -1577,7 +1575,7 @@ namespace WellGroupHelpers
const double& simTime, const double& simTime,
WellState& wellState, WellState& wellState,
const GroupState& group_state, const GroupState& group_state,
const Comm& comm, const Parallel::Communication& comm,
GuideRate* guideRate, GuideRate* guideRate,
std::vector<double>& pot) std::vector<double>& pot)
{ {
@ -1648,13 +1646,12 @@ namespace WellGroupHelpers
guideRate->compute(group.name(), reportStepIdx, simTime, oilPot, gasPot, waterPot); guideRate->compute(group.name(), reportStepIdx, simTime, oilPot, gasPot, waterPot);
} }
template <class Comm>
void updateGuideRatesForWells(const Schedule& schedule, void updateGuideRatesForWells(const Schedule& schedule,
const PhaseUsage& pu, const PhaseUsage& pu,
const int reportStepIdx, const int reportStepIdx,
const double& simTime, const double& simTime,
const WellState& wellState, const WellState& wellState,
const Comm& comm, const Parallel::Communication& comm,
GuideRate* guideRate) GuideRate* guideRate)
{ {
for (const auto& well : schedule.getWells(reportStepIdx)) { for (const auto& well : schedule.getWells(reportStepIdx)) {
@ -1701,39 +1698,6 @@ namespace WellGroupHelpers
const PhaseUsage&, const PhaseUsage&,
AvgPMap&); AvgPMap&);
template
void updateGuideRateForProductionGroups<Parallel::Communication>(const Group& group,
const Schedule& schedule,
const PhaseUsage& pu,
const int reportStepIdx,
const double& simTime,
WellState& wellState,
const GroupState& group_state,
const Parallel::Communication& comm,
GuideRate* guideRate,
std::vector<double>& pot);
template
void updateGuideRatesForWells<Parallel::Communication>(const Schedule& schedule,
const PhaseUsage& pu,
const int reportStepIdx,
const double& simTime,
const WellState& wellState,
const Parallel::Communication& comm,
GuideRate* guideRate);
template
void updateGuideRates<Parallel::Communication>(const Group& group,
const Schedule& schedule,
const SummaryState& summary_state,
const PhaseUsage& pu,
const int report_step,
const double sim_time,
WellState& well_state,
const GroupState& group_state,
const Parallel::Communication& comm,
GuideRate* guide_rate,
std::vector<double>& pot,
DeferredLogger&);
} // namespace WellGroupHelpers } // namespace WellGroupHelpers
} // namespace Opm } // namespace Opm

11
opm/simulators/wells/WellGroupHelpers.hpp
View File

@ -23,7 +23,7 @@
#include <opm/input/eclipse/Schedule/Group/GuideRate.hpp> #include <opm/input/eclipse/Schedule/Group/GuideRate.hpp>
#include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp> #include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
#include <opm/simulators/utils/ParallelCommunication.hpp>
#include <map> #include <map>
#include <string> #include <string>
@ -90,7 +90,6 @@ namespace WellGroupHelpers
GroupState& group_state, GroupState& group_state,
std::vector<double>& groupTargetReduction); std::vector<double>& groupTargetReduction);
template <class Comm>
void updateGuideRates(const Group& group, void updateGuideRates(const Group& group,
const Schedule& schedule, const Schedule& schedule,
const SummaryState& summary_state, const SummaryState& summary_state,
@ -99,12 +98,11 @@ namespace WellGroupHelpers
double sim_time, double sim_time,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Comm& comm, const Parallel::Communication& comm,
GuideRate* guide_rate, GuideRate* guide_rate,
std::vector<double>& pot, std::vector<double>& pot,
Opm::DeferredLogger& deferred_logge); Opm::DeferredLogger& deferred_logge);
template <class Comm>
void updateGuideRateForProductionGroups(const Group& group, void updateGuideRateForProductionGroups(const Group& group,
const Schedule& schedule, const Schedule& schedule,
const PhaseUsage& pu, const PhaseUsage& pu,
@ -112,17 +110,16 @@ namespace WellGroupHelpers
const double& simTime, const double& simTime,
WellState& wellState, WellState& wellState,
const GroupState& group_state, const GroupState& group_state,
const Comm& comm, const Parallel::Communication& comm,
GuideRate* guideRate, GuideRate* guideRate,
std::vector<double>& pot); std::vector<double>& pot);
template <class Comm>
void updateGuideRatesForWells(const Schedule& schedule, void updateGuideRatesForWells(const Schedule& schedule,
const PhaseUsage& pu, const PhaseUsage& pu,
const int reportStepIdx, const int reportStepIdx,
const double& simTime, const double& simTime,
const WellState& wellState, const WellState& wellState,
const Comm& comm, const Parallel::Communication& comm,
GuideRate* guideRate); GuideRate* guideRate);
void updateGuideRatesForInjectionGroups(const Group& group, void updateGuideRatesForInjectionGroups(const Group& group,