OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into pre-proto

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-06-21 16:38:57 +02:00
parent 17593fba92 53ee396c03
commit 8f06115730
12 changed files with 142 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ReservoirDataModel/RigCompletionData.cpp
View File

@@ -39,7 +39,7 @@ RigCompletionData::RigCompletionData(const QString wellName, const IJKCellIndex&
m_direction(DIR_UNDEF),
m_connectionState(OPEN),
m_count(1),
m_wpimult(1),
m_wpimult(HUGE_VAL),
m_isMainBore(false),
m_readyForExport(false)
{
@@ -90,7 +90,6 @@ RigCompletionData RigCompletionData::combine(const std::vector<RigCompletionData
result.m_metadata.reserve(result.m_metadata.size() + it->m_metadata.size());
result.m_metadata.insert(result.m_metadata.end(), it->m_metadata.begin(), it->m_metadata.end());
//TODO: remove?
result.m_count += it->m_count;
}
@@ -138,13 +137,15 @@ void RigCompletionData::setFromFracture(double transmissibility, double skinFact
void RigCompletionData::setTransAndWPImultBackgroundDataFromFishbone(double transmissibility,
double skinFactor,
double diameter,
CellDirection direction)
CellDirection direction,
bool isMainBore)
{
m_completionType = FISHBONES;
m_transmissibility = transmissibility;
m_skinFactor = skinFactor;
m_diameter = diameter;
m_direction = direction;
m_isMainBore = isMainBore;
}
//==================================================================================================
@@ -184,6 +185,7 @@ void RigCompletionData::setCombinedValuesImplicitTransWPImult(double wpimult,
CompletionType completionType)
{
m_wpimult = wpimult;
m_direction = celldirection;
m_completionType = completionType;
m_skinFactor = skinFactor;
m_diameter = wellDiameter;
@@ -250,6 +252,9 @@ void RigCompletionData::copy(RigCompletionData& target, const RigCompletionData&
target.m_skinFactor = from.m_skinFactor;
target.m_dFactor = from.m_dFactor;
target.m_direction = from.m_direction;
target.m_isMainBore = from.m_isMainBore;
target.m_readyForExport = from.m_readyForExport;
target.m_count = from.m_count;
target.m_wpimult = from.m_wpimult;
target.m_completionType = from.m_completionType;
}

9
ApplicationCode/ReservoirDataModel/RigCompletionData.h
View File

@@ -111,7 +111,9 @@ public:
void setTransAndWPImultBackgroundDataFromFishbone(double transmissibility,
double skinFactor,
double diameter,
CellDirection direction);
CellDirection direction,
bool isMainBore);
void setTransAndWPImultBackgroundDataFromPerforation(double transmissibility,
double skinFactor,
double diameter,
@@ -140,13 +142,14 @@ public:
double dFactor() const { return m_dFactor; }
CellDirection direction() const { return m_direction; }
size_t count() const { return m_count; }
double wpimult() const { return m_wpimult; }
CompletionType completionType() const { return m_completionType; }
bool isMainBore() const { return m_isMainBore; }
bool readyForExport() const { return m_readyForExport; }
std::vector<RigCompletionMetaData> m_metadata;
private:
std::vector<RigCompletionMetaData> m_metadata;
QString m_wellName;
IJKCellIndex m_cellIndex;
WellConnectionState m_connectionState;
@@ -162,7 +165,7 @@ private:
bool m_readyForExport;
size_t m_count; //TODO: Remove, usage replaced by WPImult
size_t m_wpimult;
double m_wpimult;
CompletionType m_completionType;

1
ApplicationCode/ReservoirDataModel/RigWellPath.cpp
View File

@@ -197,6 +197,7 @@ std::vector<cvf::Vec3d> RigWellPath::clippedPointSubset(double startMD, double e
{
std::vector<cvf::Vec3d> points;
if (m_measuredDepths.empty()) return points;
if (startMD > endMD) return points;
size_t i = 0;
// Skip points below startMD