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

Merge pull request #5660 from jakobtorben/remove_unused_num_cells_argument

Browse Source 
Remove unused num_cells argument from well equations
This commit is contained in:
Atgeirr Flø Rasmussen 2024-10-11 08:25:16 +02:00 committed by GitHub
commit af93859a29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -177,8 +177,7 @@ namespace Opm {
const auto& events = this->schedule()[reportStepIdx].wellgroup_events();
for (auto& wellPtr : this->well_container_) {
const bool well_opened_this_step = this->report_step_starts_ && events.hasEvent(wellPtr->name(), effective_events_mask);
wellPtr->init(&this->phase_usage_, this->depth_, this->gravity_,
this->local_num_cells_, this->B_avg_, well_opened_this_step);
wellPtr->init(&this->phase_usage_, this->depth_, this->gravity_, this->B_avg_, well_opened_this_step);
}
}
@ -645,7 +644,7 @@ namespace Opm {
WellInterfacePtr well = createWellForWellTest(well_name, timeStepIdx, deferred_logger);
// some preparation before the well can be used
well->init(&this->phase_usage_, depth_, gravity_, local_num_cells_, B_avg_, true);
well->init(&this->phase_usage_, depth_, gravity_, B_avg_, true);
Scalar well_efficiency_factor = wellEcl.getEfficiencyFactor();
WellGroupHelpers<Scalar>::accumulateGroupEfficiencyFactor(this->schedule().getGroup(wellEcl.groupName(),
@ -2593,8 +2592,7 @@ namespace Opm {
auto wellPtr = this->template createTypedWellPointer
<StandardWell<TypeTag>>(shutWell, reportStepIdx);
wellPtr->init(&this->phase_usage_, this->depth_, this->gravity_,
this->local_num_cells_, this->B_avg_, true);
wellPtr->init(&this->phase_usage_, this->depth_, this->gravity_, this->B_avg_, true);
this->calculateProductivityIndexValues(wellPtr.get(), deferred_logger);
}

1
opm/simulators/wells/MultisegmentWell.hpp
View File

@ -81,7 +81,6 @@ namespace Opm {
void init(const PhaseUsage* phase_usage_arg,
const std::vector<Scalar>& depth_arg,
const Scalar gravity_arg,
const int num_cells,
const std::vector<Scalar>& B_avg,
const bool changed_to_open_this_step) override;

3
opm/simulators/wells/MultisegmentWellEquations.cpp
View File

@ -55,8 +55,7 @@ MultisegmentWellEquations(const MultisegmentWellGeneric<Scalar>& well)
template<class Scalar, int numWellEq, int numEq>
void MultisegmentWellEquations<Scalar,numWellEq,numEq>::
init(const int num_cells,
const int numPerfs,
init(const int numPerfs,
const std::vector<int>& cells,
const std::vector<std::vector<int>>& segment_inlets,
const std::vector<std::vector<int>>& perforations)

4
opm/simulators/wells/MultisegmentWellEquations.hpp
View File

@ -70,13 +70,11 @@ public:
MultisegmentWellEquations(const MultisegmentWellGeneric<Scalar>& well);
//! \brief Setup sparsity pattern for the matrices.
//! \param num_cells Total number of cells
//! \param numPerfs Number of perforations
//! \param cells Cell indices for perforations
//! \param segment_inlets Cell indices for segment inlets
//! \param segment_perforations Cell indices for segment perforations
void init(const int num_cells,
const int numPerfs,
void init(const int numPerfs,
const std::vector<int>& cells,
const std::vector<std::vector<int>>& segment_inlets,
const std::vector<std::vector<int>>& segment_perforations);

4
opm/simulators/wells/MultisegmentWellEval.cpp
View File

@ -67,9 +67,9 @@ MultisegmentWellEval(WellInterfaceIndices<FluidSystem,Indices>& baseif)
template<typename FluidSystem, typename Indices>
void
MultisegmentWellEval<FluidSystem,Indices>::
initMatrixAndVectors(const int num_cells)
initMatrixAndVectors()
{
linSys_.init(num_cells, baseif_.numPerfs(),
linSys_.init(baseif_.numPerfs(),
baseif_.cells(), segments_.inlets(),
segments_.perforations());
primary_variables_.resize(this->numberOfSegments());

2
opm/simulators/wells/MultisegmentWellEval.hpp
View File

@ -71,7 +71,7 @@ public:
protected:
MultisegmentWellEval(WellInterfaceIndices<FluidSystem,Indices>& baseif);
void initMatrixAndVectors(const int num_cells);
void initMatrixAndVectors();
void assembleDefaultPressureEq(const int seg,
WellState<Scalar>& well_state,

5
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -118,11 +118,10 @@ namespace Opm
init(const PhaseUsage* phase_usage_arg,
const std::vector<Scalar>& depth_arg,
const Scalar gravity_arg,
const int num_cells,
const std::vector< Scalar >& B_avg,
const bool changed_to_open_this_step)
{
Base::init(phase_usage_arg, depth_arg, gravity_arg, num_cells, B_avg, changed_to_open_this_step);
Base::init(phase_usage_arg, depth_arg, gravity_arg, B_avg, changed_to_open_this_step);
// TODO: for StandardWell, we need to update the perf depth here using depth_arg.
// for MultisegmentWell, it is much more complicated.
@ -134,7 +133,7 @@ namespace Opm
// \Note: we do not update the depth here. And it looks like for now, we only have the option to use
// specified perforation depth
this->initMatrixAndVectors(num_cells);
this->initMatrixAndVectors();
// calculate the depth difference between the perforations and the perforated grid block
for (int perf = 0; perf < this->number_of_perforations_; ++perf) {

1
opm/simulators/wells/StandardWell.hpp
View File

@ -133,7 +133,6 @@ namespace Opm
virtual void init(const PhaseUsage* phase_usage_arg,
const std::vector<Scalar>& depth_arg,
const Scalar gravity_arg,
const int num_cells,
const std::vector<Scalar>& B_avg,
const bool changed_to_open_this_step) override;

3
opm/simulators/wells/StandardWellEquations.cpp
View File

@ -52,8 +52,7 @@ StandardWellEquations(const ParallelWellInfo<Scalar>& parallel_well_info)
template<class Scalar, int numEq>
void StandardWellEquations<Scalar,numEq>::
init(const int num_cells,
const int numWellEq,
init(const int numWellEq,
const int numPerfs,
const std::vector<int>& cells)
{

4
opm/simulators/wells/StandardWellEquations.hpp
View File

@ -68,12 +68,10 @@ public:
StandardWellEquations(const ParallelWellInfo<Scalar>& parallel_well_info);
//! \brief Setup sparsity pattern for the matrices.
//! \param num_cells Total number of cells
//! \param numWellEq Number of well equations
//! \param numPerfs Number of perforations
//! \param cells Cell indices for perforations
void init(const int num_cells,
const int numWellEq,
void init(const int numWellEq,
const int numPerfs,
const std::vector<int>& cells);

3
opm/simulators/wells/StandardWellEval.cpp
View File

@ -179,7 +179,6 @@ void
StandardWellEval<FluidSystem,Indices>::
init(std::vector<Scalar>& perf_depth,
const std::vector<Scalar>& depth_arg,
const int num_cells,
const bool has_polymermw)
{
perf_depth.resize(baseif_.numPerfs(), 0.);
@ -203,7 +202,7 @@ init(std::vector<Scalar>& perf_depth,
primary_variables_.resize(numWellEq);
// setup sparsity pattern for the matrices
this->linSys_.init(num_cells, numWellEq, baseif_.numPerfs(), baseif_.cells());
this->linSys_.init(numWellEq, baseif_.numPerfs(), baseif_.cells());
}
template<class Scalar>

1
opm/simulators/wells/StandardWellEval.hpp
View File

@ -90,7 +90,6 @@ protected:
void init(std::vector<Scalar>& perf_depth,
const std::vector<Scalar>& depth_arg,
const int num_cells,
const bool has_polymermw);
void updateWellStateFromPrimaryVariables(WellState<Scalar>& well_state,

5
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -96,12 +96,11 @@ namespace Opm
init(const PhaseUsage* phase_usage_arg,
const std::vector<Scalar>& depth_arg,
const Scalar gravity_arg,
const int num_cells,
const std::vector< Scalar >& B_avg,
const bool changed_to_open_this_step)
{
Base::init(phase_usage_arg, depth_arg, gravity_arg, num_cells, B_avg, changed_to_open_this_step);
this->StdWellEval::init(this->perf_depth_, depth_arg, num_cells, Base::has_polymermw);
Base::init(phase_usage_arg, depth_arg, gravity_arg, B_avg, changed_to_open_this_step);
this->StdWellEval::init(this->perf_depth_, depth_arg, Base::has_polymermw);
}

1
opm/simulators/wells/WellInterface.hpp
View File

@ -146,7 +146,6 @@ public:
virtual void init(const PhaseUsage* phase_usage_arg,
const std::vector<Scalar>& depth_arg,
const Scalar gravity_arg,
const int num_cells,
const std::vector<Scalar>& B_avg,
const bool changed_to_open_this_step);

1
opm/simulators/wells/WellInterface_impl.hpp
View File

@ -93,7 +93,6 @@ namespace Opm
init(const PhaseUsage* phase_usage_arg,
const std::vector<Scalar>& /* depth_arg */,
const Scalar gravity_arg,
const int /* num_cells */,
const std::vector<Scalar>& B_avg,
const bool changed_to_open_this_step)
{