OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed default initialization of EclipseGrid.

Browse Source
This commit is contained in:
Markus Blatt
2023-03-30 14:03:01 +02:00
parent ea64c29001
commit 3706aae429
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp
View File

@@ -53,7 +53,7 @@ namespace Opm {
class EclipseGrid : public GridDims {
public:
EclipseGrid() = default;
EclipseGrid();
explicit EclipseGrid(const std::string& filename);
/*
@@ -228,7 +228,7 @@ namespace Opm {
PinchMode m_pinchoutMode;
PinchMode m_multzMode;
PinchMode m_pinchGapMode;
double m_pinchMaxEmptyGap = 1e20;
double m_pinchMaxEmptyGap;
mutable std::optional<std::vector<double>> active_volume;
@@ -249,7 +249,7 @@ namespace Opm {
std::optional<MapAxes> m_mapaxes;
// Mapping to/from active cells.
int m_nactive;
int m_nactive {};
std::vector<int> m_active_to_global;
std::vector<int> m_global_to_active;
// Numerical aquifer cells, needs to be active

23
src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -90,6 +90,14 @@ void apply_GRIDUNIT(const UnitSystem& deck_units, const UnitSystem& grid_units,
}
}
EclipseGrid::EclipseGrid()
: GridDims(),
m_minpvMode(MinpvMode::Inactive),
m_pinchoutMode(PinchMode::TOPBOT),
m_multzMode(PinchMode::TOP),
m_pinchGapMode(PinchMode::GAP),
m_pinchMaxEmptyGap(ParserKeywords::PINCH::MAX_EMPTY_GAP::defaultValue)
{}
EclipseGrid::EclipseGrid(const std::array<int, 3>& dims ,
const std::vector<double>& coord ,
@@ -99,7 +107,8 @@ EclipseGrid::EclipseGrid(const std::array<int, 3>& dims ,
m_minpvMode(MinpvMode::Inactive),
m_pinchoutMode(PinchMode::TOPBOT),
m_multzMode(PinchMode::TOP),
m_pinchGapMode(PinchMode::GAP)
m_pinchGapMode(PinchMode::GAP),
m_pinchMaxEmptyGap(ParserKeywords::PINCH::MAX_EMPTY_GAP::defaultValue)
{
initCornerPointGrid( coord , zcorn , actnum );
}
@@ -115,7 +124,8 @@ EclipseGrid::EclipseGrid(const std::string& fileName )
m_minpvMode(MinpvMode::Inactive),
m_pinchoutMode(PinchMode::TOPBOT),
m_multzMode(PinchMode::TOP),
m_pinchGapMode(PinchMode::GAP)
m_pinchGapMode(PinchMode::GAP),
m_pinchMaxEmptyGap(ParserKeywords::PINCH::MAX_EMPTY_GAP::defaultValue)
{
Opm::EclIO::EclFile egridfile(fileName);
@@ -129,7 +139,8 @@ EclipseGrid::EclipseGrid(const GridDims& gd)
m_minpvMode(MinpvMode::Inactive),
m_pinchoutMode(PinchMode::TOPBOT),
m_multzMode(PinchMode::TOP),
m_pinchGapMode(PinchMode::GAP)
m_pinchGapMode(PinchMode::GAP),
m_pinchMaxEmptyGap(ParserKeywords::PINCH::MAX_EMPTY_GAP::defaultValue)
{
this->m_nactive = this->getCartesianSize();
this->active_volume = std::nullopt;
@@ -149,7 +160,8 @@ EclipseGrid::EclipseGrid(size_t nx, size_t ny , size_t nz,
m_minpvMode(MinpvMode::Inactive),
m_pinchoutMode(PinchMode::TOPBOT),
m_multzMode(PinchMode::TOP),
m_pinchGapMode(PinchMode::GAP)
m_pinchGapMode(PinchMode::GAP),
m_pinchMaxEmptyGap(ParserKeywords::PINCH::MAX_EMPTY_GAP::defaultValue)
{
m_coord.reserve((nx+1)*(ny+1)*6);
@@ -257,7 +269,8 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
m_minpvMode(MinpvMode::Inactive),
m_pinchoutMode(PinchMode::TOPBOT),
m_multzMode(PinchMode::TOP),
m_pinchGapMode(PinchMode::GAP)
m_pinchGapMode(PinchMode::GAP),
m_pinchMaxEmptyGap(ParserKeywords::PINCH::MAX_EMPTY_GAP::defaultValue)
{
if (deck.hasKeyword("GDFILE")){