mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-12-28 02:00:59 -06:00
Merge pull request #3902 from GitPaean/renaming
renaming function updateWellState to updatePrimaryVariablesNewton .
This commit is contained in:
commit
4a8f3932d6
@ -383,10 +383,10 @@ processFractions(const int seg) const
|
||||
template<typename FluidSystem, typename Indices, typename Scalar>
|
||||
void
|
||||
MultisegmentWellEval<FluidSystem,Indices,Scalar>::
|
||||
updateWellState(const BVectorWell& dwells,
|
||||
const double relaxation_factor,
|
||||
const double dFLimit,
|
||||
const double max_pressure_change) const
|
||||
updatePrimaryVariablesNewton(const BVectorWell& dwells,
|
||||
const double relaxation_factor,
|
||||
const double dFLimit,
|
||||
const double max_pressure_change) const
|
||||
{
|
||||
const std::vector<std::array<double, numWellEq> > old_primary_variables = primary_variables_;
|
||||
|
||||
|
@ -173,10 +173,10 @@ protected:
|
||||
void updateUpwindingSegments();
|
||||
|
||||
// updating the well_state based on well solution dwells
|
||||
void updateWellState(const BVectorWell& dwells,
|
||||
const double relaxation_factor,
|
||||
const double DFLimit,
|
||||
const double max_pressure_change) const;
|
||||
void updatePrimaryVariablesNewton(const BVectorWell& dwells,
|
||||
const double relaxation_factor,
|
||||
const double DFLimit,
|
||||
const double max_pressure_change) const;
|
||||
|
||||
void computeSegmentFluidProperties(const EvalWell& temperature,
|
||||
const EvalWell& saltConcentration,
|
||||
|
@ -608,10 +608,10 @@ namespace Opm
|
||||
|
||||
const double dFLimit = this->param_.dwell_fraction_max_;
|
||||
const double max_pressure_change = this->param_.max_pressure_change_ms_wells_;
|
||||
this->MSWEval::updateWellState(dwells,
|
||||
relaxation_factor,
|
||||
dFLimit,
|
||||
max_pressure_change);
|
||||
this->MSWEval::updatePrimaryVariablesNewton(dwells,
|
||||
relaxation_factor,
|
||||
dFLimit,
|
||||
max_pressure_change);
|
||||
|
||||
this->updateWellStateFromPrimaryVariables(well_state, getRefDensity(), deferred_logger);
|
||||
Base::calculateReservoirRates(well_state.well(this->index_of_well_));
|
||||
|
Loading…
Reference in New Issue
Block a user