From 6110a76b5c08a8e18e243b2b6dbd214ff393772c Mon Sep 17 00:00:00 2001
From: Beatrix Becker <beatrix.becker@iws.uni-stuttgart.de>
Date: Mon, 4 Apr 2016 15:32:15 +0200
Subject: [PATCH] [sequential pressure-module] make EntryType, rhs and matrix
protected instead of private to use it in derived class This is similar to
what is done in the non-adaptive pressure module.
---
.../diffusion/cellcentered/pressureadaptive.hh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureadaptive.hh
index 0a8bf5a15a..6ce09e210b 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureadaptive.hh
@@ -75,17 +75,19 @@ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag>
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx, numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- enum
- {
- rhs = ParentType::rhs, matrix = ParentType::matrix
- };
-
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
+protected:
+ //! \cond \private
typedef typename ParentType::EntryType EntryType;
+ enum
+ {
+ rhs = ParentType::rhs, matrix = ParentType::matrix
+ };
+ //! \endcond
public:
// Function which calculates the flux entry
--
GitLab