From 4fd1506404ae4b47c62d0eb0e9eeb96faf17eebe Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Tue, 27 Oct 2020 18:35:46 +0100
Subject: [PATCH] [test][2p/chemicalnoneq] Use new make function
---
.../2p2c/implicit/chemicalnonequilibrium/params.input | 7 ++++---
.../2p2c/implicit/chemicalnonequilibrium/spatialparams.hh | 6 +-----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input
index 75971a389a..1b6a94cf71 100644
--- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input
+++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input
@@ -12,9 +12,10 @@ Name = chemicalnonequilibrium
EnableGravity = false
[SpatialParams]
-WettingNonwettingAreaA1 = -1.603e-01
-WettingNonwettingAreaA2 = 1.429e-05
-WettingNonwettingAreaA3 = 1.915e-01
+WettingNonwettingArea.PcMax = 0 # will be overwritten internally
+WettingNonwettingArea.A1 = -1.603e-01
+WettingNonwettingArea.A2 = 1.429e-05
+WettingNonwettingArea.A3 = 1.915e-01
MeanPoreSize = 5e-4
MassTransferFactor = 0.5
BrooksCoreyPcEntry = 1e4
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
index 415d821956..73efbc3e0a 100644
--- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
@@ -74,11 +74,7 @@ public:
characteristicLength_ = getParam<Scalar>("SpatialParams.MeanPoreSize");
factorMassTransfer_ = getParam<Scalar>("SpatialParams.MassTransferFactor");
- using WettingNonwettingInterfacialAreaParams = typename WettingNonwettingInterfacialArea::BasicParams;
- WettingNonwettingInterfacialAreaParams anwParams;
- anwParams.setA1(getParam<Scalar>("SpatialParams.WettingNonwettingAreaA1"));
- anwParams.setA2(getParam<Scalar>("SpatialParams.WettingNonwettingAreaA2"));
- anwParams.setA3(getParam<Scalar>("SpatialParams.WettingNonwettingAreaA3"));
+ auto anwParams = WettingNonwettingInterfacialArea::makeBasicParams("SpatialParams.WettingNonwettingArea");
// determine maximum capillary pressure for wetting-nonwetting surface
anwParams.setPcMax(pcKrSwCurve_.pc(/*sw = */0.0));
--
GitLab