Added keywords PVTWSALT and modified SALTVD, WSALT and BDENSITY for a simple salt/brine implementation

2019-08-28 11:20:25 +02:00
parent 5fd756699e
commit aa19f38a54
24 changed files with 747 additions and 18 deletions
--- a/tests/parser/SaltTableTests.cpp
+++ b/tests/parser/SaltTableTests.cpp
@@ -0,0 +1,111 @@
+/*
+  Copyright (C) 2019 by Norce
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define BOOST_TEST_MODULE SaltTableTests
+
+#include <boost/test/unit_test.hpp>
+
+#include <opm/parser/eclipse/Parser/ParserKeywords/P.hpp>
+#include <opm/parser/eclipse/Parser/Parser.hpp>
+#include <opm/parser/eclipse/Deck/Deck.hpp>
+#include <opm/parser/eclipse/Units/UnitSystem.hpp>
+
+// 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/SaltvdTable.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
+
+// keyword specific table classes
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/filesystem.hpp>
+
+#include <stdexcept>
+#include <iostream>
+
+using namespace Opm;
+
+inline std::string prefix() {
+    return boost::unit_test::framework::master_test_suite().argv[1];
+}
+
+
+BOOST_AUTO_TEST_CASE( Brine ) {
+    const char *deckData =
+        "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"
+        "EQLDIMS\n"
+        "1 /\n"
+        "\n"
+    "SALTVD\n"
+    "500 0\n"
+    "550 50/\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(2, PvtwsaltTables[0].size());
+
+    const auto& PvtwsaltTable1 = PvtwsaltTables[0];
+    BOOST_CHECK_EQUAL (PvtwsaltTable1.getSaltConcentrationColumn().size(), 2);
+    BOOST_CHECK_CLOSE (PvtwsaltTable1.getSaltConcentrationColumn()[1], 10, 1e-5);
+
+    BOOST_CHECK_EQUAL (PvtwsaltTable1.getFormationVolumeFactorColumn().size(), 2);
+    BOOST_CHECK_CLOSE (PvtwsaltTable1.getFormationVolumeFactorColumn()[0], 1, 1e-5);
+
+    BOOST_CHECK_EQUAL (PvtwsaltTable1.getCompressibilityColumn().size(), 2);
+    BOOST_CHECK_CLOSE (PvtwsaltTable1.getCompressibilityColumn()[1], 12/1e5, 1e-5);
+
+    BOOST_CHECK_EQUAL (PvtwsaltTable1.getViscosityColumn().size(), 2);
+    BOOST_CHECK_CLOSE (PvtwsaltTable1.getViscosityColumn()[1], 13*0.001, 1e-5);
+
+    BOOST_CHECK_CLOSE (PvtwsaltTable1.getReferencePressureValue(), 1000*1e5, 1e-5);
+
+    const auto& BdensityTables = tables.getBrineDensityTables( );
+    const auto& BdensityTable1 = BdensityTables[0];
+
+    BOOST_CHECK_EQUAL( 1 , BdensityTables.size() );
+    BOOST_CHECK_EQUAL (BdensityTable1.getBrineDensityColumn().size(), 2);
+    BOOST_CHECK_CLOSE (BdensityTable1.getBrineDensityColumn()[1], 1050, 1e-5);
+
+    const Opm::TableContainer& saltvdTables = tables.getSaltvdTables();
+    const auto& saltvdTable = saltvdTables.getTable<Opm::SaltvdTable>(0);
+
+    BOOST_CHECK_EQUAL(saltvdTable.getDepthColumn() .size(), 2);
+    BOOST_CHECK_CLOSE (saltvdTable.getSaltColumn() [1],50, 1e-5);
+
+
+}
+
+
+
+