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

Merge pull request #528 from totto82/minpvv

Browse Source 
Add support for minpvv
This commit is contained in:
Joakim Hove
2018-10-25 09:04:32 +02:00
committed by GitHub
parent 133f89198f ca8e2f279b
commit ae0cb3e5ad
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ namespace Opm {
PinchMode::ModeEnum getMultzOption( ) const;
MinpvMode::ModeEnum getMinpvMode() const;
double getMinpvValue( ) const;
const std::vector<double>& getMinpvVector( ) const;
/*
@@ -181,7 +181,7 @@ namespace Opm {
const ecl_grid_type * c_ptr() const;
private:
double m_minpvValue;
std::vector<double> m_minpvVector;
MinpvMode::ModeEnum m_minpvMode;
Value<double> m_pinch;
PinchMode::ModeEnum m_pinchoutMode;

3
src/opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp
View File

@@ -397,6 +397,9 @@ namespace Opm {
// pore volume multipliers
supportedDoubleKeywords.emplace_back( "MULTPV", 1.0, "1", true );
// cell mininum pore volume
supportedDoubleKeywords.emplace_back( "MINPVV", 0.000001 , "ReservoirVolume", true );
/* rock heat capacity, E300 only */
supportedDoubleKeywords.emplace_back("HEATCR", nan, distributeTopLayer, "Energy/AbsoluteTemperature*Length*Length*Length" );
supportedDoubleKeywords.emplace_back("HEATCRT", 0.0, distributeTopLayer, "Energy/AbsoluteTemperature*AbsoluteTemperature*Length*Length*Length", true );

22
src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -61,7 +61,6 @@ namespace Opm {
const int * actnum,
const double * mapaxes)
: GridDims(dims),
m_minpvValue(0),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH"),
m_pinchoutMode(PinchMode::ModeEnum::TOPBOT),
@@ -79,7 +78,6 @@ namespace Opm {
*/
EclipseGrid::EclipseGrid(const std::string& filename )
: GridDims(),
m_minpvValue(0),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH"),
m_pinchoutMode(PinchMode::ModeEnum::TOPBOT),
@@ -102,7 +100,6 @@ namespace Opm {
EclipseGrid::EclipseGrid(size_t nx, size_t ny , size_t nz,
double dx, double dy, double dz)
: GridDims(nx, ny, nz),
m_minpvValue(0),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH"),
m_pinchoutMode(PinchMode::ModeEnum::TOPBOT),
@@ -114,7 +111,7 @@ namespace Opm {
EclipseGrid::EclipseGrid(const EclipseGrid& src, const double* zcorn , const std::vector<int>& actnum)
: GridDims(src.getNX(), src.getNY(), src.getNZ()),
m_minpvValue( src.m_minpvValue ),
m_minpvVector( src.m_minpvVector ),
m_minpvMode( src.m_minpvMode ),
m_pinch( src.m_pinch ),
m_pinchoutMode( src.m_pinchoutMode ),
@@ -168,7 +165,6 @@ namespace Opm {
EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
: GridDims(deck),
m_minpvValue(0),
m_minpvMode(MinpvMode::ModeEnum::Inactive),
m_pinch("PINCH"),
m_pinchoutMode(PinchMode::ModeEnum::TOPBOT),
@@ -229,10 +225,16 @@ namespace Opm {
throw std::invalid_argument("Can not have both MINPV and MINPVFIL in deck.");
}
m_minpvVector.resize(getCartesianSize(), 0.0);
if (deck.hasKeyword<ParserKeywords::MINPV>()) {
const auto& record = deck.getKeyword<ParserKeywords::MINPV>( ).getRecord(0);
const auto& item = record.getItem<ParserKeywords::MINPV::VALUE>( );
m_minpvValue = item.getSIDouble(0);
std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0));
m_minpvMode = MinpvMode::ModeEnum::EclSTD;
} else if(deck.hasKeyword<ParserKeywords::MINPVV>()) {
// We should use the grid properties to support BOX, but then we need the eclipseState
const auto& record = deck.getKeyword<ParserKeywords::MINPVV>( ).getRecord(0);
m_minpvVector =record.getItem(0).getSIDoubleData();
m_minpvMode = MinpvMode::ModeEnum::EclSTD;
}
@@ -240,7 +242,7 @@ namespace Opm {
if (deck.hasKeyword<ParserKeywords::MINPVFIL>()) {
const auto& record = deck.getKeyword<ParserKeywords::MINPVFIL>( ).getRecord(0);
const auto& item = record.getItem<ParserKeywords::MINPVFIL::VALUE>( );
m_minpvValue = item.getSIDouble(0);
std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0));
m_minpvMode = MinpvMode::ModeEnum::OpmFIL;
}
}
@@ -291,8 +293,8 @@ namespace Opm {
return m_minpvMode;
}
double EclipseGrid::getMinpvValue( ) const {
return m_minpvValue;
const std::vector<double>& EclipseGrid::getMinpvVector( ) const {
return m_minpvVector;
}
@@ -728,7 +730,7 @@ namespace Opm {
bool EclipseGrid::equal(const EclipseGrid& other) const {
bool status = (m_pinch.equal( other.m_pinch ) && (ecl_grid_compare( c_ptr() , other.c_ptr() , true , false , false )) && (m_minpvMode == other.getMinpvMode()));
if(m_minpvMode!=MinpvMode::ModeEnum::Inactive){
status = status && (m_minpvValue == other.getMinpvValue());
status = status && (m_minpvVector == other.getMinpvVector());
}
return status;
}

1
src/opm/parser/eclipse/share/keywords/000_Eclipse100/M/MINPVV Normal file
View File

@@ -0,0 +1 @@
{"name" : "MINPVV" , "sections" : ["GRID"], "data" : {"value_type" : "DOUBLE" , "default" : 0.000001, "dimension" : "ReservoirVolume"}}

1
src/opm/parser/eclipse/share/keywords/keyword_list.cmake
View File

@@ -153,6 +153,7 @@ set( keywords
000_Eclipse100/M/MESSAGES
000_Eclipse100/M/METRIC
000_Eclipse100/M/MINPV
000_Eclipse100/M/MINPVV
000_Eclipse100/M/MINVALUE
000_Eclipse100/M/MISC
000_Eclipse100/M/MISCIBLE

4
tests/parser/EclipseGridTests.cpp
View File

@@ -868,9 +868,9 @@ BOOST_AUTO_TEST_CASE(ConstructorMINPV) {
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(grid3.getMinpvValue(), 10.0);
BOOST_CHECK_EQUAL(grid3.getMinpvVector()[0], 10.0);
BOOST_CHECK_EQUAL(grid4.getMinpvMode(), Opm::MinpvMode::ModeEnum::OpmFIL);
BOOST_CHECK_EQUAL(grid4.getMinpvValue(), 20.0);
BOOST_CHECK_EQUAL(grid4.getMinpvVector()[0], 20.0);
}