mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#1561 Replacing old combine function for RigCompletionData with new combineEclipseCellCompletions which can calculate WPImult. Assumes completions to always have calculated transmissibility.
This commit is contained in:
@@ -22,6 +22,8 @@
|
||||
|
||||
#include <QString>
|
||||
#include <cmath> // Needed for HUGE_VAL on Linux
|
||||
#include "CompletionCommands\RicExportCompletionDataSettingsUi.h"
|
||||
#include "CompletionCommands\RicWellPathExportCompletionDataFeature.h"
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
@@ -37,7 +39,10 @@ RigCompletionData::RigCompletionData(const QString wellName, const IJKCellIndex&
|
||||
m_dFactor(HUGE_VAL),
|
||||
m_direction(DIR_UNDEF),
|
||||
m_connectionState(OPEN),
|
||||
m_count(1)
|
||||
m_count(1),
|
||||
m_wpimult(1),
|
||||
m_isMainBore(false),
|
||||
m_readyForExport(false)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -86,6 +91,7 @@ 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;
|
||||
}
|
||||
|
||||
@@ -157,6 +163,33 @@ void RigCompletionData::setFromPerforation(double diameter, CellDirection direct
|
||||
m_direction = direction;
|
||||
}
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
void RigCompletionData::setCombinedValuesExplicitTrans(double transmissibility,
|
||||
CompletionType completionType)
|
||||
{
|
||||
m_completionType = completionType;
|
||||
m_transmissibility = transmissibility;
|
||||
m_readyForExport = true;
|
||||
}
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
void RigCompletionData::setCombinedValuesImplicitTransWPImult(double wpimult,
|
||||
CellDirection celldirection,
|
||||
double skinFactor,
|
||||
double wellDiameter,
|
||||
CompletionType completionType)
|
||||
{
|
||||
m_wpimult = wpimult;
|
||||
m_completionType = completionType;
|
||||
m_skinFactor = skinFactor;
|
||||
m_diameter = wellDiameter;
|
||||
m_readyForExport = true;
|
||||
}
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
|
||||
Reference in New Issue
Block a user