remove now unnecessary Bhp_ member in StandardWellGeneric

This commit is contained in:
Arne Morten Kvarving
2022-10-27 13:08:33 +02:00
parent 5d4c7f49a2
commit f06264152c
3 changed files with 3 additions and 9 deletions

View File

@@ -48,7 +48,7 @@ namespace Opm
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices, class Scalar>
StandardWellEval<FluidSystem,Indices,Scalar>:: StandardWellEval<FluidSystem,Indices,Scalar>::
StandardWellEval(const WellInterfaceIndices<FluidSystem,Indices,Scalar>& baseif) StandardWellEval(const WellInterfaceIndices<FluidSystem,Indices,Scalar>& baseif)
: StandardWellGeneric<Scalar>(Bhp, baseif) : StandardWellGeneric<Scalar>(baseif)
, baseif_(baseif) , baseif_(baseif)
, F0_(numWellConservationEq) , F0_(numWellConservationEq)
{ {

View File

@@ -47,13 +47,11 @@ namespace Opm
template<class Scalar> template<class Scalar>
StandardWellGeneric<Scalar>:: StandardWellGeneric<Scalar>::
StandardWellGeneric(int Bhp, StandardWellGeneric(const WellInterfaceGeneric& baseif)
const WellInterfaceGeneric& baseif)
: baseif_(baseif) : baseif_(baseif)
, perf_densities_(baseif_.numPerfs()) , perf_densities_(baseif_.numPerfs())
, perf_pressure_diffs_(baseif_.numPerfs()) , perf_pressure_diffs_(baseif_.numPerfs())
, parallelB_(duneB_, baseif_.parallelWellInfo()) , parallelB_(duneB_, baseif_.parallelWellInfo())
, Bhp_(Bhp)
{ {
duneB_.setBuildMode(OffDiagMatWell::row_wise); duneB_.setBuildMode(OffDiagMatWell::row_wise);
duneC_.setBuildMode(OffDiagMatWell::row_wise); duneC_.setBuildMode(OffDiagMatWell::row_wise);

View File

@@ -69,8 +69,7 @@ public:
void getNumBlocks(unsigned int& _nnzs) const; void getNumBlocks(unsigned int& _nnzs) const;
protected: protected:
StandardWellGeneric(int Bhp, StandardWellGeneric(const WellInterfaceGeneric& baseif);
const WellInterfaceGeneric& baseif);
// calculate a relaxation factor to avoid overshoot of total rates // calculate a relaxation factor to avoid overshoot of total rates
static double relaxationFactorRate(const std::vector<double>& primary_variables, static double relaxationFactorRate(const std::vector<double>& primary_variables,
@@ -122,9 +121,6 @@ protected:
mutable BVectorWell invDrw_; mutable BVectorWell invDrw_;
double getRho() const { return perf_densities_[0]; } double getRho() const { return perf_densities_[0]; }
private:
int Bhp_; // index of Bhp
}; };
} }