[2p1cni] Adapt to changes in base volvars

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>
 

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);