From 0be3f2c76f23b0e3a9537970fbcb98f42fb503eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Thu, 12 Jul 2018 00:41:09 +0200 Subject: [PATCH] Unit Tests: Supply Enough Parameters for data::Connection We must provide cell_pressure, cell_saturation_water, cell_saturation_gas, and effective_Kh. Forgotten in commit 687f108. --- tests/test_RFT.cpp | 8 ++++---- tests/test_Restart.cpp | 6 +++--- tests/test_Summary.cpp | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/test_RFT.cpp b/tests/test_RFT.cpp index dacc158e6..8cde5764b 100644 --- a/tests/test_RFT.cpp +++ b/tests/test_RFT.cpp @@ -135,12 +135,12 @@ BOOST_AUTO_TEST_CASE(test_RFT) { std::vector well1_comps(9); for (size_t i = 0; i < 9; ++i) { - Opm::data::Connection well_comp { grid.getGlobalIndex(8,8,i) ,r1, 0.0 , 0.0, (double)i, 0.1*i,0.2*i}; + Opm::data::Connection well_comp { grid.getGlobalIndex(8,8,i) ,r1, 0.0 , 0.0, (double)i, 0.1*i,0.2*i, 1.2e3}; well1_comps[i] = well_comp; } std::vector well2_comps(6); for (size_t i = 0; i < 6; ++i) { - Opm::data::Connection well_comp { grid.getGlobalIndex(3,3,i+3) ,r2, 0.0 , 0.0, (double)i, i*0.1,i*0.2}; + Opm::data::Connection well_comp { grid.getGlobalIndex(3,3,i+3) ,r2, 0.0 , 0.0, (double)i, i*0.1,i*0.2, 0.15}; well2_comps[i] = well_comp; } @@ -227,12 +227,12 @@ BOOST_AUTO_TEST_CASE(test_RFT2) { std::vector well1_comps(9); for (size_t i = 0; i < 9; ++i) { - Opm::data::Connection well_comp { grid.getGlobalIndex(8,8,i) ,r1, 0.0 , 0.0, (double)i, 0.1*i,0.2*i}; + Opm::data::Connection well_comp { grid.getGlobalIndex(8,8,i) ,r1, 0.0 , 0.0, (double)i, 0.1*i,0.2*i, 3.14e5}; well1_comps[i] = well_comp; } std::vector well2_comps(6); for (size_t i = 0; i < 6; ++i) { - Opm::data::Connection well_comp { grid.getGlobalIndex(3,3,i+3) ,r2, 0.0 , 0.0, (double)i, i*0.1,i*0.2}; + Opm::data::Connection well_comp { grid.getGlobalIndex(3,3,i+3) ,r2, 0.0 , 0.0, (double)i, i*0.1,i*0.2, 355.113}; well2_comps[i] = well_comp; } diff --git a/tests/test_Restart.cpp b/tests/test_Restart.cpp index a56e090e0..5861c20e0 100644 --- a/tests/test_Restart.cpp +++ b/tests/test_Restart.cpp @@ -300,14 +300,14 @@ data::Wells mkWells() { * the completion keys (active indices) and well names correspond to the * input deck. All other entries in the well structures are arbitrary. */ - w1.connections.push_back( { 88, rc1, 30.45, 123.4 } ); - w1.connections.push_back( { 288, rc2, 33.19, 123.4 } ); + w1.connections.push_back( { 88, rc1, 30.45, 123.4, 543.21, 0.62, 0.15, 1.0e3 } ); + w1.connections.push_back( { 288, rc2, 33.19, 123.4, 432.1, 0.26, 0.45, 2.56 } ); w2.rates = r2; w2.bhp = 2.34; w2.temperature = 4.56; w2.control = 2; - w2.connections.push_back( { 188, rc3, 36.22, 123.4 } ); + w2.connections.push_back( { 188, rc3, 36.22, 123.4, 256.1, 0.55, 0.0125, 314.15 } ); { data::Wells wellRates; diff --git a/tests/test_Summary.cpp b/tests/test_Summary.cpp index 6892827a5..2dd5c21c6 100644 --- a/tests/test_Summary.cpp +++ b/tests/test_Summary.cpp @@ -146,10 +146,10 @@ static data::Wells result_wells() { syncronized with the global index in the COMPDAT keyword in the input deck. */ - data::Connection well1_comp1 { 0 , crates1, 1.9 , 123.4}; - data::Connection well2_comp1 { 1 , crates2, 1.10 , 123.4}; - data::Connection well2_comp2 { 101, crates3, 1.11 , 123.4}; - data::Connection well3_comp1 { 2 , crates3, 1.11 , 123.4}; + data::Connection well1_comp1 { 0 , crates1, 1.9 , 123.4, 314.15, 0.35, 0.25, 2.718e2}; + data::Connection well2_comp1 { 1 , crates2, 1.10 , 123.4, 212.1, 0.78, 0.0, 12.34}; + data::Connection well2_comp2 { 101, crates3, 1.11 , 123.4, 150.6, 0.001, 0.89, 100.0}; + data::Connection well3_comp1 { 2 , crates3, 1.11 , 123.4, 456.78, 0.0, 0.15, 432.1}; /* The completions