From 7ce0eb8e8cd727da1c62778a537810f8bbdc5283 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Wed, 13 Dec 2017 15:23:54 +0100
Subject: [PATCH] [2p1cni] Adapt to changes in base volvars
---
dumux/porousmediumflow/2p1c/implicit/model.hh | 2 +-
dumux/porousmediumflow/2p1c/implicit/volumevariables.hh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dumux/porousmediumflow/2p1c/implicit/model.hh b/dumux/porousmediumflow/2p1c/implicit/model.hh
index c5492164be..7e0178d9c3 100644
--- a/dumux/porousmediumflow/2p1c/implicit/model.hh
+++ b/dumux/porousmediumflow/2p1c/implicit/model.hh
@@ -37,7 +37,7 @@
#include <dumux/porousmediumflow/properties.hh>
#include <dumux/porousmediumflow/immiscible/localresidual.hh>
#include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
+#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
#include <dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh>
diff --git a/dumux/porousmediumflow/2p1c/implicit/volumevariables.hh b/dumux/porousmediumflow/2p1c/implicit/volumevariables.hh
index 019b54ff27..d92ae21ae6 100644
--- a/dumux/porousmediumflow/2p1c/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2p1c/implicit/volumevariables.hh
@@ -27,7 +27,7 @@
#ifndef DUMUX_2P1C_VOLUME_VARIABLES_HH
#define DUMUX_2P1C_VOLUME_VARIABLES_HH
-#include <dumux/discretization/volumevariables.hh>
+#include <dumux/porousmediumflow/volumevariables.hh>
#include <dumux/material/fluidstates/compositional.hh>
#include "indices.hh"
@@ -36,14 +36,14 @@ namespace Dumux
/*!
* \ingroup TwoPOneCModel
- * \ingroup ImplicitVolumeVariables
+ * \ingroup PorousmediumflowVolumeVariables
* \brief Contains the quantities which are are constant within a
* finite volume in the two-phase, two-component model.
*/
template <class TypeTag>
-class TwoPOneCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
+class TwoPOneCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
{
- using ParentType = ImplicitVolumeVariables<TypeTag>;
+ using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
--
GitLab