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

Fixed mock models

Browse Source
This commit is contained in:
Magne Sjaastad 2014-04-24 08:32:43 +02:00
parent 03c0c93fe3
commit 62a2c9e3ce
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimResultCase.cpp
View File

@ -211,21 +211,9 @@ cvf::ref<RifReaderInterface> RimResultCase::createMockModel(QString modelName)
mockFileInterface->setWorldCoordinates(cvf::Vec3d(10, 10, 10), cvf::Vec3d(20, 20, 20));
mockFileInterface->setGridPointDimensions(cvf::Vec3st(4, 5, 6));
mockFileInterface->addLocalGridRefinement(cvf::Vec3st(0, 2, 2), cvf::Vec3st(0, 2, 2), cvf::Vec3st(3, 3, 3));
mockFileInterface->enableWellData(false);
mockFileInterface->open("", reservoir.p());
{
size_t idx = reservoir->mainGrid()->cellIndexFromIJK(1, 3, 4);
//TODO: Rewrite active cell info in mock models
//reservoir->mainGrid()->cell(idx).setActiveIndexInMatrixModel(cvf::UNDEFINED_SIZE_T);
}
{
size_t idx = reservoir->mainGrid()->cellIndexFromIJK(2, 2, 3);
//TODO: Rewrite active cell info in mock models
//reservoir->mainGrid()->cell(idx).setActiveIndexInMatrixModel(cvf::UNDEFINED_SIZE_T);
}
}
else if (modelName == RimDefines::mockModelBasicWithResults())
{

17
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@ -137,12 +137,13 @@ void RigReservoirBuilderMock::appendCells(size_t nodeStartIndex, size_t cellCoun
size_t activeCellIndex = 0;
long long i;
cells.resize(cellCount);
size_t cellIndexStart = cells.size();
cells.resize(cells.size() + cellCount);
#pragma omp parallel for
for (i = 0; i < static_cast<long long>(cellCount); i++)
{
RigCell& riCell = cells[i];
RigCell& riCell = cells[cellIndexStart + i];
riCell.setHostGrid(hostGrid);
riCell.setCellIndex(i);
@ -157,18 +158,6 @@ void RigReservoirBuilderMock::appendCells(size_t nodeStartIndex, size_t cellCoun
riCell.cornerIndices()[7] = nodeStartIndex + i * 8 + 7;
riCell.setParentCellIndex(0);
//TODO: Rewrite active cell info in mock models
/*
if (!(i % 5))
{
riCell.setActiveIndexInMatrixModel(cvf::UNDEFINED_SIZE_T);
}
else
{
riCell.setActiveIndexInMatrixModel(activeCellIndex++);
}
*/
}
}