diff --git a/opm/simulators/wells/WellGroupHelpers.cpp b/opm/simulators/wells/WellGroupHelpers.cpp index 053c12a66..2b36753a8 100644 --- a/opm/simulators/wells/WellGroupHelpers.cpp +++ b/opm/simulators/wells/WellGroupHelpers.cpp @@ -1549,7 +1549,6 @@ namespace WellGroupHelpers } } - template void updateGuideRates(const Group& group, const Schedule& schedule, const SummaryState& summary_state, @@ -1558,7 +1557,7 @@ namespace WellGroupHelpers const double sim_time, WellState& well_state, const GroupState& group_state, - const Comm& comm, + const Parallel::Communication& comm, GuideRate* guide_rate, std::vector& pot, Opm::DeferredLogger& deferred_logger) @@ -1569,7 +1568,6 @@ namespace WellGroupHelpers updateGuideRatesForWells(schedule, pu, report_step, sim_time, well_state, comm, guide_rate); } - template void updateGuideRateForProductionGroups(const Group& group, const Schedule& schedule, const PhaseUsage& pu, @@ -1577,7 +1575,7 @@ namespace WellGroupHelpers const double& simTime, WellState& wellState, const GroupState& group_state, - const Comm& comm, + const Parallel::Communication& comm, GuideRate* guideRate, std::vector& pot) { @@ -1648,13 +1646,12 @@ namespace WellGroupHelpers guideRate->compute(group.name(), reportStepIdx, simTime, oilPot, gasPot, waterPot); } - template void updateGuideRatesForWells(const Schedule& schedule, const PhaseUsage& pu, const int reportStepIdx, const double& simTime, const WellState& wellState, - const Comm& comm, + const Parallel::Communication& comm, GuideRate* guideRate) { for (const auto& well : schedule.getWells(reportStepIdx)) { @@ -1701,39 +1698,6 @@ namespace WellGroupHelpers const PhaseUsage&, AvgPMap&); -template -void updateGuideRateForProductionGroups(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& pot); -template -void updateGuideRatesForWells(const Schedule& schedule, - const PhaseUsage& pu, - const int reportStepIdx, - const double& simTime, - const WellState& wellState, - const Parallel::Communication& comm, - GuideRate* guideRate); -template -void updateGuideRates(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& pot, - DeferredLogger&); - } // namespace WellGroupHelpers } // namespace Opm diff --git a/opm/simulators/wells/WellGroupHelpers.hpp b/opm/simulators/wells/WellGroupHelpers.hpp index c48862db1..07f6886ca 100644 --- a/opm/simulators/wells/WellGroupHelpers.hpp +++ b/opm/simulators/wells/WellGroupHelpers.hpp @@ -23,7 +23,7 @@ #include #include - +#include #include #include @@ -90,7 +90,6 @@ namespace WellGroupHelpers GroupState& group_state, std::vector& groupTargetReduction); - template void updateGuideRates(const Group& group, const Schedule& schedule, const SummaryState& summary_state, @@ -99,12 +98,11 @@ namespace WellGroupHelpers double sim_time, WellState& well_state, const GroupState& group_state, - const Comm& comm, + const Parallel::Communication& comm, GuideRate* guide_rate, std::vector& pot, Opm::DeferredLogger& deferred_logge); - template void updateGuideRateForProductionGroups(const Group& group, const Schedule& schedule, const PhaseUsage& pu, @@ -112,17 +110,16 @@ namespace WellGroupHelpers const double& simTime, WellState& wellState, const GroupState& group_state, - const Comm& comm, + const Parallel::Communication& comm, GuideRate* guideRate, std::vector& pot); - template void updateGuideRatesForWells(const Schedule& schedule, const PhaseUsage& pu, const int reportStepIdx, const double& simTime, const WellState& wellState, - const Comm& comm, + const Parallel::Communication& comm, GuideRate* guideRate); void updateGuideRatesForInjectionGroups(const Group& group,