From 265842dc7edab54e3b174949b766a71338f85bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Fri, 31 Mar 2023 14:24:40 +0200
Subject: [PATCH] [ex][fractures] streamline parameter names
---
exercises/exercise-fractures/fracturespatialparams.hh | 4 ++--
.../solution/exercise-fractures/fracturespatialparams.hh | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/exercises/exercise-fractures/fracturespatialparams.hh b/exercises/exercise-fractures/fracturespatialparams.hh
index 2516ef37..f922c7ff 100644
--- a/exercises/exercise-fractures/fracturespatialparams.hh
+++ b/exercises/exercise-fractures/fracturespatialparams.hh
@@ -70,7 +70,7 @@ public:
: ParentType(gridGeometry)
, gridDataPtr_(gridData)
, pcKrSwCurve_("Fracture.SpatialParams")
- , barrierPcKrSwCurve_("Fracture.SpatialParams.Barrier")
+ , pcKrSwCurveBarrier_("Fracture.SpatialParams.Barrier")
{
porosity_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Porosity");
porosityBarrier_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.PorosityBarrier");
@@ -159,7 +159,7 @@ private:
PermeabilityType permeability_;
PermeabilityType permeabilityBarrier_;
const PcKrSwCurve pcKrSwCurve_;
- const PcKrSwCurve barrierPcKrSwCurve_;
+ const PcKrSwCurve pcKrSwCurveBarrier_;
};
} // end namespace Dumux
diff --git a/exercises/solution/exercise-fractures/fracturespatialparams.hh b/exercises/solution/exercise-fractures/fracturespatialparams.hh
index 6c5969d4..d5936438 100644
--- a/exercises/solution/exercise-fractures/fracturespatialparams.hh
+++ b/exercises/solution/exercise-fractures/fracturespatialparams.hh
@@ -74,7 +74,7 @@ public:
, isExercisePartB_(getParamFromGroup<bool>(paramGroup, "Problem.IsExercisePartB"))
, isExercisePartC_(getParamFromGroup<bool>(paramGroup, "Problem.IsExercisePartC"))
, pcKrSwCurve_("Fracture.SpatialParams")
- , barrierPcKrSwCurve_("Fracture.SpatialParams.Barrier")
+ , PcKrSwCurveBarrier_("Fracture.SpatialParams.Barrier")
{
porosity_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Porosity");
porosityBarrier_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.PorosityBarrier");
@@ -149,13 +149,13 @@ public:
// in exercise part b always return the barrier parameters
else if (isExercisePartB_)
- return makeFluidMatrixInteraction(barrierPcKrSwCurve_);
+ return makeFluidMatrixInteraction(PcKrSwCurveBarrier_);
// in exercise part 3 return parameters depending on domain marker
else
{
if (getElementDomainMarker(element) == barriersDomainMarker)
- return makeFluidMatrixInteraction(barrierPcKrSwCurve_);
+ return makeFluidMatrixInteraction(PcKrSwCurveBarrier_);
else
return makeFluidMatrixInteraction(pcKrSwCurve_);
}
@@ -201,7 +201,7 @@ private:
bool isExercisePartC_;
const PcKrSwCurve pcKrSwCurve_;
- const PcKrSwCurve barrierPcKrSwCurve_;
+ const PcKrSwCurve PcKrSwCurveBarrier_;
Scalar porosity_;
Scalar porosityBarrier_;
--
GitLab