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

Add MinpvMode namespace and remove the whitespace.

Browse Source
This commit is contained in:
Liu Ming
2015-02-12 16:00:31 +08:00
parent 1dfb337a76
commit 8f61bcd59a
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -37,7 +37,7 @@ namespace Opm {
*/
EclipseGrid::EclipseGrid(const std::string& filename )
: m_minpvValue(0),
m_minpvMode(MinpvMode::Inactive),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH")
{
ecl_grid_type * new_ptr = ecl_grid_load_case( filename.c_str() );
@@ -53,7 +53,7 @@ namespace Opm {
EclipseGrid::EclipseGrid(const ecl_grid_type * src_ptr)
: m_minpvValue(0),
m_minpvMode(MinpvMode::Inactive),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH")
{
m_grid.reset( ecl_grid_alloc_copy( src_ptr ) , ecl_grid_free );
@@ -73,7 +73,7 @@ namespace Opm {
EclipseGrid::EclipseGrid(size_t nx, size_t ny , size_t nz,
double dx, double dy, double dz)
: m_minpvValue(0),
m_minpvMode(MinpvMode::Inactive),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH")
{
m_nx = nx;
@@ -98,7 +98,7 @@ namespace Opm {
EclipseGrid::EclipseGrid(std::shared_ptr<const Deck> deck, LoggerPtr logger)
: m_minpvValue(0),
m_minpvMode(MinpvMode::Inactive),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH")
{
const bool hasRUNSPEC = Section::hasRUNSPEC(deck);
@@ -167,12 +167,12 @@ namespace Opm {
if (deck->hasKeyword("MINPV")) {
m_minpvValue = deck->getKeyword("MINPV")->getRecord(0)->getItem("MINPV")->getSIDouble(0);
m_minpvMode = MinpvMode::EclSTD;
m_minpvMode = MinpvMode::ModeEnum::EclSTD;
}
if (deck->hasKeyword("MINPVFIL")) {
m_minpvValue = deck->getKeyword("MINPVFIL")->getRecord(0)->getItem("MINPVFIL")->getSIDouble(0);
m_minpvMode = MinpvMode::OpmFIL;
m_minpvMode = MinpvMode::ModeEnum::OpmFIL;
}
}
@@ -202,7 +202,7 @@ namespace Opm {
return m_pinch.getValue();
}
MinpvMode EclipseGrid::getMinpvMode() const {
MinpvMode::ModeEnum EclipseGrid::getMinpvMode() const {
return m_minpvMode;
}

4
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
View File

@@ -82,7 +82,7 @@ namespace Opm {
bool isPinchActive( ) const;
double getPinchThresholdThickness( ) const;
MinpvMode getMinpvMode() const;
MinpvMode::ModeEnum getMinpvMode() const;
double getMinpvValue( ) const;
bool hasCellInfo() const;
@@ -110,7 +110,7 @@ namespace Opm {
private:
std::shared_ptr<ecl_grid_type> m_grid;
double m_minpvValue;
MinpvMode m_minpvMode;
MinpvMode::ModeEnum m_minpvMode;
Value<double> m_pinch;
size_t m_nx;
size_t m_ny;

14
opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp
View File

@@ -23,12 +23,14 @@
#include <string>
namespace Opm {
enum MinpvMode {
Inactive = 1,
EclSTD = 2,
OpmFIL = 4
};
namespace MinpvMode {
enum ModeEnum {
Inactive = 1,
EclSTD = 2,
OpmFIL = 3
};
}
}
#endif

11
opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp
View File

@@ -760,14 +760,9 @@ BOOST_AUTO_TEST_CASE(ConstructorMINPV) {
BOOST_CHECK(!grid1.equal( grid2 ));
BOOST_CHECK(!grid1.equal( grid3 ));
BOOST_CHECK(!grid2.equal( grid3 ));
BOOST_CHECK_EQUAL(grid1.getMinpvMode(), Opm::MinpvMode::Inactive);
BOOST_CHECK_EQUAL(grid3.getMinpvMode(), Opm::MinpvMode::EclSTD);
BOOST_CHECK_EQUAL(grid1.getMinpvMode(), Opm::MinpvMode::ModeEnum::Inactive);
BOOST_CHECK_EQUAL(grid3.getMinpvMode(), Opm::MinpvMode::ModeEnum::EclSTD);
BOOST_CHECK_EQUAL(grid3.getMinpvValue(), 10.0);
BOOST_CHECK_EQUAL(grid4.getMinpvMode(), Opm::MinpvMode::OpmFIL);
BOOST_CHECK_EQUAL(grid4.getMinpvMode(), Opm::MinpvMode::ModeEnum::OpmFIL);
BOOST_CHECK_EQUAL(grid4.getMinpvValue(), 20.0);
}