OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use VFPProdTable constructor

Browse Source
This commit is contained in:
Joakim Hove 2018-04-12 17:28:41 +02:00
parent 63dabb4777
commit 4e7213b97a
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/test_vfpproperties.cpp
View File

@ -373,8 +373,7 @@ struct TrivialFixture {
inline void initProperties() { inline void initProperties() {
//Initialize table table.reset(new Opm::VFPProdTable(1,
table.init(table_ids[0],
1000.0, 1000.0,
Opm::VFPProdTable::FLO_OIL, Opm::VFPProdTable::FLO_OIL,
Opm::VFPProdTable::WFR_WOR, Opm::VFPProdTable::WFR_WOR,
@ -385,10 +384,9 @@ struct TrivialFixture {
wfr_axis, wfr_axis,
gfr_axis, gfr_axis,
alq_axis, alq_axis,
data); data));
//Initialize properties that use the table properties.reset(new Opm::VFPProdProperties(table.get()));
properties.reset(new Opm::VFPProdProperties(&table));
} }
@ -403,7 +401,7 @@ struct TrivialFixture {
} }
std::shared_ptr<Opm::VFPProdProperties> properties; std::shared_ptr<Opm::VFPProdProperties> properties;
Opm::VFPProdTable table; std::shared_ptr<Opm::VFPProdTable> table;
std::vector<int> table_ids; std::vector<int> table_ids;
private: private:
@ -461,7 +459,7 @@ BOOST_AUTO_TEST_CASE(GetTable)
ADB qs_adb = ADB::constant(qs_adb_v); ADB qs_adb = ADB::constant(qs_adb_v);
//Check that our reference has not changed //Check that our reference has not changed
Opm::detail::VFPEvaluation ref = Opm::detail::bhp(&table, aqua_d, liquid_d, vapour_d, thp_d, alq_d); Opm::detail::VFPEvaluation ref = Opm::detail::bhp(table.get(), aqua_d, liquid_d, vapour_d, thp_d, alq_d);
BOOST_CHECK_CLOSE(ref.value, 1.0923565702101556, max_d_tol); BOOST_CHECK_CLOSE(ref.value, 1.0923565702101556, max_d_tol);
BOOST_CHECK_CLOSE(ref.dthp, 0.13174065498177251, max_d_tol); BOOST_CHECK_CLOSE(ref.dthp, 0.13174065498177251, max_d_tol);
BOOST_CHECK_CLOSE(ref.dwfr, -1.2298177745501071, max_d_tol); BOOST_CHECK_CLOSE(ref.dwfr, -1.2298177745501071, max_d_tol);
@ -585,9 +583,9 @@ BOOST_AUTO_TEST_CASE(InterpolatePlane)
const double liquid = -m / static_cast<double>(n); const double liquid = -m / static_cast<double>(n);
//Find values that should be in table //Find values that should be in table
double flo = Opm::detail::getFlo(aqua, liquid, vapour, table.getFloType()); double flo = Opm::detail::getFlo(aqua, liquid, vapour, table->getFloType());
double wfr = Opm::detail::getWFR(aqua, liquid, vapour, table.getWFRType()); double wfr = Opm::detail::getWFR(aqua, liquid, vapour, table->getWFRType());
double gfr = Opm::detail::getGFR(aqua, liquid, vapour, table.getGFRType()); double gfr = Opm::detail::getGFR(aqua, liquid, vapour, table->getGFRType());
//Calculate reference //Calculate reference
double reference = thp + 2*wfr + 3*gfr+ 4*alq - 5*flo; double reference = thp + 2*wfr + 3*gfr+ 4*alq - 5*flo;
@ -640,9 +638,9 @@ BOOST_AUTO_TEST_CASE(ExtrapolatePlane)
const double liquid = -m / static_cast<double>(n); const double liquid = -m / static_cast<double>(n);
//Find values that should be in table //Find values that should be in table
double v = Opm::detail::getFlo(aqua, liquid, vapour, table.getFloType()); double v = Opm::detail::getFlo(aqua, liquid, vapour, table->getFloType());
double y = Opm::detail::getWFR(aqua, liquid, vapour, table.getWFRType()); double y = Opm::detail::getWFR(aqua, liquid, vapour, table->getWFRType());
double z = Opm::detail::getGFR(aqua, liquid, vapour, table.getGFRType()); double z = Opm::detail::getGFR(aqua, liquid, vapour, table->getGFRType());
double reference = x + 2*y + 3*z+ 4*u - 5*v; double reference = x + 2*y + 3*z+ 4*u - 5*v;
reference_sum += reference; reference_sum += reference;
@ -727,9 +725,9 @@ BOOST_AUTO_TEST_CASE(ExtrapolatePlaneADB)
double reference = 0.0; double reference = 0.0;
for (int w=0; w < num_wells; ++w) { for (int w=0; w < num_wells; ++w) {
//Find values that should be in table //Find values that should be in table
double v = Opm::detail::getFlo(aqua*(w+1), liquid*(w+1), vapour*(w+1), table.getFloType()); double v = Opm::detail::getFlo(aqua*(w+1), liquid*(w+1), vapour*(w+1), table->getFloType());
double y = Opm::detail::getWFR(aqua*(w+1), liquid*(w+1), vapour*(w+1), table.getWFRType()); double y = Opm::detail::getWFR(aqua*(w+1), liquid*(w+1), vapour*(w+1), table->getWFRType());
double z = Opm::detail::getGFR(aqua*(w+1), liquid*(w+1), vapour*(w+1), table.getGFRType()); double z = Opm::detail::getGFR(aqua*(w+1), liquid*(w+1), vapour*(w+1), table->getGFRType());
reference = x*(w+1) + 2*y + 3*z + 4*u*(w+1) - 5*v; reference = x*(w+1) + 2*y + 3*z + 4*u*(w+1) - 5*v;
value = bhp_val[w]; value = bhp_val[w];
@ -879,9 +877,9 @@ BOOST_AUTO_TEST_CASE(PartialDerivatives)
const double liquid = -m / static_cast<double>(n); const double liquid = -m / static_cast<double>(n);
//Find values that should be in table //Find values that should be in table
double flo = Opm::detail::getFlo(aqua, liquid, vapour, table.getFloType()); double flo = Opm::detail::getFlo(aqua, liquid, vapour, table->getFloType());
double wfr = Opm::detail::getWFR(aqua, liquid, vapour, table.getWFRType()); double wfr = Opm::detail::getWFR(aqua, liquid, vapour, table->getWFRType());
double gfr = Opm::detail::getGFR(aqua, liquid, vapour, table.getGFRType()); double gfr = Opm::detail::getGFR(aqua, liquid, vapour, table->getGFRType());
//Calculate reference //Calculate reference
VFPEvaluation reference; VFPEvaluation reference;
@ -894,7 +892,7 @@ BOOST_AUTO_TEST_CASE(PartialDerivatives)
//Calculate actual //Calculate actual
//Note order of arguments: id, aqua, liquid, vapour, thp, alq //Note order of arguments: id, aqua, liquid, vapour, thp, alq
VFPEvaluation actual = Opm::detail::bhp(&table, aqua, liquid, vapour, thp, alq); VFPEvaluation actual = Opm::detail::bhp(table.get(), aqua, liquid, vapour, thp, alq);
VFPEvaluation abs_diff = actual - reference; VFPEvaluation abs_diff = actual - reference;
abs_diff.value = std::abs(abs_diff.value); abs_diff.value = std::abs(abs_diff.value);