OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 23:20:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: simplify API for configuring cell counts in IJK.

Browse Source 
The old API was based on "grid points", but it was always used to
specify number of cells in each direction.
This commit is contained in:
Kristian Bendiksen authored and Magne Sjaastad committed 2025-09-18 11:46:57 +02:00
1 parent e0df487eaa
commit 5133ae620b
18 files changed
+64 -83
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimCornerPointCase.cpp
+2 -2
View File
@@ -200,8 +200,8 @@ void RimCornerPointCase::buildGrid( RigEclipseCaseData& eclipseCaseData,
RigMainGrid* mainGrid = eclipseCaseData.mainGrid();
CVF_ASSERT( mainGrid );
cvf::Vec3st gridPointDim( nx + 1, ny + 1, nz + 1 );
mainGrid->setGridPointDimensions( gridPointDim );
mainGrid->setCellCounts( cvf::Vec3st( nx, ny, nz ) );
mainGrid->setGridName( "Main grid" );
size_t totalCellCount = nx * ny * nz;
ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp
+1 -1
View File
@@ -249,7 +249,7 @@ cvf::ref<RifReaderInterface> RimEclipseInputCase::createMockModel( QString model
// Create the mock file interface and and RigSerervoir and set them up.
mockFileInterface->setWorldCoordinates( cvf::Vec3d( 10, 10, 10 ), cvf::Vec3d( 20, 20, 20 ) );
mockFileInterface->setGridPointDimensions( cvf::Vec3st( 4, 5, 6 ) );
mockFileInterface->setCellCounts( cvf::Vec3st( 5, 6, 7 ) );
mockFileInterface->addLocalGridRefinement( cvf::Vec3st( 0, 2, 2 ), cvf::Vec3st( 0, 2, 2 ), cvf::Vec3st( 3, 3, 3 ) );
mockFileInterface->setResultInfo( 3, 10 );
ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
+5 -5
View File
@@ -448,7 +448,7 @@ cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel( QString mode
{
// Create the mock file interface and and RigSerervoir and set them up.
mockFileInterface->setWorldCoordinates( cvf::Vec3d( 10, 10, 10 ), cvf::Vec3d( 20, 20, 20 ) );
mockFileInterface->setGridPointDimensions( cvf::Vec3st( 4, 5, 6 ) );
mockFileInterface->setCellCounts( cvf::Vec3st( 5, 6, 7 ) );
mockFileInterface->addLocalGridRefinement( cvf::Vec3st( 0, 2, 2 ), cvf::Vec3st( 0, 2, 2 ), cvf::Vec3st( 3, 3, 3 ) );
mockFileInterface->enableWellData( false );
@@ -457,7 +457,7 @@ cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel( QString mode
else if ( modelName == RiaDefines::mockModelBasicWithResults() )
{
mockFileInterface->setWorldCoordinates( cvf::Vec3d( 10, 10, 10 ), cvf::Vec3d( -20, -20, -20 ) );
mockFileInterface->setGridPointDimensions( cvf::Vec3st( 5, 10, 20 ) );
mockFileInterface->setCellCounts( cvf::Vec3st( 6, 11, 21 ) );
mockFileInterface->addLocalGridRefinement( cvf::Vec3st( 0, 3, 3 ), cvf::Vec3st( 1, 4, 9 ), cvf::Vec3st( 2, 2, 2 ) );
mockFileInterface->setResultInfo( 3, 10 );
@@ -488,7 +488,7 @@ cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel( QString mode
mockFileInterface->setWorldCoordinates( cvf::Vec3d( startX + offsetX, startY + offsetY, startZ + offsetZ ),
cvf::Vec3d( startX + widthX + offsetX, startY + widthY + offsetY, startZ + widthZ + offsetZ ) );
mockFileInterface->setGridPointDimensions( cvf::Vec3st( 50, 100, 200 ) );
mockFileInterface->setCellCounts( cvf::Vec3st( 51, 101, 201 ) );
mockFileInterface->addLocalGridRefinement( cvf::Vec3st( 0, 30, 30 ), cvf::Vec3st( 1, 40, 90 ), cvf::Vec3st( 2, 2, 2 ) );
mockFileInterface->setResultInfo( 3, 10 );
@@ -524,8 +524,8 @@ cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel( QString mode
mockFileInterface->setWorldCoordinates( cvf::Vec3d( startX + offsetX, startY + offsetY, startZ + offsetZ ),
cvf::Vec3d( startX + widthX + offsetX, startY + widthY + offsetY, startZ + widthZ + offsetZ ) );
mockFileInterface->setGridPointDimensions(
cvf::Vec3st( mockModelSettings->cellCountX + 1, mockModelSettings->cellCountY + 1, mockModelSettings->cellCountZ + 1 ) );
mockFileInterface->setCellCounts(
cvf::Vec3st( mockModelSettings->cellCountX, mockModelSettings->cellCountY, mockModelSettings->cellCountZ ) );
mockFileInterface->setResultInfo( mockModelSettings->resultCount, mockModelSettings->timeStepCount );
mockFileInterface->enableWellData( false );
ApplicationLibCode/ProjectDataModel/RimRegularGridCase.cpp
+1 -2
View File
@@ -79,8 +79,7 @@ void RimRegularGridCase::createModel()
RigReservoirBuilder reservoirBuilder;
reservoirBuilder.setWorldCoordinates( m_minimum, m_maximum );
cvf::Vec3st gridPointDimensions( m_cellCountI, m_cellCountJ, m_cellCountK );
reservoirBuilder.setIJKCount( gridPointDimensions );
reservoirBuilder.setIJKCount( cvf::Vec3st( m_cellCountI, m_cellCountJ, m_cellCountK ) );
reservoirBuilder.createGridsAndCells( reservoir.p() );