finalizeSaltTables

This commit is contained in:
Cintia Goncalves Machado
2020-05-30 11:41:01 +02:00
parent 88f8313568
commit 628afd7abe
13 changed files with 542 additions and 14 deletions

View File

@@ -29,7 +29,10 @@
// generic table classes
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SaltvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SaltpvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PermfactTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
// keyword specific table classes
@@ -53,26 +56,40 @@ BOOST_AUTO_TEST_CASE( Brine ) {
"1 1/\n"
"\n"
"PVTWSALT\n"
" 1000/\n"
" 1000 0.0/\n"
" 0 1 2 3 4 \n"
" 10 11 12 13 14/\n"
" \n"
"\n"
"RWGSALT\n"
" 300 0.0 0.00013/ \n"
" 600 0.5 0.000132/ \n"
"/ \n"
"PERMFACT\n"
"0 0 \n"
"0.5 0.5 \n"
"1 1 \n"
"1.5 1.5/\n"
"\n"
"BDENSITY\n"
" 1000 1050 /\n"
"\n"
"EQLDIMS\n"
"1 /\n"
"\n"
"SALTVD\n"
"500 0\n"
"550 50/\n";
"SALTVD\n"
"500 0\n"
"550 50/\n"
"\n"
"SALTPVD\n"
"500 0\n"
"550 0.5/\n";
Opm::Parser parser;
auto deck = parser.parseString(deckData);
Opm::TableManager tables(deck);
const auto& PvtwsaltTables = tables.getPvtwSaltTables( );
BOOST_CHECK_EQUAL( 1 , PvtwsaltTables.size() );
BOOST_CHECK_EQUAL(1 , PvtwsaltTables.size() );
BOOST_CHECK_EQUAL(2, PvtwsaltTables[0].size());
const auto& PvtwsaltTable1 = PvtwsaltTables[0];
@@ -89,6 +106,21 @@ BOOST_AUTO_TEST_CASE( Brine ) {
BOOST_CHECK_CLOSE (PvtwsaltTable1.getViscosityColumn()[1], 13*0.001, 1e-5);
BOOST_CHECK_CLOSE (PvtwsaltTable1.getReferencePressureValue(), 1000*1e5, 1e-5);
const auto& RwgsaltTables = tables.getRwgSaltTables( );
BOOST_CHECK_EQUAL(2 , RwgsaltTables.size() );
BOOST_CHECK_EQUAL(3, RwgsaltTables[0].size());
const auto& RwgsaltTable1 = RwgsaltTables[0];
BOOST_CHECK_EQUAL (RwgsaltTable1.getPressureColumn().size(), 2);
BOOST_CHECK_CLOSE (RwgsaltTable1.getPressureColumn()[1], 600, 1e-5);
BOOST_CHECK_EQUAL (RwgsaltTable1.getSaltConcentrationColumn().size(), 2);
BOOST_CHECK_CLOSE (RwgsaltTable1.getSaltConcentrationColumn()[1], 0.5, 1e-5);
BOOST_CHECK_EQUAL (RwgsaltTable1.getVaporizedWaterGasRatioColumn().size(), 2);
BOOST_CHECK_CLOSE (RwgsaltTable1.getVaporizedWaterGasRatioColumn()[0], 0.00013, 1e-5);
const auto& BdensityTables = tables.getBrineDensityTables( );
const auto& BdensityTable1 = BdensityTables[0];
@@ -100,9 +132,21 @@ BOOST_AUTO_TEST_CASE( Brine ) {
const Opm::TableContainer& saltvdTables = tables.getSaltvdTables();
const auto& saltvdTable = saltvdTables.getTable<Opm::SaltvdTable>(0);
BOOST_CHECK_EQUAL(saltvdTable.getDepthColumn() .size(), 2);
BOOST_CHECK_EQUAL(saltvdTable.getDepthColumn().size(), 2);
BOOST_CHECK_CLOSE (saltvdTable.getSaltColumn() [1],50, 1e-5);
const Opm::TableContainer& saltpvdTables = tables.getSaltpvdTables();
const auto& saltpvdTable = saltpvdTables.getTable<Opm::SaltpvdTable>(0);
BOOST_CHECK_EQUAL(saltpvdTable.getDepthColumn().size(), 2);
BOOST_CHECK_CLOSE(saltpvdTable.getSaltpColumn() [1],0.5, 1e-5);
const Opm::TableContainer& permfactTables = tables.getPermfactTables();
const auto& permfactTable = permfactTables.getTable<Opm::PermfactTable>(0);
BOOST_CHECK_EQUAL(permfactTable.getPorosityChangeColumn().size(), 4);
BOOST_CHECK_CLOSE(permfactTable.getPermeabilityMultiplierColumn() [1],1.5, 1e-5);
}