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

Use SegmentState for segment_number()

Browse Source
This commit is contained in:
Joakim Hove 2021-06-01 15:31:37 +02:00
parent d3e019fbce
commit 19ba223c2a
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/simulators/wells/WellState.cpp
View File

@ -526,10 +526,8 @@ void WellState::init(const std::vector<double>& cellPressures,
// multi-segment wells added later.
nseg_ = nw;
top_segment_index_.resize(nw);
seg_number_.resize(nw);
for (int w = 0; w < nw; ++w) {
top_segment_index_[w] = w;
seg_number_[w] = 1; // Top segment is segment #1
}
}
@ -818,7 +816,6 @@ void WellState::initWellStateMSWell(const std::vector<Well>& wells_ecl,
const int np = pu.num_phases;
top_segment_index_.clear();
seg_number_.clear();
nseg_ = 0;
// in the init function, the well rates and perforation rates have been initialized or copied from prevState
@ -833,7 +830,6 @@ void WellState::initWellStateMSWell(const std::vector<Well>& wells_ecl,
top_segment_index_.push_back(nseg_);
if ( !well_ecl.isMultiSegment() ) { // not multi-segment well
nseg_ += 1;
seg_number_.push_back(1); // Assign single segment (top) as number 1.
} else { // it is a multi-segment well
const WellSegments& segment_set = well_ecl.getSegments();
// assuming the order of the perforations in well_ecl is the same with Wells
@ -843,9 +839,6 @@ void WellState::initWellStateMSWell(const std::vector<Well>& wells_ecl,
const int well_nseg = segment_set.size();
int n_activeperf = 0;
nseg_ += well_nseg;
for (auto segID = 0*well_nseg; segID < well_nseg; ++segID) {
this->seg_number_.push_back(segment_set[segID].segmentNumber());
}
// we need to know for each segment, how many perforation it has and how many segments using it as outlet_segment
// that is why I think we should use a well model to initialize the WellState here
@ -1175,9 +1168,8 @@ int WellState::numSegments(const int well_id) const
int WellState::segmentNumber(const int well_id, const int seg_id) const
{
const auto top_offset = this->topSegmentIndex(well_id);
return this->seg_number_[top_offset + seg_id];
const auto& segments = this->segment_state[well_id];
return segments.segment_number[seg_id];
}
void WellState::updateWellsDefaultALQ( const std::vector<Well>& wells_ecl )

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

@ -491,14 +491,6 @@ private:
// Well potentials
std::vector<double> well_potentials_;
/// Map segment index to segment number, mostly for MS wells.
///
/// Segment number (one-based) of j-th segment in i-th well is
/// \code
/// const auto top = topSegmentIndex(i);
/// const auto seg_No = seg_number_[top + j];
/// \end
std::vector<int> seg_number_;
data::Segment
reportSegmentResults(const PhaseUsage& pu,