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

#1561 Setting wpimult in RigCompletionData to double, setting celldirection in completionData for implicit trans and wpi mult calculation

Browse Source
This commit is contained in:
astridkbjorke 2017-06-20 12:43:24 +02:00
parent ade665e5b4
commit 5bcc226aba
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@ -206,7 +206,6 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
for (auto& data : completionsPerEclipseCell)
{
//completions.push_back(RigCompletionData::combine(data.second));
completions.push_back(combineEclipseCellCompletions(data.second, exportSettings));
}

4
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;
}
@ -186,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;

3
ApplicationCode/ReservoirDataModel/RigCompletionData.h
View File

@ -142,6 +142,7 @@ 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; }
@ -164,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;