From 94f5e4b08825a205ce6c3826165748460df7ea0c Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Wed, 27 Jan 2021 17:29:48 +0100
Subject: [PATCH] [Test/RelPermLiakopoulos] Dropped the part for the
Brook-Corey model
---
.../MaterialLib/TestMPLRelPermLiakopoulos.cpp | 31 +++----------------
1 file changed, 4 insertions(+), 27 deletions(-)
diff --git a/Tests/MaterialLib/TestMPLRelPermLiakopoulos.cpp b/Tests/MaterialLib/TestMPLRelPermLiakopoulos.cpp
index 00b1a2df765..240dcead842 100644
--- a/Tests/MaterialLib/TestMPLRelPermLiakopoulos.cpp
+++ b/Tests/MaterialLib/TestMPLRelPermLiakopoulos.cpp
@@ -48,13 +48,6 @@ TEST(MaterialPropertyLib, RelPermLiakopoulos)
6.7646274501E-01, 7.8536411514E-01, 8.9357837782E-01, 1.0000000000E+00,
1.0000000000E+00};
- std::array<double, 17> ref_k_rel_G = {
- 1.0000000000E+00, 1.0000000000E+00, 1.0000000000E+00, 1.0000000000E+00,
- 8.7025505871E-01, 7.4169921875E-01, 5.0669293177E-01, 3.1445005531E-01,
- 1.7125493438E-01, 7.6376563369E-02, 4.5357912805E-02, 2.3805540052E-02,
- 1.0284395970E-02, 3.1176074364E-03, 3.9836380435E-04, 1.0000000000E-04,
- 1.0000000000E-04};
-
std::array<double, 17> ref_dk_rel_L_ds_L = {
2.2276817495E+00, 2.2276817495E+00, 2.2276817495E+00, 2.2276817495E+00,
2.2259427960E+00, 2.2240853238E+00, 2.2199407746E+00, 2.2150487817E+00,
@@ -62,14 +55,6 @@ TEST(MaterialPropertyLib, RelPermLiakopoulos)
2.1830137051E+00, 2.1723297907E+00, 2.1541864761E+00, 0.0000000000E+00,
0.0000000000E+00};
- std::array<double, 17> ref_dk_rel_G_ds_L = {
- -2.5000000000E+00, -2.5000000000E+00, -2.5000000000E+00,
- -2.5000000000E+00, -2.6090531996E+00, -2.5179036458E+00,
- -2.1540353412E+00, -1.6809943584E+00, -1.1843791120E+00,
- -7.2333854456E-01, -5.2134311212E-01, -3.4554001149E-01,
- -2.0089926430E-01, -9.2131654833E-02, -2.3729854831E-02,
- 0.0000000000E+00, 0.0000000000E+00};
-
for (size_t idx = 0; idx < ref_saturation.size(); idx++)
{
std::stringstream m_sat;
@@ -87,26 +72,18 @@ TEST(MaterialPropertyLib, RelPermLiakopoulos)
medium
->property(
MaterialPropertyLib::PropertyType::relative_permeability)
- .template value<Eigen::Vector2d>(variable_array, pos, time, dt);
+ .template value<double>(variable_array, pos, time, dt);
auto dk_rel_ds_L =
medium
->property(
MaterialPropertyLib::PropertyType::relative_permeability)
- .template dValue<Eigen::Vector2d>(
+ .template dValue<double>(
variable_array,
MaterialPropertyLib::Variable::liquid_saturation, pos, time,
dt);
- auto k_rel_L = k_rel[0];
- auto k_rel_G = k_rel[1];
-
- auto dk_rel_L_ds_L = dk_rel_ds_L[0];
- auto dk_rel_G_ds_L = dk_rel_ds_L[1];
-
- ASSERT_NEAR(k_rel_L, ref_k_rel_L[idx], 1.0e-10);
- ASSERT_NEAR(k_rel_G, ref_k_rel_G[idx], 1.0e-10);
- ASSERT_NEAR(dk_rel_L_ds_L, ref_dk_rel_L_ds_L[idx], 1.0e-10);
- ASSERT_NEAR(dk_rel_G_ds_L, ref_dk_rel_G_ds_L[idx], 1.0e-10);
+ ASSERT_NEAR(k_rel, ref_k_rel_L[idx], 1.0e-10);
+ ASSERT_NEAR(dk_rel_ds_L, ref_dk_rel_L_ds_L[idx], 1.0e-10);
}
}
--
GitLab