From 02a855841d4948d6f5200ddbd7151edeca8cb2dd Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 1 Dec 2017 13:44:42 +0100
Subject: [PATCH] [richards] Cleanup newton controller
---
.../porousmediumflow/richards/implicit/newtoncontroller.hh | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh b/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh
index 842d7bd673..8ac8c4d398 100644
--- a/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh
+++ b/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh
@@ -44,7 +44,6 @@ class RichardsNewtonController : public NewtonController<TypeTag>
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
- using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLawParams);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Communicator = typename GridView::CollectiveCommunication;
@@ -53,10 +52,6 @@ class RichardsNewtonController : public NewtonController<TypeTag>
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum { pressureIdx = Indices::pressureIdx };
- enum { dim = GridView::dimension };
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
- enum { dofCodim = isBox ? dim : 0 };
-
public:
/*!
* \brief Constructor for stationary problems
@@ -111,7 +106,7 @@ public:
// calculate the old wetting phase saturation
const auto& spatialParams = assembler.problem().spatialParams();
const ElementSolution elemSol(element, uCurrentIter, fvGridGeometry);
- const MaterialLawParams &materialLawParams = spatialParams.materialLawParams(element, scv, elemSol);
+ const auto& materialLawParams = spatialParams.materialLawParams(element, scv, elemSol);
const Scalar pcMin = MaterialLaw::pc(materialLawParams, 1.0);
const Scalar pw = uLastIter[dofIdxGlobal][pressureIdx];
using std::max;
--
GitLab