From 0ddbd4e6befbfd89406df4edd58074fc4341e618 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Tue, 31 Mar 2020 10:57:05 +0200
Subject: [PATCH] [test] Remove deprecation warnings
---
.../2p/test_material_2p_brookscorey.cc | 4 ++--
.../2p/test_material_2p_vangenuchten.cc | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/material/fluidmatrixinteractions/2p/test_material_2p_brookscorey.cc b/test/material/fluidmatrixinteractions/2p/test_material_2p_brookscorey.cc
index 4a58d6037c..ac91436af8 100644
--- a/test/material/fluidmatrixinteractions/2p/test_material_2p_brookscorey.cc
+++ b/test/material/fluidmatrixinteractions/2p/test_material_2p_brookscorey.cc
@@ -17,7 +17,7 @@ namespace Dumux::Test {
template<class Law>
void checkEndPointPc(const typename Law::Params& params)
{
- const auto pcSat = Law::pc(params, Law::sweToSw_(params, 1.0));
+ const auto pcSat = Law::pc(params, Law::sweToSw(params, 1.0));
const auto endPointPc = Law::endPointPc(params);
const auto entryPressure = params.pe();
static constexpr double eps = 1e-10;
@@ -51,7 +51,7 @@ int main(int argc, char** argv) try
Test::checkEndPointPc<BCReg>(params);
const auto sw = Dumux::linspace(0.0, 1.0, 100);
- const auto swNonReg = Dumux::linspace(BCReg::sweToSw_(params, params.thresholdSw()), BCReg::sweToSw_(params, 1.0), 100);
+ const auto swNonReg = Dumux::linspace(BCReg::sweToSw(params, params.thresholdSw()), BCReg::sweToSw(params, 1.0), 100);
Test::runMaterialLawTest<BC, BCReg>("brookscorey", params, sw, swNonReg);
Test::runEffToAbsTest<BCRegEff, BCReg>("brookscorey-efftoabs", params, sw);
diff --git a/test/material/fluidmatrixinteractions/2p/test_material_2p_vangenuchten.cc b/test/material/fluidmatrixinteractions/2p/test_material_2p_vangenuchten.cc
index 3d3fae4512..d932bc576f 100644
--- a/test/material/fluidmatrixinteractions/2p/test_material_2p_vangenuchten.cc
+++ b/test/material/fluidmatrixinteractions/2p/test_material_2p_vangenuchten.cc
@@ -17,7 +17,7 @@ namespace Dumux::Test {
template<class Law>
void checkEndPointPc(const typename Law::Params& params)
{
- const auto pcSat = Law::pc(params, Law::sweToSw_(params, 1.0));
+ const auto pcSat = Law::pc(params, Law::sweToSw(params, 1.0));
const auto endPointPc = Law::endPointPc(params);
static constexpr double eps = 1e-10;
@@ -52,7 +52,7 @@ int main(int argc, char** argv) try
Test::checkEndPointPc<VGReg>(params);
const auto sw = Dumux::linspace(0.0, 1.0, 100);
- const auto swNonReg = Dumux::linspace(VGReg::sweToSw_(params, params.pcLowSw()), VGReg::sweToSw_(params, params.pcHighSw()), 100);
+ const auto swNonReg = Dumux::linspace(VGReg::sweToSw(params, params.pcLowSw()), VGReg::sweToSw(params, params.pcHighSw()), 100);
Test::runMaterialLawTest<VG, VGReg>("vangenuchten", params, sw, swNonReg);
Test::runEffToAbsTest<VGRegEff, VGReg>("vangenuchten-efftoabs", params, sw);
--
GitLab