[properties][freeflow] Fix properties for all free-flow models

* include dumux/common/properties.hh
* do not inherit from NumericModel and LinearSolverTypeTag anymore

dumux/freeflow/properties.hh

@@ -26,6 +26,7 @@
 #ifndef DUMUX_FREE_FLOW_PROPERTIES_HH
 #define DUMUX_FREE_FLOW_PROPERTIES_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/common/properties/basic.hh>
 #include <dumux/discretization/staggered/freeflow/facevariables.hh>
 #include <dumux/implicit/staggered/primaryvariables.hh>

dumux/freeflow/staggered/boundarytypes.hh

@@ -23,6 +23,7 @@
 #ifndef STAGGERED_FREEFLOW_BOUNDARY_TYPES_HH
 #define STAGGERED_FREEFLOW_BOUNDARY_TYPES_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/common/boundarytypes.hh>
 
 namespace Dumux

dumux/freeflow/staggered/fluxvariables.hh

@@ -23,7 +23,7 @@
 #ifndef DUMUX_FREELOW_IMPLICIT_FLUXVARIABLES_HH
 #define DUMUX_FREELOW_IMPLICIT_FLUXVARIABLES_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/fluxvariablesbase.hh>
 
 namespace Dumux

dumux/freeflow/staggered/fluxvariablescache.hh

@@ -23,8 +23,8 @@
 #ifndef DUMUX_FREEFLOW_IMPLICIT_FLUXVARIABLESCACHE_HH
 #define DUMUX_FREEFLOW_IMPLICIT_FLUXVARIABLESCACHE_HH
 
-#include <dumux/common/basicproperties.hh>
 #include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/methods.hh>
 
 namespace Dumux

dumux/freeflow/staggered/indices.hh

@@ -23,6 +23,8 @@
 #ifndef DUMUX_NAVIERSTOKES_COMMON_INDICES_HH
 #define DUMUX_NAVIERSTOKES_COMMON_INDICES_HH
 
+#include <dumux/common/properties.hh>
+
 namespace Dumux
 {
 // \{

dumux/freeflow/staggered/localresidual.hh

@@ -23,6 +23,7 @@
 #ifndef DUMUX_STAGGERED_NAVIERSTOKES_LOCAL_RESIDUAL_HH
 #define DUMUX_STAGGERED_NAVIERSTOKES_LOCAL_RESIDUAL_HH
 
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {

dumux/freeflow/staggered/problem.hh

@@ -23,9 +23,9 @@
 #ifndef DUMUX_NAVIERSTOKES_PROBLEM_HH
 #define DUMUX_NAVIERSTOKES_PROBLEM_HH
 
-#include <dumux/common/basicproperties.hh>
-#include "properties.hh"
+#include <dumux/common/properties.hh>
 #include <dumux/common/staggeredfvproblem.hh>
+#include "properties.hh"
 
 namespace Dumux
 {

dumux/freeflow/staggered/properties.hh

@@ -27,8 +27,6 @@
 #ifndef DUMUX_NAVIERSTOKES_PROPERTIES_HH
 #define DUMUX_NAVIERSTOKES_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
 #include <dumux/freeflow/properties.hh>
 
 #include <dumux/implicit/staggered/localresidual.hh>
@@ -48,6 +46,7 @@
 #include <dumux/material/components/nullcomponent.hh>
 #include <dumux/material/fluidsystems/1p.hh>
 
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
@@ -62,7 +61,7 @@ namespace Properties {
 //////////////////////////////////////////////////////////////////
 
 //! The type tags for the implicit single-phase problems
-NEW_TYPE_TAG(NavierStokes, INHERITS_FROM(LinearSolverTypeTag, NumericModel, FreeFlow));
+NEW_TYPE_TAG(NavierStokes, INHERITS_FROM(FreeFlow));
 
 //! The type tags for the corresponding non-isothermal problems
 NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes, NavierStokesNonIsothermal));

dumux/freeflow/staggered/velocityoutput.hh

@@ -28,7 +28,7 @@
 #include <dune/istl/bvector.hh>
 #include <dune/geometry/referenceelements.hh>
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/methods.hh>
 
 namespace Dumux

dumux/freeflow/staggered/volumevariables.hh

@@ -24,6 +24,8 @@
 #ifndef DUMUX_NAVIERSTOKES_VOLUME_VARIABLES_HH
 #define DUMUX_NAVIERSTOKES_VOLUME_VARIABLES_HH
 
+#include <dumux/common/properties.hh>
+
 #include "properties.hh"
 #include <dumux/discretization/volumevariables.hh>
 

dumux/freeflow/staggerednc/localresidual.hh

@@ -23,7 +23,7 @@
 #ifndef DUMUX_STAGGERED_NAVIERSTOKES_NC_LOCAL_RESIDUAL_HH
 #define DUMUX_STAGGERED_NAVIERSTOKES_NC_LOCAL_RESIDUAL_HH
 
-
+#include <dumux/common/properties.hh>
 #include <dumux/common/valgrind.hh>
 #include <dumux/implicit/staggered/localresidual.hh>
 

dumux/freeflow/staggerednc/properties.hh

@@ -27,9 +27,6 @@
 #ifndef DUMUX_NAVIERSTOKES_NC_PROPERTIES_HH
 #define DUMUX_NAVIERSTOKES_NC_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
-
 #include <dumux/freeflow/staggered/properties.hh>
 #include <dumux/freeflow/staggeredni/properties.hh>
 #include <dumux/discretization/fickslaw.hh>
@@ -59,7 +56,7 @@ namespace Properties {
 //////////////////////////////////////////////////////////////////
 
 //! The type tags for the implicit single-phase problems
-NEW_TYPE_TAG(NavierStokesNC, INHERITS_FROM(NavierStokes, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(NavierStokesNC, INHERITS_FROM(NavierStokes));
 NEW_TYPE_TAG(NavierStokesNCNI, INHERITS_FROM(NavierStokesNC, NavierStokesNonIsothermal));
 
 ///////////////////////////////////////////////////////////////////////////

dumux/freeflow/staggerednc/volumevariables.hh

@@ -24,6 +24,7 @@
 #ifndef DUMUX_NAVIER_STOKES_NC_VOLUMEVARIABLES_HH
 #define DUMUX_NAVIER_STOKES_NC_VOLUMEVARIABLES_HH
 
+#include <dumux/common/properties.hh>
 #include "properties.hh"
 
 #include "../staggered/volumevariables.hh"

dumux/freeflow/staggeredni/fluxvariables.hh

@@ -23,7 +23,7 @@
 #ifndef DUMUX_FREELOW_IMPLICIT_NI_FLUXVARIABLES_HH
 #define DUMUX_FREELOW_IMPLICIT_NI_FLUXVARIABLES_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {

dumux/freeflow/staggeredni/localresidual.hh

@@ -25,7 +25,7 @@
 #ifndef DUMUX_FREE_FLOW_ENERGY_LOCAL_RESIDUAL_HH
 #define DUMUX_FREE_FLOW_ENERGY_LOCAL_RESIDUAL_HH
 
-// #include <dumux/implicit/properties.hh>
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {

dumux/freeflow/staggeredni/properties.hh

@@ -27,6 +27,7 @@
 #ifndef DUMUX_NAVIER_STOKES_NI_PROPERTIES_HH
 #define DUMUX_NAVIER_STOKES_NI_PROPERTIES_HH
 
+#include <dumux/common/properties.hh>
 #include "fluxvariables.hh"
 #include "indices.hh"
 #include "localresidual.hh"