From ec1e26abb6e25c1086eed7f5b4582e3f828fc4a8 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Wed, 22 Apr 2020 12:55:30 +0200
Subject: [PATCH] [parameters][mpfa] capitalize parameter group MPFA and
deprecate
---
dumux/common/parameters.hh | 2 +-
dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh | 4 ++--
dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index 9dee178993..2182cbb3e0 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -331,7 +331,7 @@ private:
defaultParams["Vtk.AddProcessRank"] = "true";
// parameters in the mpfa group
- defaultParams["Mpfa.Q"] = "0.0";
+ defaultParams["MPFA.Q"] = "0.0";
// merge the global default tree but do not overwrite if the parameter already exists
mergeTree_(params, defaultParams, false);
diff --git a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
index b4e0d84987..50edf268d3 100644
--- a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
@@ -343,7 +343,7 @@ private:
const auto& neighborVolVarIndices = gridGeometry().neighborVolVarIndices(eIdx);
// the quadrature point parameterizaion to be used on scvfs
- static const auto q = getParam<CoordScalar>("Mpfa.Q");
+ static const auto q = getParam<CoordScalar>("MPFA.Q");
// reserve memory for the scv faces
const auto numLocalScvf = scvFaceIndices.size();
@@ -430,7 +430,7 @@ private:
const auto& neighborVolVarIndices = gridGeometry().neighborVolVarIndices(eIdxGlobal);
// the quadrature point parameterizaion to be used on scvfs
- static const auto q = getParam<CoordScalar>("Mpfa.Q");
+ static const auto q = getParam<CoordScalar>("MPFA.Q");
// for network grids we only want to do one scvf per half facet
// this approach assumes conforming grids at branching facets
diff --git a/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
index 70131a9314..772ac838c8 100644
--- a/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
@@ -278,7 +278,7 @@ public:
secondaryInteractionVolumeVertices_[vIdxGlobal] = true;
// the quadrature point parameterizarion to be used on scvfs
- static const auto q = getParam<CoordScalar>("Mpfa.Q");
+ static const auto q = getParam<CoordScalar>("MPFA.Q");
// make the scv face (for non-boundary scvfs on network grids, use precalculated outside indices)
const auto& outsideScvIndices = [&] ()
--
GitLab