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

improve unit test for PVTG

Browse Source 
now the data is parsed from a string specified in the source file
instead of a separate file, the PvtgTable utility class is tested and
the order of the fields in the JSON definition of PVTG is the same as
for that of PVTO.
This commit is contained in:
Andreas Lauser
2014-01-16 13:23:13 +01:00
parent 27efd0d1fa
commit 1c39df2d57
5 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/parser/eclipse/IntegrationTests/ParsePVTG.cpp
+39 -5
View File
@@ -4,6 +4,8 @@
#include <boost/test/unit_test.hpp>
#include <boost/test/test_tools.hpp>
#include <opm/parser/eclipse/Utility/PvtgTable.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckDoubleItem.hpp>
@@ -13,16 +15,35 @@
#include <opm/parser/eclipse/Parser/ParserIntItem.hpp>
#include <opm/parser/eclipse/Parser/ParserDoubleItem.hpp>
#include <opm/parser/eclipse/Parser/ParserStringItem.hpp>
#include <opm/parser/eclipse/Parser/ParserEnums.hpp>
using namespace Opm;
const char *pvtgData = "\n\
TABDIMS\n\
-- NTSFUN NTPVT NSSFUN NPPVT NTFIP NRPVT\n\
1 2 30 24 10 20 /\n\
\n\
PVTG\n\
--\n\
20.00 0.00002448 0.061895 0.01299\n\
0.00001224 0.061810 0.01300\n\
0.00000000 0.061725 0.01300 /\n\
40.00 0.00000628 0.030252 0.01383\n\
0.00000314 0.030249 0.01383\n\
0.00000000 0.030245 0.01383 /\n\
/\n\
197.66 0.00006327 0.005820 0.02160\n\
0.00003164 0.005840 0.02122\n\
0.00000000 0.005860 0.02086 /\n\
231.13 0.00010861 0.005042 0.02477\n\
0.00005431 0.005061 0.02389\n\
0.00000000 0.005082 0.02306 /\n\
/\n";
void check_parser(ParserPtr parser) {
boost::filesystem::path pvtgFile("testdata/integration_tests/PVTG/PVTG.txt");
DeckPtr deck = parser->parseFile(pvtgFile.string());
DeckPtr deck = parser->parseString(pvtgData);
DeckKeywordConstPtr kw1 = deck->getKeyword("PVTG" , 0);
BOOST_CHECK_EQUAL(5U , kw1->size());
@@ -64,9 +85,22 @@ void check_parser(ParserPtr parser) {
BOOST_CHECK_EQUAL(9U , item4_1->size());
BOOST_CHECK_EQUAL(2U , record4->size());
Opm::PvtgTable pvtgTable(kw1, /*tableIdx=*/0);
const auto &outerTable = *pvtgTable.getOuterTable();
const auto &innerTable0 = *pvtgTable.getInnerTable(0);
BOOST_CHECK_EQUAL(2, outerTable.numRows());
BOOST_CHECK_EQUAL(4, outerTable.numColumns());
BOOST_CHECK_EQUAL(3, innerTable0.numRows());
BOOST_CHECK_EQUAL(3, innerTable0.numColumns());
BOOST_CHECK_EQUAL(20.0e5, outerTable.getPressureColumn()[0]);
BOOST_CHECK_EQUAL(0.00002448, outerTable.getOilSolubilityColumn()[0]);
BOOST_CHECK_EQUAL(outerTable.getOilSolubilityColumn()[0], innerTable0.getOilSolubilityColumn()[0]);
BOOST_CHECK_EQUAL(0.061895, outerTable.getGasFormationFactorColumn()[0]);
BOOST_CHECK_EQUAL(outerTable.getGasFormationFactorColumn()[0], innerTable0.getGasFormationFactorColumn()[0]);
BOOST_CHECK_EQUAL(1.299e-5, outerTable.getGasViscosityColumn()[0]);
BOOST_CHECK_EQUAL(outerTable.getGasViscosityColumn()[0], innerTable0.getGasViscosityColumn()[0]);
}
opm/parser/eclipse/Utility/PvtgInnerTable.hpp
+1 -1
View File
@@ -34,7 +34,7 @@ namespace Opm {
*/
PvtgInnerTable(Opm::DeckKeywordConstPtr keyword, int recordIdx = 0)
: SimpleTable(keyword,
std::vector<std::string>{"P", "BG", "MUG"},
std::vector<std::string>{"RV", "BG", "MUG"},
recordIdx, /*firstEntityOffset=*/1)
{}
opm/parser/eclipse/Utility/PvtgOuterTable.hpp
+2 -2
View File
@@ -32,7 +32,7 @@ namespace Opm {
*/
PvtgOuterTable(Opm::DeckKeywordConstPtr keyword, int tableIdx)
: ParentType(keyword,
std::vector<std::string>{"RV", "P", "BG", "MUG"},
std::vector<std::string>{"P", "RV", "BG", "MUG"},
tableIdx)
{}
@@ -51,7 +51,7 @@ namespace Opm {
const std::vector<double> &getPressureColumn() const
{ return ParentType::getColumn(0); }
const std::vector<double> &getOilSolubilityFactorColumn() const
const std::vector<double> &getOilSolubilityColumn() const
{ return ParentType::getColumn(1); }
const std::vector<double> &getGasFormationFactorColumn() const
opm/parser/share/keywords/P/PVTG
+2 -2
View File
@@ -1,6 +1,6 @@
{"name" : "PVTG" , "size" : {"keyword":"TABDIMS" , "item":"NTPVT"},
{"name" : "PVTG" , "num_tables" : {"keyword":"TABDIMS" , "item":"NTPVT"},
"items" : [
{"name":"GAS_PRESSURE", "value_type" : "FLOAT", "dimension":"P" },
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["1/Rs","1","mu"]}
{"name":"DATA", "size_type" : "ALL" , "value_type":"FLOAT" , "dimension" : ["1/Rs","1","mu"]}
]
}
testdata/integration_tests/PVTG/PVTG.txt
Vendored
-21
View File
@@ -1,21 +0,0 @@
TABDIMS
-- NTSFUN NTPVT NSSFUN NPPVT NTFIP NRPVT
1 2 30 24 10 20 /
PVTG
--
20.00 0.00002448 0.061895 0.01299
0.00001224 0.061810 0.01300
0.00000000 0.061725 0.01300 /
40.00 0.00000628 0.030252 0.01383
0.00000314 0.030249 0.01383
0.00000000 0.030245 0.01383 /
/
197.66 0.00006327 0.005820 0.02160
0.00003164 0.005840 0.02122
0.00000000 0.005860 0.02086 /
231.13 0.00010861 0.005042 0.02477
0.00005431 0.005061 0.02389
0.00000000 0.005082 0.02306 /
/