OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Post review update

Browse Source
This commit is contained in:
Vegard Kippe
2023-10-16 10:04:20 +02:00
parent 1594680f35
commit 078a987124
8 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opm/input/eclipse/Schedule/MSW/Segment.hpp
View File

@@ -123,7 +123,6 @@ namespace Opm {
const SICD& spiralICD() const;
const AutoICD& autoICD() const;
const Valve& valve() const;
Valve& valve();
void updatePerfLength(double perf_length);
void updateSpiralICD(const SICD& spiral_icd);

4
opm/input/eclipse/Schedule/MSW/Valve.hpp
View File

@@ -74,7 +74,7 @@ namespace Opm {
// parameters for constriction pressure loss
double conFlowCoefficient() const;
double conCrossArea(const std::optional<const ValveUDAEval>& uda_eval = std::nullopt);
double conCrossArea(const std::optional<const ValveUDAEval>& uda_eval = std::nullopt) const;
inline double conCrossAreaValue() const { return m_con_cross_area_value; }
double conMaxCrossArea() const;
double pipeDiameter() const;
@@ -114,7 +114,7 @@ namespace Opm {
private:
double m_con_flow_coeff;
UDAValue m_con_cross_area;
double m_con_cross_area_value;
mutable double m_con_cross_area_value;
double m_con_max_cross_area;
double m_pipe_additional_length;

1
opm/input/eclipse/Schedule/MSW/WellSegments.hpp
View File

@@ -93,7 +93,6 @@ namespace Opm {
const Segment& getFromSegmentNumber(const int segment_number) const;
const Segment& operator[](size_t idx) const;
Segment& operator[](size_t idx);
void orderSegments();
void updatePerfLength(const WellConnections& connections);

1
opm/input/eclipse/Schedule/Well/Well.hpp
View File

@@ -397,7 +397,6 @@ public:
const std::vector<const Connection *> getConnections(int completion) const;
const WellConnections& getConnections() const;
const WellSegments& getSegments() const;
WellSegments& getSegments();
int maxSegmentID() const;
int maxBranchID() const;

4
src/opm/input/eclipse/Schedule/MSW/Segment.cpp
View File

@@ -374,10 +374,6 @@ namespace Opm {
return std::get<Valve>(this->m_icd);
}
Valve& Segment::valve() {
return std::get<Valve>(this->m_icd);
}
int Segment::ecl_type_id() const {
switch (this->segmentType()) {
case SegmentType::REGULAR:

6
src/opm/input/eclipse/Schedule/MSW/Valve.cpp
View File

@@ -39,8 +39,8 @@ namespace Opm {
const std::string& string_var = value.get<std::string>();
double output_value = udq_default;
if (summary_state.has_segment_var(well_name, string_var, segment_number+1))
output_value = summary_state.get_segment_var(well_name, string_var, segment_number+1);
if (summary_state.has_segment_var(well_name, string_var, segment_number))
output_value = summary_state.get_segment_var(well_name, string_var, segment_number);
else if (summary_state.has(string_var))
output_value = summary_state.get(string_var);
@@ -162,7 +162,7 @@ namespace Opm {
return m_con_flow_coeff;
}
double Valve::conCrossArea(const std::optional<const ValveUDAEval>& uda_eval_optional) {
double Valve::conCrossArea(const std::optional<const ValveUDAEval>& uda_eval_optional) const {
m_con_cross_area_value = uda_eval_optional.has_value() ?
uda_eval_optional.value().value(m_con_cross_area, m_udq_default) :
m_con_cross_area.getSI();

4
src/opm/input/eclipse/Schedule/MSW/WellSegments.cpp
View File

@@ -137,10 +137,6 @@ namespace Opm {
return m_segments[idx];
}
Segment& WellSegments::operator[](size_t idx) {
return m_segments[idx];
}
int WellSegments::segmentNumberToIndex(const int segment_number) const {
const auto it = segment_number_to_index.find(segment_number);
if (it != segment_number_to_index.end()) {

8
src/opm/input/eclipse/Schedule/Well/Well.cpp
View File

@@ -1144,14 +1144,6 @@ const WellSegments& Well::getSegments() const {
throw std::logic_error("Asked for segment information in not MSW well: " + this->name());
}
WellSegments& Well::getSegments() {
if (this->segments)
return *this->segments;
else
throw std::logic_error("Asked for segment information in not MSW well: " + this->name());
}
int Well::maxSegmentID() const
{
return (this->segments == nullptr)