adding the extra template type from recent merged PR

This commit is contained in:
Kai Bao 2017-04-05 10:19:34 +02:00
parent 22b2217dd3
commit 1aff98c4f4

View File

@ -1741,7 +1741,7 @@ namespace Opm {
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
// get the bhp value based on the bhp constraints // get the bhp value based on the bhp constraints
double bhp = mostStrictBhpFromBhpLimits(w); const double bhp = mostStrictBhpFromBhpLimits(w);
// does the well have a THP related constraint? // does the well have a THP related constraint?
bool is_thp_determined = wellHasTHPConstraints(w); bool is_thp_determined = wellHasTHPConstraints(w);
@ -1789,7 +1789,7 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices, typename ElementContext> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext>
template<typename Simulator> template<typename Simulator>
void void
StandardWellsDense<FluidSystem, BlackoilIndices>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>::
prepareTimeStep(const Simulator& ebos_simulator, prepareTimeStep(const Simulator& ebos_simulator,
WellState& well_state) WellState& well_state)
{ {
@ -2662,9 +2662,9 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext>
bool bool
StandardWellsDense<FluidSystem, BlackoilIndices>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>::
wellHasTHPConstraints(const int well_index) const wellHasTHPConstraints(const int well_index) const
{ {
const WellType& well_type = wells().type[well_index]; const WellType& well_type = wells().type[well_index];
@ -2682,10 +2682,10 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext>
template <typename Simulator> template <typename Simulator>
void void
StandardWellsDense<FluidSystem, BlackoilIndices>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>::
computeWellRatesWithBhp(const Simulator& ebosSimulator, computeWellRatesWithBhp(const Simulator& ebosSimulator,
const EvalWell& bhp, const EvalWell& bhp,
const int well_index, const int well_index,
@ -2714,9 +2714,9 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext>
double double
StandardWellsDense<FluidSystem, BlackoilIndices>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>::
mostStrictBhpFromBhpLimits(const int well_index) const mostStrictBhpFromBhpLimits(const int well_index) const
{ {
double bhp; double bhp;
@ -2770,10 +2770,10 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext>
template <typename Simulator> template <typename Simulator>
std::vector<double> std::vector<double>
StandardWellsDense<FluidSystem, BlackoilIndices>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>::
computeWellPotentialWithTHP(const Simulator& ebosSimulator, computeWellPotentialWithTHP(const Simulator& ebosSimulator,
const int well_index, const int well_index,
const double initial_bhp, // bhp from BHP constraints const double initial_bhp, // bhp from BHP constraints