[porousmediumflow] Fix TypeTag inheritance in most models

* The phyiscal model now only inherits from the PorousMediumFlow type tag
* fix includes

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

@@ -27,8 +27,7 @@
 #ifndef DUMUX_1P_PROPERTIES_HH
 #define DUMUX_1P_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/common/properties.hh>
 
 #include <dumux/material/components/nullcomponent.hh>
 #include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
@@ -48,7 +47,7 @@ namespace Dumux
 {
 namespace Properties {
 //! The type tags for the isothermal & non-isothermal single phase model
-NEW_TYPE_TAG(OneP, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(OneP, INHERITS_FROM(PorousMediumFlow));
 NEW_TYPE_TAG(OnePNI, INHERITS_FROM(OneP, NonIsothermal));
 
 ///////////////////////////////////////////////////////////////////////////

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

@@ -29,8 +29,7 @@
 #ifndef DUMUX_1PNC_PROPERTIES_HH
 #define DUMUX_1PNC_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/common/properties.hh>
 
 #include <dumux/material/components/nullcomponent.hh>
 #include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
@@ -57,7 +56,7 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 
 //! The type tag for the implicit the isothermal & non-isothermal one phase n component problems
-NEW_TYPE_TAG(OnePNC, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(OnePNC, INHERITS_FROM(PorousMediumFlow));
 NEW_TYPE_TAG(OnePNCNI, INHERITS_FROM(OnePNC, NonIsothermal));
 
 ///////////////////////////////////////////////////////////////////////////

dumux/porousmediumflow/2p/implicit/properties.hh

@@ -30,8 +30,7 @@
 #ifndef DUMUX_2P_PROPERTIES_HH
 #define DUMUX_2P_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/common/properties.hh>
 
 #include <dumux/material/components/nullcomponent.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
@@ -62,7 +61,7 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 
 //! The type tags for the isothermal & non-isothermal two-phase model
-NEW_TYPE_TAG(TwoP, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(TwoP, INHERITS_FROM(PorousMediumFlow));
 NEW_TYPE_TAG(TwoPNI, INHERITS_FROM(TwoP, NonIsothermal));
 
 ///////////////////////////////////////////////////////////////////////////

dumux/porousmediumflow/2pnc/implicit/properties.hh

@@ -29,8 +29,7 @@
 #ifndef DUMUX_2PNC_PROPERTIES_HH
 #define DUMUX_2PNC_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/common/properties.hh>
 
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
@@ -54,7 +53,7 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 // Type tags
 //////////////////////////////////////////////////////////////////
-NEW_TYPE_TAG(TwoPNC, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(TwoPNC, INHERITS_FROM(PorousMediumFlow));
 NEW_TYPE_TAG(TwoPNCNI, INHERITS_FROM(TwoPNC, NonIsothermal));
 
 //////////////////////////////////////////////////////////////////

dumux/porousmediumflow/3p/implicit/properties.hh

@@ -27,8 +27,7 @@
 #ifndef DUMUX_3P_PROPERTIES_HH
 #define DUMUX_3P_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/common/properties.hh>
 
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidstates/immiscible.hh>
@@ -51,7 +50,7 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 // Type tags
 //////////////////////////////////////////////////////////////////
-NEW_TYPE_TAG(ThreeP, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(ThreeP, INHERITS_FROM(PorousMediumFlow));
 NEW_TYPE_TAG(ThreePNI, INHERITS_FROM(ThreeP, NonIsothermal));
 
 //////////////////////////////////////////////////////////////////

dumux/porousmediumflow/3p3c/implicit/properties.hh

@@ -30,8 +30,7 @@
 #ifndef DUMUX_3P3C_PROPERTIES_HH
 #define DUMUX_3P3C_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
 
@@ -41,7 +40,7 @@ namespace Dumux
 namespace Properties
 {
 //! The type tags for the implicit three-phase three-component problems
-NEW_TYPE_TAG(ThreePThreeC, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(ThreePThreeC, INHERITS_FROM(PorousMediumFlow));
 
 //! The type tags for the corresponding non-isothermal problems
 NEW_TYPE_TAG(ThreePThreeCNI, INHERITS_FROM(ThreePThreeC, NonIsothermal));

dumux/porousmediumflow/properties.hh

@@ -26,6 +26,7 @@
 #ifndef DUMUX_POROUSMEDIUM_FLOW_PROPERTIES_HH
 #define DUMUX_POROUSMEDIUM_FLOW_PROPERTIES_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/common/properties/model.hh>
 #include <dumux/io/vtkoutputmodule.hh>
 

dumux/porousmediumflow/richards/implicit/properties.hh

@@ -28,8 +28,7 @@
 #ifndef DUMUX_RICHARDS_PROPERTIES_HH
 #define DUMUX_RICHARDS_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/common/properties.hh>
 
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
 #include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
@@ -63,7 +62,7 @@ namespace Properties {
 //////////////////////////////////////////////////////////////////
 
 //! The type tags for the implicit isothermal one-phase two-component problems
-NEW_TYPE_TAG(Richards, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(Richards, INHERITS_FROM(PorousMediumFlow));
 NEW_TYPE_TAG(RichardsNI, INHERITS_FROM(Richards, NonIsothermal));
 
 //////////////////////////////////////////////////////////////////

dumux/porousmediumflow/richardsnc/implicit/properties.hh

@@ -29,8 +29,7 @@
 #ifndef DUMUX_RICHARDSNC_PROPERTIES_HH
 #define DUMUX_RICHARDSNC_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/common/properties.hh>
 
 #include <dumux/porousmediumflow/compositional/localresidual.hh>
 #include <dumux/porousmediumflow/richards/implicit/newtoncontroller.hh>
@@ -61,7 +60,7 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 
 //! The type tags for the implicit isothermal one-phase two-component problems
-NEW_TYPE_TAG(RichardsNC, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(RichardsNC, INHERITS_FROM(PorousMediumFlow));
 NEW_TYPE_TAG(RichardsNCNI, INHERITS_FROM(Richards, NonIsothermal));
 //////////////////////////////////////////////////////////////////
 // Property tags