From 4b123f839a3b082a38f94b517844aaac8f6718a1 Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Wed, 11 Oct 2017 09:39:12 +0200 Subject: [PATCH] Update the swatinit test base on fix in opm-material#248 --- tests/test_equil.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/test_equil.cpp b/tests/test_equil.cpp index e9b229fae..2bc3cfb72 100644 --- a/tests/test_equil.cpp +++ b/tests/test_equil.cpp @@ -829,6 +829,7 @@ BOOST_AUTO_TEST_CASE (DeckWithSwatinit) { 0, 0, 0, 0.0148267, 0.78528, 0.8, 0.8, 0.8, 0.8, 0.574693, 0.22536, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0.8, 0.8, 0.8, 0.785173, 0.01472, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; + // sw in cell 1-5 is forced to be 0.2 since swl=0.2 // sw in cell 13 and 14 is forced to be swu=1 since P_oil - P_wat < 0. const std::vector swatinit[3]{ { 0.2, 0.2, 0.2, 0.2, 0.2, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 1, 1, 1, 1, 1, 1, 1, 1 }, @@ -857,8 +858,13 @@ BOOST_AUTO_TEST_CASE (DeckWithSwatinit) std::vector pc_scaled_truth = pc_original; - // modify pcow for cell 5 - 11 (where sw is changed due to swatinit) + // modify pcow for cell 1 - 12 (where sw is changed due to swatinit) // for the reference scaled pc. + pc_scaled_truth[3*0 + 0] = 150031.3; + pc_scaled_truth[3*1 + 0] = 136815.6; + pc_scaled_truth[3*2 + 0] = 123612.7; + pc_scaled_truth[3*3 + 0] = 110422.7; + pc_scaled_truth[3*4 + 0] = 97245.4; pc_scaled_truth[3*5 + 0] = 84081; pc_scaled_truth[3*6 + 0] = 70929; pc_scaled_truth[3*7 + 0] = 57791; @@ -867,7 +873,6 @@ BOOST_AUTO_TEST_CASE (DeckWithSwatinit) pc_scaled_truth[3*10 + 0] = 18451.5; pc_scaled_truth[3*11 + 0] = 5364.1; - // compute the initial state // apply swatinit