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

fixing errors resulting from the rebasing procedure.

Browse Source
This commit is contained in:
Kai Bao 2017-04-07 15:25:42 +02:00
parent 7a4d0bb8aa
commit 72e2b7c6c3
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
opm/autodiff/StandardWellsDense_impl.hpp
View File

@ -1786,10 +1786,10 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices, typename ElementContext> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext, typename MaterialLaw>
template<typename Simulator> template<typename Simulator>
void void
StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext, MaterialLaw>::
prepareTimeStep(const Simulator& ebos_simulator, prepareTimeStep(const Simulator& ebos_simulator,
WellState& well_state) WellState& well_state)
{ {
@ -1881,7 +1881,7 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices, typename ElementContext> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext, typename MaterialLaw>
WellCollection* WellCollection*
StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext, MaterialLaw>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext, MaterialLaw>::
wellCollection() const wellCollection() const
@ -2659,9 +2659,9 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices, typename ElementContext> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext, typename MaterialLaw>
bool bool
StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext, MaterialLaw>::
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];
@ -2679,10 +2679,10 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices, typename ElementContext> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext, typename MaterialLaw>
template <typename Simulator> template <typename Simulator>
void void
StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext, MaterialLaw>::
computeWellRatesWithBhp(const Simulator& ebosSimulator, computeWellRatesWithBhp(const Simulator& ebosSimulator,
const EvalWell& bhp, const EvalWell& bhp,
const int well_index, const int well_index,
@ -2697,7 +2697,9 @@ namespace Opm {
const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_index, /*timeIdx=*/ 0)); const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_index, /*timeIdx=*/ 0));
// flux for each perforation // flux for each perforation
std::vector<EvalWell> cq_s(np, 0.0); std::vector<EvalWell> cq_s(np, 0.0);
computeWellFlux(well_index, wells().WI[perf], intQuants, bhp, std::vector<EvalWell> mob(np, 0.0);
getMobility(ebosSimulator, perf, cell_index, mob);
computeWellFlux(well_index, wells().WI[perf], intQuants.fluidState(), mob, bhp,
wellPerforationPressureDiffs()[perf], allow_cf, cq_s); wellPerforationPressureDiffs()[perf], allow_cf, cq_s);
for(int p = 0; p < np; ++p) { for(int p = 0; p < np; ++p) {
@ -2711,9 +2713,9 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices, typename ElementContext> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext, typename MaterialLaw>
double double
StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext, MaterialLaw>::
mostStrictBhpFromBhpLimits(const int well_index) const mostStrictBhpFromBhpLimits(const int well_index) const
{ {
double bhp; double bhp;
@ -2767,10 +2769,10 @@ namespace Opm {
template<typename FluidSystem, typename BlackoilIndices, typename ElementContext> template<typename FluidSystem, typename BlackoilIndices, typename ElementContext, typename MaterialLaw>
template <typename Simulator> template <typename Simulator>
std::vector<double> std::vector<double>
StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext>:: StandardWellsDense<FluidSystem, BlackoilIndices, ElementContext, MaterialLaw>::
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