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

System : Replace tab with four spaces

Browse Source
This commit is contained in:
Magne Sjaastad
2018-03-12 11:12:39 +01:00
parent 8e8c168405
commit 716bb3184b
45 changed files with 368 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ void CompletionDataFrame::setCompletionData(const std::vector<RigCompletionData>
//--------------------------------------------------------------------------------------------------
const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>& CompletionDataFrame::multipleCompletionsPerEclipseCell() const
{
return m_multipleCompletionsPerEclipseCell;
return m_multipleCompletionsPerEclipseCell;
}
//--------------------------------------------------------------------------------------------------
@@ -69,22 +69,22 @@ void RigVirtualPerforationTransmissibilities::appendCompletionDataForWellPath(
const std::vector<RigCompletionData>& completions)
{
/*
auto item = m_mapFromWellToCompletionData.find(wellPath);
if (item != m_mapFromWellToCompletionData.end())
{
item->second.setCompletionData
}
auto item = m_mapFromWellToCompletionData.find(wellPath);
if (item != m_mapFromWellToCompletionData.end())
{
item->second.setCompletionData
}
auto it = m_multipleCompletionsPerEclipseCell.find(completion.completionDataGridCell());
if (it != m_multipleCompletionsPerEclipseCell.end())
{
it->second.push_back(completion);
}
else
{
m_multipleCompletionsPerEclipseCell.insert(std::pair<RigCompletionDataGridCell, std::vector<RigCompletionData>>(
completion.completionDataGridCell(), std::vector<RigCompletionData>{completion}));
}
auto it = m_multipleCompletionsPerEclipseCell.find(completion.completionDataGridCell());
if (it != m_multipleCompletionsPerEclipseCell.end())
{
it->second.push_back(completion);
}
else
{
m_multipleCompletionsPerEclipseCell.insert(std::pair<RigCompletionDataGridCell, std::vector<RigCompletionData>>(
completion.completionDataGridCell(), std::vector<RigCompletionData>{completion}));
}
*/
}
@@ -97,11 +97,11 @@ const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
{
static std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>> dummy;
auto item = m_mapFromWellToCompletionData.find(wellPath);
if (item != m_mapFromWellToCompletionData.end())
{
return item->second[timeStepIndex].multipleCompletionsPerEclipseCell();
}
auto item = m_mapFromWellToCompletionData.find(wellPath);
if (item != m_mapFromWellToCompletionData.end())
{
return item->second[timeStepIndex].multipleCompletionsPerEclipseCell();
}
return dummy;
}

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

@@ -40,8 +40,8 @@ public:
void setCompletionData(const std::vector<RigCompletionData>& completions);
const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
multipleCompletionsPerEclipseCell() const;
const std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>>&
multipleCompletionsPerEclipseCell() const;
private:
std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>> m_multipleCompletionsPerEclipseCell;

4
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp
View File

@@ -525,7 +525,7 @@ std::vector<const RigWellPath*> RigEclipseCaseData::simulationWellBranches(const
//--------------------------------------------------------------------------------------------------
void RigEclipseCaseData::setVirtualPerforationTransmissibilities(RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities)
{
m_virtualPerforationTransmissibilities = virtualPerforationTransmissibilities;
m_virtualPerforationTransmissibilities = virtualPerforationTransmissibilities;
}
//--------------------------------------------------------------------------------------------------
@@ -533,7 +533,7 @@ void RigEclipseCaseData::setVirtualPerforationTransmissibilities(RigVirtualPerfo
//--------------------------------------------------------------------------------------------------
const RigVirtualPerforationTransmissibilities* RigEclipseCaseData::virtualPerforationTransmissibilities() const
{
return m_virtualPerforationTransmissibilities;
return m_virtualPerforationTransmissibilities;
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h
View File

@@ -111,8 +111,8 @@ public:
bool includeAllCellCenters,
bool useAutoDetectionOfBranches) const;
void setVirtualPerforationTransmissibilities(RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities);
const RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities() const;
void setVirtualPerforationTransmissibilities(RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities);
const RigVirtualPerforationTransmissibilities* virtualPerforationTransmissibilities() const;
private:
void computeActiveCellIJKBBox();
@@ -131,7 +131,7 @@ private:
cvf::ref<RigFormationNames> m_activeFormationNamesData;
RigVirtualPerforationTransmissibilities* m_virtualPerforationTransmissibilities;
RigVirtualPerforationTransmissibilities* m_virtualPerforationTransmissibilities;
cvf::Collection<RigSimWellData> m_simWellData; //< A WellResults object for each well in the reservoir
cvf::Collection<cvf::UByteArray> m_wellCellsInGrid; //< A bool array pr grid with one bool pr cell telling whether the cell is a well cell or not

10
ApplicationCode/ReservoirDataModel/RigEclipseNativeStatCalc.h
View File

@@ -71,11 +71,11 @@ private:
// Filter out inactive cells
if (!actCellInfo->isActive(cIdx)) continue;
size_t cellResultIndex = cIdx;
if (m_resultsData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
size_t cellResultIndex = cIdx;
if (m_resultsData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
if (cellResultIndex != cvf::UNDEFINED_SIZE_T && cellResultIndex < values.size())
{

10
ApplicationCode/ReservoirDataModel/RigEclipseNativeVisibleCellsStatCalc.h
View File

@@ -73,11 +73,11 @@ private:
{
if (!(*m_cellVisibilities)[cIdx]) continue;
size_t cellResultIndex = cIdx;
if (m_caseData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
size_t cellResultIndex = cIdx;
if (m_caseData->isUsingGlobalActiveIndex(m_scalarResultIndex))
{
cellResultIndex = actCellInfo->cellResultIndex(cIdx);
}
if (cellResultIndex != cvf::UNDEFINED_SIZE_T && cellResultIndex < values.size())
{