mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 22:50:25 -05:00
Refactor: simplify API for configuring cell counts in IJK.
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:
1 parent
e0df487eaa
commit
5133ae620b
18 files changed
+64
-83
No files matched your search
@@ -20,7 +20,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RifReaderInterface.h"
|
||||
#include "RigFault.h"
|
||||
|
||||
#include "cafVecIjk.h"
|
||||
@@ -28,8 +27,8 @@
|
||||
#include "cvfStructGrid.h"
|
||||
#include "cvfStructGridGeometryGenerator.h"
|
||||
#include "cvfVector3.h"
|
||||
#include <array>
|
||||
|
||||
#include <array>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -44,11 +43,12 @@ public:
|
||||
explicit RigGridBase( RigMainGrid* mainGrid );
|
||||
~RigGridBase() override;
|
||||
|
||||
void setGridPointDimensions( const cvf::Vec3st& gridDimensions );
|
||||
void setCellCounts( const cvf::Vec3st& cellCounts );
|
||||
|
||||
size_t cellCountI() const override { return m_cellCount.x(); }
|
||||
size_t cellCountJ() const override { return m_cellCount.y(); }
|
||||
size_t cellCountK() const override { return m_cellCount.z(); }
|
||||
size_t cellCountI() const override { return m_cellCounts.x(); }
|
||||
size_t cellCountJ() const override { return m_cellCounts.y(); }
|
||||
size_t cellCountK() const override { return m_cellCounts.z(); }
|
||||
cvf::Vec3st cellCounts() const { return m_cellCounts; }
|
||||
virtual size_t cellCount() const { return m_cellCountIJK; }
|
||||
|
||||
virtual RigCell& cell( size_t gridLocalCellIndex );
|
||||
@@ -121,8 +121,7 @@ protected:
|
||||
|
||||
private:
|
||||
std::string m_gridName;
|
||||
cvf::Vec3st m_gridPointDimensions;
|
||||
cvf::Vec3st m_cellCount;
|
||||
cvf::Vec3st m_cellCounts;
|
||||
size_t m_gridIndex; ///< The LGR index of this grid. Starts with 1. Main grid has index 0.
|
||||
int m_gridId; ///< The LGR id of this grid. Main grid has id 0.
|
||||
RigMainGrid* m_mainGrid;
|
||||
|
||||
Reference in new issue
Block a user