From b2c3c24fe83ce1dcaa9a18280b902f7e515158e9 Mon Sep 17 00:00:00 2001 From: goncalvesmachadoc Date: Mon, 28 Mar 2022 13:21:42 +0200 Subject: [PATCH] add salt density as input --- .../eclipse/EclipseState/Tables/SaltSolubilityTable.hpp | 1 + src/opm/input/eclipse/EclipseState/Tables/Tables.cpp | 5 +++++ src/opm/input/eclipse/share/keywords/900_OPM/S/SALTSOL | 9 ++++++++- tests/parser/SaltTableTests.cpp | 5 +++-- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/opm/input/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp b/opm/input/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp index 29eb043cf..227981cec 100644 --- a/opm/input/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp +++ b/opm/input/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp @@ -30,6 +30,7 @@ public: SaltsolTable( const DeckItem& item, const int tableID ); const TableColumn& getSaltsolColumn() const; + const TableColumn& getSaltdenColumn() const; }; } diff --git a/src/opm/input/eclipse/EclipseState/Tables/Tables.cpp b/src/opm/input/eclipse/EclipseState/Tables/Tables.cpp index a9db28f67..37679e212 100644 --- a/src/opm/input/eclipse/EclipseState/Tables/Tables.cpp +++ b/src/opm/input/eclipse/EclipseState/Tables/Tables.cpp @@ -1112,6 +1112,7 @@ const TableColumn& SaltpvdTable::getSaltpColumn() const { SaltsolTable::SaltsolTable( const DeckItem& item, const int tableID ) { m_schema.addColumn( ColumnSchema( "SALTSOLUBILITY" , Table::RANDOM , Table::DEFAULT_NONE )); + m_schema.addColumn( ColumnSchema( "SALTDENSITY" , Table::RANDOM , Table::DEFAULT_NONE )); SimpleTable::init(item, tableID); } @@ -1120,6 +1121,10 @@ const TableColumn& SaltsolTable::getSaltsolColumn() const { return SimpleTable::getColumn(0); } +const TableColumn& SaltsolTable::getSaltdenColumn() const { + return SimpleTable::getColumn(1); +} + PermfactTable::PermfactTable( const DeckItem& item, const int tableID ) { m_schema.addColumn( ColumnSchema( "POROSITYCHANGE" , Table::STRICTLY_INCREASING , Table::DEFAULT_NONE )); diff --git a/src/opm/input/eclipse/share/keywords/900_OPM/S/SALTSOL b/src/opm/input/eclipse/share/keywords/900_OPM/S/SALTSOL index 890e7199b..77ebcfec2 100644 --- a/src/opm/input/eclipse/share/keywords/900_OPM/S/SALTSOL +++ b/src/opm/input/eclipse/share/keywords/900_OPM/S/SALTSOL @@ -9,10 +9,17 @@ }, "items": [ { - "name": "DATA", + "name": "Solubility", "value_type": "DOUBLE", "size_type": "ALL", "dimension": "Density" + }, + { + "name": "Density", + "value_type": "DOUBLE", + "size_type": "ALL", + "default": 2170.0, + "dimension": "Density" } ] } diff --git a/tests/parser/SaltTableTests.cpp b/tests/parser/SaltTableTests.cpp index 54a6eb6fd..98cdd1c2c 100644 --- a/tests/parser/SaltTableTests.cpp +++ b/tests/parser/SaltTableTests.cpp @@ -154,8 +154,8 @@ BOOST_AUTO_TEST_CASE( Saltsol ) { "1 2/\n" "\n" "SALTSOL\n" - "8.0/\n" - "9.0/\n" + "8.0 2170.0/\n" + "9.0 2100.0/\n" "\n" ; @@ -173,4 +173,5 @@ BOOST_AUTO_TEST_CASE( Saltsol ) { BOOST_CHECK_EQUAL(saltsolTable2.getSaltsolColumn().size(), 1U); BOOST_CHECK_CLOSE(saltsolTable2.getSaltsolColumn() [0], 9.0, 1e-5); + BOOST_CHECK_CLOSE(saltsolTable2.getSaltdenColumn() [0], 2100.0, 1e-5); }