[pmflow] Fix missing includes

dumux/porousmediumflow/1p/vtkoutputfields.hh

@@ -24,8 +24,7 @@
 #ifndef DUMUX_ONEP_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_ONEP_VTK_OUTPUT_FIELDS_HH
 
-namespace Dumux
-{
+namespace Dumux {
 
 /*!
  * \ingroup OnePModel
@@ -34,7 +33,6 @@ namespace Dumux
 template<class TypeTag>
 class OnePVtkOutputFields
 {
-    using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
 public:
     template <class VtkOutputModule>
     static void init(VtkOutputModule& vtk)

dumux/porousmediumflow/1pnc/volumevariables.hh

@@ -25,6 +25,7 @@
 #ifndef DUMUX_1PNC_VOLUME_VARIABLES_HH
 #define DUMUX_1PNC_VOLUME_VARIABLES_HH
 
+#include <dune/common/fvector.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/volumevariables.hh>
 

dumux/porousmediumflow/1pnc/vtkoutputfields.hh

@@ -24,8 +24,9 @@
 #ifndef DUMUX_ONEPNC_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_ONEPNC_VTK_OUTPUT_FIELDS_HH
 
-namespace Dumux
-{
+#include <dumux/common/properties.hh>
+
+namespace Dumux {
 
 /*!
  * \ingroup OnePNCModel

dumux/porousmediumflow/1pncmin/implicit/properties.hh

@@ -29,13 +29,11 @@
 #ifndef DUMUX_1PNCMIN_PROPERTIES_HH
 #define DUMUX_1PNCMIN_PROPERTIES_HH
 
-#include <dumux/porousmediumflow/1pnc/properties.hh>
+#include <dumux/porousmediumflow/1pnc/model.hh>
 
-namespace Dumux
-{
+namespace Dumux {
+namespace Properties {
 
-namespace Properties
-{
 //////////////////////////////////////////////////////////////////
 // Type tags
 //////////////////////////////////////////////////////////////////

dumux/porousmediumflow/2p/gridadaptindicator.hh

@@ -25,9 +25,12 @@
 #ifndef DUMUX_TWOP_ADAPTION_INDICATOR_HH
 #define DUMUX_TWOP_ADAPTION_INDICATOR_HH
 
+#include <memory>
 #include <dune/common/exceptions.hh>
+#include <dune/grid/common/partitionset.hh>
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/parameters.hh>
 #include <dumux/discretization/evalsolution.hh>
 
 namespace Dumux

dumux/porousmediumflow/2p/griddatatransfer.hh

@@ -24,6 +24,9 @@
 #ifndef DUMUX_TWOP_GRIDDATA_TRANSFER_HH
 #define DUMUX_TWOP_GRIDDATA_TRANSFER_HH
 
+#include <memory>
+
+#include <dune/grid/common/partitionset.hh>
 #include <dune/grid/utility/persistentcontainer.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/discretization/methods.hh>

dumux/porousmediumflow/2p/incompressiblelocalresidual.hh

@@ -25,6 +25,9 @@
 #ifndef DUMUX_2P_INCOMPRESSIBLE_TEST_LOCAL_RESIDUAL_HH
 #define DUMUX_2P_INCOMPRESSIBLE_TEST_LOCAL_RESIDUAL_HH
 
+#include <cmath>
+#include <dumux/common/properties.hh>
+#include <dumux/common/parameters.hh>
 #include <dumux/discretization/methods.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
 

dumux/porousmediumflow/2p/vtkoutputfields.hh

@@ -24,8 +24,9 @@
 #ifndef DUMUX_TWOP_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_TWOP_VTK_OUTPUT_FIELDS_HH
 
-namespace Dumux
-{
+#include <dumux/common/properties.hh>
+
+namespace Dumux {
 
 /*!
  * \ingroup TwoPModel

dumux/porousmediumflow/2p1c/indices.hh

@@ -25,8 +25,9 @@
 #ifndef DUMUX_2P1C_INDICES_HH
 #define DUMUX_2P1C_INDICES_HH
 
-namespace Dumux
-{
+#include <dumux/common/properties.hh>
+
+namespace Dumux {
 
 /*!
  * \ingroup TwoPOneCModel

dumux/porousmediumflow/2p2c/volumevariables.hh

@@ -31,8 +31,9 @@
 #include <dumux/porousmediumflow/volumevariables.hh>
 #include <dumux/discretization/methods.hh>
 
-namespace Dumux
-{
+#include "indices.hh" // for formulation
+
+namespace Dumux {
 
 /*!
  * \ingroup TwoPTwoCModel

dumux/porousmediumflow/2pnc/indices.hh

@@ -25,8 +25,10 @@
 #ifndef DUMUX_2PNC_INDICES_HH
 #define DUMUX_2PNC_INDICES_HH
 
-namespace Dumux
-{
+#include <dumux/common/properties.hh>
+
+namespace Dumux {
+
 /*!
  * \ingroup TwoPNCModel
  * \brief Enumerates the formulations which the two-phase n-component model accepts.

dumux/porousmediumflow/2pnc/primaryvariableswitch.hh

@@ -25,6 +25,7 @@
 #define DUMUX_2PNC_PRIMARY_VARIABLE_SWITCH_HH
 
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
+#include "indices.hh" // for formulation
 
 namespace Dumux
 {

dumux/porousmediumflow/2pnc/volumevariables.hh

@@ -30,13 +30,14 @@
 
 #include <dumux/common/math.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/discretization/methods.hh>
 
 #include <dumux/material/fluidstates/compositional.hh>
 #include <dumux/porousmediumflow/volumevariables.hh>
 #include <dumux/material/constraintsolvers/computefromreferencephase.hh>
 #include <dumux/material/constraintsolvers/miscible2pnccomposition.hh>
 
-#include "indices.hh"
+#include "indices.hh" // for formulation
 
 namespace Dumux
 {

dumux/porousmediumflow/2pnc/vtkoutputfields.hh

@@ -24,6 +24,7 @@
 #ifndef DUMUX_TWOP_NC_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_TWOP_NC_VTK_OUTPUT_FIELDS_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/2p/vtkoutputfields.hh>
 
 namespace Dumux

dumux/porousmediumflow/3pwateroil/volumevariables.hh

@@ -25,22 +25,22 @@
 #ifndef DUMUX_3P2CNI_VOLUME_VARIABLES_HH
 #define DUMUX_3P2CNI_VOLUME_VARIABLES_HH
 
-#include <dumux/common/math.hh>
-
-#include <dune/common/parallel/collectivecommunication.hh>
 #include <vector>
 #include <iostream>
 
+#include <dune/common/deprecated.hh>
+
+#include <dumux/common/math.hh>
+#include <dumux/common/properties.hh>
+#include <dumux/discretization/methods.hh>
 #include <dumux/porousmediumflow/volumevariables.hh>
 
 #include <dumux/material/constants.hh>
 #include <dumux/material/fluidstates/compositional.hh>
 #include <dumux/material/constraintsolvers/computefromreferencephase.hh>
 #include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
-#include <dune/common/deprecated.hh>
 
-namespace Dumux
-{
+namespace Dumux {
 
 /*!
  * \ingroup ThreePWaterOilModel
@@ -99,7 +99,7 @@ class ThreePWaterOilVolumeVariables : public PorousMediumFlowVolumeVariables<Typ
 
     static const Scalar R; // universial gas constant
 
-     enum { isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box };
+    enum { isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box };
     enum { dofCodim = isBox ? dim : 0 };
 
 public:

dumux/porousmediumflow/co2/primaryvariableswitch.hh

@@ -25,6 +25,7 @@
 #define DUMUX_2P2C_CO2_PRIMARY_VARIABLE_SWITCH_HH
 
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
+#include <dumux/porousmediumflow/2p2c/indices.hh> // for formulation
 
 namespace Dumux
 {

dumux/porousmediumflow/compositional/localresidual.hh

@@ -25,13 +25,10 @@
 #ifndef DUMUX_COMPOSITIONAL_LOCAL_RESIDUAL_HH
 #define DUMUX_COMPOSITIONAL_LOCAL_RESIDUAL_HH
 
-namespace Dumux
-{
+#include <vector>
+#include <dumux/common/properties.hh>
 
-namespace Properties
-{
-NEW_PROP_TAG(ReplaceCompEqIdx);
-} // end namespace Properties
+namespace Dumux {
 
 /*!
  * \ingroup PorousmediumCompositional

dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh

@@ -28,6 +28,10 @@
 
 #include <memory>
 #include <dune/common/hybridutilities.hh>
+
+#include <dumux/common/properties.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/discretization/methods.hh>
 #include <dumux/nonlinear/newtoncontroller.hh>
 
 namespace Dumux

dumux/porousmediumflow/compositional/switchableprimaryvariables.hh

@@ -26,9 +26,9 @@
 
 #include <dune/common/exceptions.hh>
 #include <dune/common/fvector.hh>
+#include <dumux/common/properties.hh>
 
-namespace Dumux
-{
+namespace Dumux {
 
 /*!
  * \ingroup PorousmediumCompositional

dumux/porousmediumflow/immiscible/localresidual.hh

@@ -25,6 +25,8 @@
 #ifndef DUMUX_IMMISCIBLE_LOCAL_RESIDUAL_HH
 #define DUMUX_IMMISCIBLE_LOCAL_RESIDUAL_HH
 
+#include <dumux/common/properties.hh>
+
 namespace Dumux
 {
 /*!