From f832c88d767a2cd899e4bce8d1a3f496e15b1ebe Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 5 Jan 2023 14:04:01 +0100 Subject: [PATCH] MinpvMode: convert to enum class --- CMakeLists_files.cmake | 5 ++- .../eclipse/EclipseState/Grid/EclipseGrid.hpp | 4 +- .../eclipse/EclipseState/Grid/MinpvMode.hpp | 17 +++++---- .../eclipse/EclipseState/Grid/EclipseGrid.cpp | 20 +++++----- .../eclipse/EclipseState/Grid/MinpvMode.cpp | 38 +++++++++++++++++++ tests/parser/EclipseGridTests.cpp | 4 +- 6 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 src/opm/input/eclipse/EclipseState/Grid/MinpvMode.cpp diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 5e3462c2d..8e2cda1b7 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -91,17 +91,18 @@ if(ENABLE_ECL_INPUT) src/opm/input/eclipse/EclipseState/EclipseConfig.cpp src/opm/input/eclipse/EclipseState/EclipseState.cpp src/opm/input/eclipse/EclipseState/EndpointScaling.cpp - src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp - src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp src/opm/input/eclipse/EclipseState/Grid/Box.cpp src/opm/input/eclipse/EclipseState/Grid/BoxManager.cpp src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp + src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp + src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp src/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp src/opm/input/eclipse/EclipseState/Grid/FaultCollection.cpp src/opm/input/eclipse/EclipseState/Grid/Fault.cpp src/opm/input/eclipse/EclipseState/Grid/FaultFace.cpp src/opm/input/eclipse/EclipseState/Grid/GridDims.cpp src/opm/input/eclipse/EclipseState/Grid/MapAxes.cpp + src/opm/input/eclipse/EclipseState/Grid/MinpvMode.cpp src/opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.cpp src/opm/input/eclipse/EclipseState/Grid/NNC.cpp src/opm/input/eclipse/EclipseState/Grid/Operate.cpp diff --git a/opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp b/opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp index bc3acba5d..07b3d8188 100644 --- a/opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp +++ b/opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp @@ -115,7 +115,7 @@ namespace Opm { PinchMode::ModeEnum getMultzOption( ) const; PinchMode::ModeEnum getPinchGapMode( ) const; - MinpvMode::ModeEnum getMinpvMode() const; + MinpvMode getMinpvMode() const; const std::vector& getMinpvVector( ) const; /* @@ -222,7 +222,7 @@ namespace Opm { private: std::vector m_minpvVector; - MinpvMode::ModeEnum m_minpvMode; + MinpvMode m_minpvMode; std::optional m_pinch; PinchMode::ModeEnum m_pinchoutMode; PinchMode::ModeEnum m_multzMode; diff --git a/opm/input/eclipse/EclipseState/Grid/MinpvMode.hpp b/opm/input/eclipse/EclipseState/Grid/MinpvMode.hpp index c8e2b6a5e..d6d5a149a 100644 --- a/opm/input/eclipse/EclipseState/Grid/MinpvMode.hpp +++ b/opm/input/eclipse/EclipseState/Grid/MinpvMode.hpp @@ -20,14 +20,17 @@ #ifndef OPM_MINPVMODE_HPP #define OPM_MINPVMODE_HPP +#include + namespace Opm { - - namespace MinpvMode { - enum ModeEnum { - Inactive = 1, - EclSTD = 2, - }; - } + +enum class MinpvMode { + Inactive = 1, + EclSTD = 2, +}; + +std::ostream& operator<<(std::ostream&, const MinpvMode&); + } #endif diff --git a/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp index 288ad3e85..8015c2b80 100644 --- a/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp @@ -96,7 +96,7 @@ EclipseGrid::EclipseGrid(const std::array& dims , const std::vector& zcorn , const int * actnum) : GridDims(dims), - m_minpvMode(MinpvMode::ModeEnum::Inactive), + m_minpvMode(MinpvMode::Inactive), m_pinchoutMode(PinchMode::ModeEnum::TOPBOT), m_multzMode(PinchMode::ModeEnum::TOP), m_pinchGapMode(PinchMode::ModeEnum::GAP) @@ -112,7 +112,7 @@ EclipseGrid::EclipseGrid(const std::array& dims , EclipseGrid::EclipseGrid(const std::string& fileName ) : GridDims(), - m_minpvMode(MinpvMode::ModeEnum::Inactive), + m_minpvMode(MinpvMode::Inactive), m_pinchoutMode(PinchMode::ModeEnum::TOPBOT), m_multzMode(PinchMode::ModeEnum::TOP), m_pinchGapMode(PinchMode::ModeEnum::GAP) @@ -126,7 +126,7 @@ EclipseGrid::EclipseGrid(const std::string& fileName ) EclipseGrid::EclipseGrid(const GridDims& gd) : GridDims(gd), - m_minpvMode(MinpvMode::ModeEnum::Inactive), + m_minpvMode(MinpvMode::Inactive), m_pinchoutMode(PinchMode::ModeEnum::TOPBOT), m_multzMode(PinchMode::ModeEnum::TOP), m_pinchGapMode(PinchMode::ModeEnum::GAP) @@ -146,7 +146,7 @@ EclipseGrid::EclipseGrid(const GridDims& gd) EclipseGrid::EclipseGrid(size_t nx, size_t ny , size_t nz, double dx, double dy, double dz) : GridDims(nx, ny, nz), - m_minpvMode(MinpvMode::ModeEnum::Inactive), + m_minpvMode(MinpvMode::Inactive), m_pinchoutMode(PinchMode::ModeEnum::TOPBOT), m_multzMode(PinchMode::ModeEnum::TOP), m_pinchGapMode(PinchMode::ModeEnum::GAP) @@ -254,7 +254,7 @@ EclipseGrid::EclipseGrid(const EclipseGrid& src, const std::vector& actnum) EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum) : GridDims(deck), - m_minpvMode(MinpvMode::ModeEnum::Inactive), + m_minpvMode(MinpvMode::Inactive), m_pinchoutMode(PinchMode::ModeEnum::TOPBOT), m_multzMode(PinchMode::ModeEnum::TOP), m_pinchGapMode(PinchMode::ModeEnum::GAP) @@ -362,17 +362,17 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum) const auto& record = deck.get( ).back().getRecord(0); const auto& item = record.getItem( ); std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0)); - m_minpvMode = MinpvMode::ModeEnum::EclSTD; + m_minpvMode = MinpvMode::EclSTD; } else if (deck.hasKeyword()) { const auto& record = deck.get( ).back().getRecord(0); const auto& item = record.getItem( ); std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0)); - m_minpvMode = MinpvMode::ModeEnum::EclSTD; + m_minpvMode = MinpvMode::EclSTD; } else if(deck.hasKeyword()) { // We should use the grid properties to support BOX, but then we need the eclipseState const auto& record = deck.get( ).back().getRecord(0); m_minpvVector =record.getItem(0).getSIDoubleData(); - m_minpvMode = MinpvMode::ModeEnum::EclSTD; + m_minpvMode = MinpvMode::EclSTD; } if (actnum != nullptr) { @@ -536,7 +536,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum) return m_multzMode; } - MinpvMode::ModeEnum EclipseGrid::getMinpvMode() const { + MinpvMode EclipseGrid::getMinpvMode() const { return m_minpvMode; } @@ -1420,7 +1420,7 @@ std::vector EclipseGrid::createDVector(const std::array& dims, st bool status = ((m_pinch == other.m_pinch) && (m_minpvMode == other.getMinpvMode())); - if(m_minpvMode!=MinpvMode::ModeEnum::Inactive) { + if (m_minpvMode != MinpvMode::Inactive) { status = status && (m_minpvVector == other.getMinpvVector()); } diff --git a/src/opm/input/eclipse/EclipseState/Grid/MinpvMode.cpp b/src/opm/input/eclipse/EclipseState/Grid/MinpvMode.cpp new file mode 100644 index 000000000..0e60cad03 --- /dev/null +++ b/src/opm/input/eclipse/EclipseState/Grid/MinpvMode.cpp @@ -0,0 +1,38 @@ +/* + Copyright 2015 Statoil ASA. + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ + +#include +#include + +#include +#include + +namespace Opm { + +std::ostream& operator<<(std::ostream& os, const MinpvMode& mm) +{ + if (mm == MinpvMode::EclSTD) + return (os << "EclStd"); + else if (mm == MinpvMode::Inactive) + return (os << "Inactive"); + else + assert(0); +} + +} diff --git a/tests/parser/EclipseGridTests.cpp b/tests/parser/EclipseGridTests.cpp index 161afcf91..a59f98fc6 100644 --- a/tests/parser/EclipseGridTests.cpp +++ b/tests/parser/EclipseGridTests.cpp @@ -850,8 +850,8 @@ BOOST_AUTO_TEST_CASE(ConstructorMINPV) { Opm::EclipseGrid grid3(deck3); BOOST_CHECK(!grid1.equal( grid3 )); - BOOST_CHECK_EQUAL(grid1.getMinpvMode(), Opm::MinpvMode::ModeEnum::Inactive); - BOOST_CHECK_EQUAL(grid3.getMinpvMode(), Opm::MinpvMode::ModeEnum::EclSTD); + BOOST_CHECK_EQUAL(grid1.getMinpvMode(), Opm::MinpvMode::Inactive); + BOOST_CHECK_EQUAL(grid3.getMinpvMode(), Opm::MinpvMode::EclSTD); BOOST_CHECK_EQUAL(grid3.getMinpvVector()[0], 10.0); }