Skip to content
Snippets Groups Projects
Commit 0ddbd4e6 authored by Timo Koch's avatar Timo Koch
Browse files

[test] Remove deprecation warnings

parent 0c9640f2
No related branches found
No related tags found
1 merge request!1874Unit test for material laws
...@@ -17,7 +17,7 @@ namespace Dumux::Test { ...@@ -17,7 +17,7 @@ namespace Dumux::Test {
template<class Law> template<class Law>
void checkEndPointPc(const typename Law::Params& params) 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 endPointPc = Law::endPointPc(params);
const auto entryPressure = params.pe(); const auto entryPressure = params.pe();
static constexpr double eps = 1e-10; static constexpr double eps = 1e-10;
...@@ -51,7 +51,7 @@ int main(int argc, char** argv) try ...@@ -51,7 +51,7 @@ int main(int argc, char** argv) try
Test::checkEndPointPc<BCReg>(params); Test::checkEndPointPc<BCReg>(params);
const auto sw = Dumux::linspace(0.0, 1.0, 100); 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::runMaterialLawTest<BC, BCReg>("brookscorey", params, sw, swNonReg);
Test::runEffToAbsTest<BCRegEff, BCReg>("brookscorey-efftoabs", params, sw); Test::runEffToAbsTest<BCRegEff, BCReg>("brookscorey-efftoabs", params, sw);
......
...@@ -17,7 +17,7 @@ namespace Dumux::Test { ...@@ -17,7 +17,7 @@ namespace Dumux::Test {
template<class Law> template<class Law>
void checkEndPointPc(const typename Law::Params& params) 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 endPointPc = Law::endPointPc(params);
static constexpr double eps = 1e-10; static constexpr double eps = 1e-10;
...@@ -52,7 +52,7 @@ int main(int argc, char** argv) try ...@@ -52,7 +52,7 @@ int main(int argc, char** argv) try
Test::checkEndPointPc<VGReg>(params); Test::checkEndPointPc<VGReg>(params);
const auto sw = Dumux::linspace(0.0, 1.0, 100); 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::runMaterialLawTest<VG, VGReg>("vangenuchten", params, sw, swNonReg);
Test::runEffToAbsTest<VGRegEff, VGReg>("vangenuchten-efftoabs", params, sw); Test::runEffToAbsTest<VGRegEff, VGReg>("vangenuchten-efftoabs", params, sw);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment