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

introducing setDepthAndLength() for Segment

Browse Source 
and removing setDepth(), setLength() and setDataReady().
This commit is contained in:
Kai Bao
2015-11-06 15:03:09 +01:00
parent 3492794974
commit 533de71d64
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/parser/eclipse/EclipseState/Schedule/Segment.cpp
View File

@@ -96,22 +96,16 @@ namespace Opm {
return m_data_ready;
}
void Segment::setLength(const double length_in) {
void Segment::setDepthAndLength(const double depth_in, const double length_in) {
m_length = length_in;
}
void Segment::setDepth(const double depth_in) {
m_depth = depth_in;
m_data_ready = true;
}
void Segment::setVolume(const double volume_in) {
m_volume = volume_in;
}
void Segment::setDataReady(const bool data_ready_in) {
m_data_ready = data_ready_in;
}
double Segment::invalidValue() {
return invalid_value;
}

4
opm/parser/eclipse/EclipseState/Schedule/Segment.hpp
View File

@@ -47,10 +47,8 @@ namespace Opm {
double volume() const;
bool dataReady() const;
void setLength(const double length_in);
void setDepth(const double depth_in);
void setVolume(const double volume_in);
void setDataReady(const bool data_ready_in);
void setDepthAndLength(const double depth_in, const double length_in);
static double invalidValue();

12
opm/parser/eclipse/EclipseState/Schedule/SegmentSet.cpp
View File

@@ -251,9 +251,7 @@ namespace Opm {
const double temp_length = length_outlet + (k - range_begin + 1) * length_inc;
const double temp_depth = depth_outlet + (k - range_end + 1) * depth_inc;
if (k != range_end) {
new_segment->setDepth(temp_depth);
new_segment->setLength(temp_length);
new_segment->setDataReady(true);
new_segment->setDepthAndLength(temp_depth, temp_length);
}
if (new_segment->volume() < 0.5 * invalid_value) {
@@ -285,9 +283,7 @@ namespace Opm {
// update the information inside the SegmentSet to be in ABS way
if (first_time) {
SegmentPtr new_top_segment = std::make_shared<Segment>((*this)[0]);
new_top_segment->setLength(lengthTopSegment());
new_top_segment->setDepth(depthTopSegment());
new_top_segment->setDataReady(true);
new_top_segment->setDepthAndLength(depthTopSegment(), lengthTopSegment());
this->addSegment(new_top_segment);
}
@@ -311,9 +307,7 @@ namespace Opm {
// applying the calculated length and depth to the current segment
SegmentPtr new_segment = std::make_shared<Segment>(m_segments[i_loc]);
new_segment->setDepth(temp_depth);
new_segment->setLength(temp_length);
new_segment->setDataReady(true);
new_segment->setDepthAndLength(temp_depth, temp_length);
addSegment(new_segment);
}
}