From adbee378f75d8d60128b6bb7d373bcc3422ce784 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Wed, 14 Apr 2021 15:17:47 +0200
Subject: [PATCH] [pnm][multishapelocalrules] Deprecate makeParams()
* function doesn't add any value
* use ctor of BasicParams directly
---
.../porenetwork/pore/2p/multishapelocalrules.hh | 1 +
dumux/material/spatialparams/porenetwork/porenetwork2p.hh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dumux/material/fluidmatrixinteractions/porenetwork/pore/2p/multishapelocalrules.hh b/dumux/material/fluidmatrixinteractions/porenetwork/pore/2p/multishapelocalrules.hh
index 68ea4c5a67..5f3bab10a7 100644
--- a/dumux/material/fluidmatrixinteractions/porenetwork/pore/2p/multishapelocalrules.hh
+++ b/dumux/material/fluidmatrixinteractions/porenetwork/pore/2p/multishapelocalrules.hh
@@ -102,6 +102,7 @@ public:
{ return 2; }
template<class SpatialParams, class Element, class SubControlVolume, class ElemSol>
+ [[deprecated("Use constructor of BasicParams directly. Will be removed before release 3.4")]]
static BasicParams makeParams(const SpatialParams& spatialParams,
const Element& element,
const SubControlVolume& scv,
diff --git a/dumux/material/spatialparams/porenetwork/porenetwork2p.hh b/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
index 79bbfe3627..8ec48f9de5 100644
--- a/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
+++ b/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
@@ -185,7 +185,7 @@ public:
const SubControlVolume& scv,
const ElementSolution& elemSol) const
{
- const auto params = LocalRules::makeParams(*this, element, scv, elemSol);
+ const auto params = typename LocalRules::BasicParams(*this, element, scv, elemSol);
return makeFluidMatrixInteraction(LocalRules(params, "SpatialParams"));
}
--
GitLab