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

Removed obsolete code

Browse Source 
p4#: 20492
This commit is contained in:
Magne Sjaastad 2013-02-13 11:24:36 +01:00
parent e99c1cbfb1
commit a0d6890aa3
6 changed files with 2 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -129,13 +129,8 @@ bool transferGridCellData(RigMainGrid* mainGrid, RigActiveCellInfo* activeCellIn
int fractureActiveIndex = ecl_grid_get_active_fracture_index1(localEclGrid, localCellIdx); int fractureActiveIndex = ecl_grid_get_active_fracture_index1(localEclGrid, localCellIdx);
if (fractureActiveIndex != -1) if (fractureActiveIndex != -1)
{ {
cell.setActiveIndexInFractureModel(fractureActiveStartIndex + fractureActiveIndex);
activeCellInfo->setActiveIndexInFractureModel(cellStartIndex + localCellIdx, fractureActiveStartIndex + fractureActiveIndex); activeCellInfo->setActiveIndexInFractureModel(cellStartIndex + localCellIdx, fractureActiveStartIndex + fractureActiveIndex);
} }
else
{
cell.setActiveIndexInFractureModel(cvf::UNDEFINED_SIZE_T);
}
// Parent cell index // Parent cell index

18
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp
View File

@ -75,24 +75,6 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames)
m_rigReservoir->mainGrid()->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p()); m_rigReservoir->mainGrid()->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
m_rigReservoir->mainGrid()->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p()); m_rigReservoir->mainGrid()->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
size_t matrixActiveCellCount = 0;
size_t fractureActiveCellCount = 0;
for (size_t cellIdx = 0; cellIdx < m_rigReservoir->mainGrid()->cells().size(); cellIdx++)
{
const RigCell& cell = m_rigReservoir->mainGrid()->cells()[cellIdx];
if (cell.isActiveInMatrixModel())
{
matrixActiveCellCount++;
}
if (cell.isActiveInFractureModel())
{
fractureActiveCellCount++;
}
}
m_rigReservoir->activeCellInfo()->computeDerivedData(); m_rigReservoir->activeCellInfo()->computeDerivedData();
return; return;

17
ApplicationCode/ProjectDataModel/RimResultReservoir.cpp
View File

@ -58,23 +58,6 @@ bool RimResultReservoir::openEclipseGridFile()
{ {
readerInterface = this->createMockModel(this->caseName()); readerInterface = this->createMockModel(this->caseName());
size_t matrixActiveCellCount = 0;
size_t fractureActiveCellCount = 0;
for (size_t cellIdx = 0; cellIdx < m_rigReservoir->mainGrid()->cells().size(); cellIdx++)
{
const RigCell& cell = m_rigReservoir->mainGrid()->cells()[cellIdx];
if (cell.isActiveInMatrixModel())
{
matrixActiveCellCount++;
}
if (cell.isActiveInFractureModel())
{
fractureActiveCellCount++;
}
}
m_rigReservoir->mainGrid()->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p()); m_rigReservoir->mainGrid()->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
m_rigReservoir->mainGrid()->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p()); m_rigReservoir->mainGrid()->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
} }

1
ApplicationCode/ReservoirDataModel/RigCell.cpp
View File

@ -41,7 +41,6 @@ RigCell::RigCell() :
m_isInvalid(false), m_isInvalid(false),
m_isWellCell(false), m_isWellCell(false),
m_activeIndexInMatrixModel(cvf::UNDEFINED_SIZE_T), m_activeIndexInMatrixModel(cvf::UNDEFINED_SIZE_T),
m_activeIndexInFractureModel(cvf::UNDEFINED_SIZE_T),
m_cellIndex(cvf::UNDEFINED_SIZE_T), m_cellIndex(cvf::UNDEFINED_SIZE_T),
m_isInCoarseCell(false) m_isInCoarseCell(false)
{ {

6
ApplicationCode/ReservoirDataModel/RigCell.h
View File

@ -41,10 +41,6 @@ public:
size_t activeIndexInMatrixModel() const { return m_activeIndexInMatrixModel; } size_t activeIndexInMatrixModel() const { return m_activeIndexInMatrixModel; }
void setActiveIndexInMatrixModel(size_t val) { m_activeIndexInMatrixModel = val; } void setActiveIndexInMatrixModel(size_t val) { m_activeIndexInMatrixModel = val; }
bool isActiveInFractureModel() const { return m_activeIndexInFractureModel != cvf::UNDEFINED_SIZE_T; }
size_t activeIndexInFractureModel() const { return m_activeIndexInFractureModel; }
void setActiveIndexInFractureModel(size_t val) { m_activeIndexInFractureModel = val; }
bool isInvalid() const { return m_isInvalid; } bool isInvalid() const { return m_isInvalid; }
void setInvalid( bool val ) { m_isInvalid = val; } void setInvalid( bool val ) { m_isInvalid = val; }
@ -95,6 +91,4 @@ private:
bool m_isWellCell; bool m_isWellCell;
size_t m_activeIndexInMatrixModel; ///< This cell's running index of all the active calls (matrix) in the reservoir size_t m_activeIndexInMatrixModel; ///< This cell's running index of all the active calls (matrix) in the reservoir
size_t m_activeIndexInFractureModel; ///< This cell's running index of all the active calls (fracture) in the reservoir
}; };

6
ApplicationCode/ReservoirDataModel/RigReservoir.cpp
View File

@ -266,17 +266,15 @@ void RigReservoir::computeActiveCellData()
size_t idx; size_t idx;
for (idx = 0; idx < m_mainGrid->cellCount(); idx++) for (idx = 0; idx < m_mainGrid->cellCount(); idx++)
{ {
const RigCell& c = m_mainGrid->cell(idx);
size_t i, j, k; size_t i, j, k;
m_mainGrid->ijkFromCellIndex(idx, &i, &j, &k); m_mainGrid->ijkFromCellIndex(idx, &i, &j, &k);
if (c.isActiveInMatrixModel()) if (m_activeCellInfo.activeIndexInMatrixModel(idx))
{ {
matrixModelActiveBB.add(i, j, k); matrixModelActiveBB.add(i, j, k);
} }
if (c.isActiveInFractureModel()) if (m_activeCellInfo.activeIndexInFractureModel(idx))
{ {
fractureModelActiveBB.add(i, j, k); fractureModelActiveBB.add(i, j, k);
} }