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

Fix rebase smartwater

Browse Source
This commit is contained in:
Tor Harald Sandve
2020-01-07 08:46:22 +01:00
parent b85871c4e8
commit c5e68b82e8
8 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
View File

@@ -114,7 +114,7 @@ namespace Opm {
const TableContainer& getRvvdTables() const;
const TableContainer& getPbvdTables() const;
const TableContainer& getPdvdTables() const;
const TableContainer& getSaltvdTables() const;
const TableContainer& getSaltvdTables() const;
const TableContainer& getEnkrvdTables() const;
const TableContainer& getEnptvdTables() const;
const TableContainer& getImkrvdTables() const;

2
src/opm/parser/eclipse/EclipseState/Runspec.cpp
View File

@@ -50,7 +50,7 @@ std::ostream& operator<<( std::ostream& stream, const Phase& p ) {
case Phase::ENERGY: return stream << "ENERGY";
case Phase::POLYMW: return stream << "POLYMW";
case Phase::FOAM: return stream << "FOAM";
case Phase::BRINE: return stream << "BRINE";
case Phase::BRINE: return stream << "BRINE";
}

4
src/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
View File

@@ -337,7 +337,7 @@ namespace Opm {
addTables( "RVVD", m_eqldims->getNumEquilRegions());
addTables( "PBVD", m_eqldims->getNumEquilRegions());
addTables( "PDVD", m_eqldims->getNumEquilRegions());
addTables( "SALTVD", m_eqldims->getNumEquilRegions());
addTables( "SALTVD", m_eqldims->getNumEquilRegions());
addTables( "AQUTAB", m_aqudims.getNumInfluenceTablesCT());
{
@@ -400,7 +400,7 @@ namespace Opm {
initSimpleTableContainer<RvvdTable>(deck, "RVVD" , m_eqldims->getNumEquilRegions());
initSimpleTableContainer<PbvdTable>(deck, "PBVD" , m_eqldims->getNumEquilRegions());
initSimpleTableContainer<PdvdTable>(deck, "PDVD" , m_eqldims->getNumEquilRegions());
initSimpleTableContainer<SaltvdTable>(deck, "SALTVD" , m_eqldims->getNumEquilRegions());
initSimpleTableContainer<SaltvdTable>(deck, "SALTVD" , m_eqldims->getNumEquilRegions());
initSimpleTableContainer<AqutabTable>(deck, "AQUTAB" , m_aqudims.getNumInfluenceTablesCT());
{
size_t numEndScaleTables = ParserKeywords::ENDSCALE::NUM_TABLES::defaultValue;

3
src/opm/parser/eclipse/share/keywords/000_Eclipse100/B/BRINE
View File

@@ -1 +1,2 @@
{"name" : "BRINE" , "sections" : ["RUNSPEC"]}
{"name" : "BRINE" , "sections" : ["RUNSPEC"], "comment" : "Multi-Component Brine Model not supported"
}

2
src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVTWSALT
View File

@@ -5,6 +5,6 @@
{"name":"SALT_CONCENTRATION_REF", "value_type" : "DOUBLE", "default" : 0.0,"dimension":"Density"}
],
[
{"name" : "table", "value_type" : "DOUBLE", "size_type" : "ALL", "dimension" : ["Density","1","1/Pressure","Viscosity", "1/Pressure"]}
{"name" : "DATA", "value_type" : "DOUBLE", "size_type" : "ALL", "dimension" : ["Density","1","1/Pressure","Viscosity", "1/Pressure"]}
]]
}

4
src/opm/parser/eclipse/share/keywords/000_Eclipse100/S/SALTVD
View File

@@ -1,4 +1,6 @@
{"name" : "SALTVD" , "sections" : ["SOLUTION"], "size" : {"keyword" : "EQLDIMS" , "item" : "NTEQUL"},
{"name" : "SALTVD" ,
"comment" : "Hardcoded two columns. Multi-Component Brine Model not supported",
"sections" : ["SOLUTION"], "size" : {"keyword" : "EQLDIMS" , "item" : "NTEQUL"},
"items" : [{"name" : "DATA" ,
"value_type" : "DOUBLE" ,
"size_type" : "ALL",

8
tests/parser/SaltTableTests.cpp
View File

@@ -52,14 +52,14 @@ BOOST_AUTO_TEST_CASE( Brine ) {
"TABDIMS\n"
"1 1/\n"
"\n"
"BDENSITY\n"
" 1000 1050 /\n"
"\n"
"PVTWSALT\n"
" 1000/\n"
" 0 1 2 3 4 \n"
" 10 11 12 13 14/\n"
"\n"
" \n"
"BDENSITY\n"
" 1000 1050 /\n"
"\n"
"EQLDIMS\n"
"1 /\n"
"\n"

1
tests/parser/TableManagerTests.cpp
View File

@@ -329,7 +329,6 @@ BOOST_AUTO_TEST_CASE(PdvdTable_Tests) {
BOOST_CHECK_THROW(Opm::PdvdTable pdvdTable2(deck.getKeyword("PDVD").getRecord(1).getItem(0)), std::invalid_argument);
}
BOOST_AUTO_TEST_CASE(SgwfnTable_Tests) {
const char *deckData =
"TABDIMS\n"