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

#2868 Completion Type : Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2018-05-09 10:54:01 +02:00
parent e820bd44c7
commit 4f4a12b636
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
View File

@ -87,14 +87,14 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(RimEclipse
completionTypeCellResult[intersection] = RiaDefines::WELL_PATH; completionTypeCellResult[intersection] = RiaDefines::WELL_PATH;
} }
auto conn = eclipseCase->computeAndGetVirtualPerforationTransmissibilities(); auto completions = eclipseCase->computeAndGetVirtualPerforationTransmissibilities();
if (conn) if (completions)
{ {
for (const auto& connForWell : conn->multipleCompletionsPerEclipseCell(wellPath, timeStep)) for (const auto& completionsForWell : completions->multipleCompletionsPerEclipseCell(wellPath, timeStep))
{ {
RiaDefines::CompletionType appCompletionType = RiaDefines::WELL_PATH; RiaDefines::CompletionType appCompletionType = RiaDefines::WELL_PATH;
auto appCompletionTypes = fromCompletionData(connForWell.second); auto appCompletionTypes = fromCompletionData(completionsForWell.second);
if (std::find(appCompletionTypes.begin(), appCompletionTypes.end(), RiaDefines::FISHBONES) != if (std::find(appCompletionTypes.begin(), appCompletionTypes.end(), RiaDefines::FISHBONES) !=
appCompletionTypes.end()) appCompletionTypes.end())
@ -113,7 +113,7 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(RimEclipse
appCompletionType = RiaDefines::PERFORATION_INTERVAL; appCompletionType = RiaDefines::PERFORATION_INTERVAL;
} }
completionTypeCellResult[connForWell.first.globalCellIndex()] = appCompletionType; completionTypeCellResult[completionsForWell.first.globalCellIndex()] = appCompletionType;
} }
} }
} }

7
ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp
View File

@ -69,7 +69,7 @@ RigVirtualPerforationTransmissibilities::~RigVirtualPerforationTransmissibilitie
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigVirtualPerforationTransmissibilities::setCompletionDataForWellPath( void RigVirtualPerforationTransmissibilities::setCompletionDataForWellPath(
const RimWellPath* wellPath, const RimWellPath* wellPath,
std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep) const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep)
{ {
auto item = m_mapFromWellToCompletionData.find(wellPath); auto item = m_mapFromWellToCompletionData.find(wellPath);
@ -95,7 +95,8 @@ void RigVirtualPerforationTransmissibilities::setCompletionDataForWellPath(
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>& const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
RigVirtualPerforationTransmissibilities::multipleCompletionsPerEclipseCell(const RimWellPath* wellPath, size_t timeStepIndex) const RigVirtualPerforationTransmissibilities::multipleCompletionsPerEclipseCell(const RimWellPath* wellPath,
size_t timeStepIndex) const
{ {
static std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>> dummy; static std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>> dummy;
@ -119,7 +120,7 @@ const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigVirtualPerforationTransmissibilities::setCompletionDataForSimWell( void RigVirtualPerforationTransmissibilities::setCompletionDataForSimWell(
const RigSimWellData* simWellData, const RigSimWellData* simWellData,
std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep) const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep)
{ {
m_mapFromSimWellToCompletionData[simWellData] = completionsPerTimeStep; m_mapFromSimWellToCompletionData[simWellData] = completionsPerTimeStep;
} }

4
ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h
View File

@ -56,12 +56,12 @@ public:
RigVirtualPerforationTransmissibilities(); RigVirtualPerforationTransmissibilities();
~RigVirtualPerforationTransmissibilities(); ~RigVirtualPerforationTransmissibilities();
void setCompletionDataForWellPath(const RimWellPath* wellPath, std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep); void setCompletionDataForWellPath(const RimWellPath* wellPath, const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep);
const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>& const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
multipleCompletionsPerEclipseCell(const RimWellPath* wellPath, size_t timeStepIndex) const; multipleCompletionsPerEclipseCell(const RimWellPath* wellPath, size_t timeStepIndex) const;
void setCompletionDataForSimWell(const RigSimWellData* simWellData, std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep); void setCompletionDataForSimWell(const RigSimWellData* simWellData, const std::vector<std::vector<RigCompletionData>>& completionsPerTimeStep);
const std::vector<RigCompletionData>& const std::vector<RigCompletionData>&
completionsForSimWell(const RigSimWellData* simWellData, size_t timeStepIndex) const; completionsForSimWell(const RigSimWellData* simWellData, size_t timeStepIndex) const;