[cleanup][properties] Remove unnecessary property forward declaration

* makes calls to NEW_PROP_TAG unique which will be required by the new property system

dumux/common/properties.hh

@@ -195,6 +195,11 @@ NEW_PROP_TAG(NormalizePressure); //!<  Returns whether to normalize the pressure
 /////////////////////////////////////////////////////////////
 NEW_PROP_TAG(CouplingManager);
 
+///////////////////////////////////////
+// Basic properties of sequential models:
+///////////////////////////////////////
+NEW_PROP_TAG(TimeManager);
+
 } // end namespace Properties
 } // end namespace Dumux
 

dumux/common/start.hh

@@ -38,13 +38,7 @@
 
 #warning "start.hh is deprecated. Use new style main files see e.g. /test/porousmediumflow/1p."
 
-namespace Dumux
-{
-
-namespace Properties
-{
-NEW_PROP_TAG(TimeManager);
-}
+namespace Dumux {
 
 /*!
  * \ingroup Common

dumux/material/spatialparams/sequentialfv1p.hh

@@ -30,13 +30,7 @@
 
 #include <dune/common/fmatrix.hh>
 
-namespace Dumux
-{
-// forward declation of property tags
-namespace Properties
-{
-NEW_PROP_TAG(SpatialParams);
-}
+namespace Dumux {
 
 /*!
  * \ingroup SpatialParameters

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

@@ -55,11 +55,7 @@ NEW_TYPE_TAG(SequentialOneP, INHERITS_FROM(SequentialModel));
 //////////////////////////////////////////////////////////////////
 // Property tags
 //////////////////////////////////////////////////////////////////
-
-NEW_PROP_TAG( SpatialParams );  //!< The type of the spatial parameters object
 NEW_PROP_TAG( Fluid );          //!< The fluid for one-phase models
-NEW_PROP_TAG( Indices );        //!< Set of indices for the one-phase model
-NEW_PROP_TAG( CellData );       //!< The cell data storage class
 }
 }
 

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

@@ -52,15 +52,9 @@ NEW_TYPE_TAG(SequentialTwoP, INHERITS_FROM(SequentialModel));
 //////////////////////////////////////////////////////////////////
 // Property tags
 //////////////////////////////////////////////////////////////////
-NEW_PROP_TAG( SpatialParams ); //!< The type of the spatial parameters object
-NEW_PROP_TAG(MaterialLaw);   //!< The material law which ought to be used (extracted from the spatial parameters)
-NEW_PROP_TAG( Formulation); //!< The formulation of the model
-NEW_PROP_TAG( PressureFormulation); //!< The formulation of the pressure model
 NEW_PROP_TAG( SaturationFormulation); //!< The formulation of the saturation model
 NEW_PROP_TAG( VelocityFormulation); //!< The type of velocity reconstructed for the transport model
 NEW_PROP_TAG( EnableCompressibility);//!< Returns whether compressibility is allowed
-NEW_PROP_TAG( FluidSystem ); //!< Defines the fluid system
-NEW_PROP_TAG( FluidState );//!< Defines the fluid state
 }
 }
 

dumux/porousmediumflow/2p1c/model.hh

@@ -145,9 +145,6 @@ NEW_TYPE_TAG(TwoPOneCNI, INHERITS_FROM(PorousMediumFlow));
 // Properties
 //////////////////////////////////////////////////////////////////
 
-//! Determines whether Blocking ofspurious flow is used.
-NEW_PROP_TAG(UseBlockingOfSpuriousFlow);
-
 /*!
  * \brief The fluid state which is used by the volume variables to
  *        store the thermodynamic state. This should be chosen

dumux/porousmediumflow/2p2c/sequential/properties.hh

@@ -31,6 +31,7 @@
 #include <dumux/porousmediumflow/sequential/pressureproperties.hh>
 #include <dumux/porousmediumflow/sequential/transportproperties.hh>
 #include <dumux/porousmediumflow/sequential/impetproperties.hh>
+#include <dumux/porousmediumflow/2p/sequential/properties.hh>
 #include <dumux/material/spatialparams/sequentialfv.hh>
 
 namespace Dumux
@@ -64,17 +65,8 @@ NEW_TYPE_TAG(SequentialTwoPTwoC, INHERITS_FROM(Pressure, Transport, IMPET));
 //////////////////////////////////////////////////////////////////
 // Property tags
 //////////////////////////////////////////////////////////////////
-NEW_PROP_TAG( Indices );
-NEW_PROP_TAG( SpatialParams ); //!< The type of the soil properties object
-NEW_PROP_TAG( MaterialLaw ); //!< The type of the material law
-NEW_PROP_TAG( PressureFormulation); //!< The formulation of the model
-NEW_PROP_TAG( SaturationFormulation); //!< The formulation of the model
-NEW_PROP_TAG( VelocityFormulation); //!< The formulation of the model
-NEW_PROP_TAG( EnableCompressibility); //!< Returns whether compressibility is allowed
 NEW_PROP_TAG( EnableCapillarity); //!< Returns whether capillarity is regarded
 NEW_PROP_TAG( BoundaryMobility ); //!< Returns whether mobility or saturation is used for Dirichlet B.C.
-NEW_PROP_TAG( FluidSystem ); //!< The fluid system
-NEW_PROP_TAG( FluidState ); //!< The fluid state
 //! A minimum permeability can be assigned via the runtime-Parameter SpatialParams.minBoundaryPermeability
 NEW_PROP_TAG( RegulateBoundaryPermeability );
 }}
@@ -88,6 +80,7 @@ namespace Properties {
 //////////////////////////////////////////////////////////////////
 // Properties
 //////////////////////////////////////////////////////////////////
+
 SET_TYPE_PROP(SequentialTwoPTwoC, Indices,SequentialTwoPTwoCIndices<TypeTag>);
 
 SET_INT_PROP(SequentialTwoPTwoC, NumEq, 3);

dumux/porousmediumflow/sequential/impetproperties.hh

@@ -52,9 +52,6 @@ namespace Properties
 
 //! The type tag for models based on the diffusion-scheme
 NEW_TYPE_TAG(IMPET, INHERITS_FROM(SequentialModel));
-
-//forward declaration
-NEW_PROP_TAG( Model ); //!< The model of the specific problem
 }
 }
 

dumux/porousmediumflow/sequential/pressureproperties.hh

@@ -57,11 +57,9 @@ NEW_TYPE_TAG(Pressure, INHERITS_FROM(SequentialModel));
 // Property tags
 //////////////////////////////////////////////////////////////////
 //Properties for linear solvers
-NEW_PROP_TAG(PressureCoefficientMatrix);//!< Type of the coefficient matrix given to the linear solver
 NEW_PROP_TAG(PressureRHSVector);//!< Type of the right hand side vector given to the linear solver
 NEW_PROP_TAG(PressureSolutionVector);//!Type of solution vector or pressure system
 NEW_PROP_TAG(VisitFacesOnlyOnce); //!< Indicates if faces are only regarded from one side
-NEW_PROP_TAG(Velocity);
 }
 }
 

dumux/porousmediumflow/sequential/properties.hh

@@ -23,6 +23,7 @@
 #include <dumux/common/properties/model.hh>
 #include <dumux/common/properties/grid.hh>
 #include <dumux/common/defaultmappertraits.hh>
+#include <dumux/discretization/methods.hh>
 #include <dumux/porousmediumflow/sequential/gridadaptproperties.hh>
 #include <dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh>
 
@@ -55,12 +56,10 @@ NEW_TYPE_TAG(SequentialModel, INHERITS_FROM(ModelProperties, GridAdaptTypeTag, G
 //! This means vectors of primary variables, solution functions on the
 //! grid, and elements, and shape functions.
 NEW_PROP_TAG( SolutionTypes);
-NEW_PROP_TAG( PrimaryVariables);
 NEW_PROP_TAG( Indices);
 
 // Some properties that have been removed from numeric model
 NEW_PROP_TAG( Model ); //!< The type of the mode
-NEW_PROP_TAG( TimeManager ); //!< The type of the time manager
 NEW_PROP_TAG( DiscretizationMethod ); //!< The type of discretization method
 
 NEW_PROP_TAG( PressureModel ); //!< The type of the discretization of a pressure model
@@ -71,16 +70,8 @@ NEW_PROP_TAG( NumPhases); //!< Number of phases in the system
 NEW_PROP_TAG( NumComponents); //!< Number of components in the system
 NEW_PROP_TAG( Variables); //!< The type of the container of global variables
 NEW_PROP_TAG( CellData );//!< Defines data object to be stored
-NEW_PROP_TAG( TimeManager );  //!< Manages the simulation time
-NEW_PROP_TAG( BoundaryTypes ); //!< Stores the boundary types of a single degree of freedom
 NEW_PROP_TAG( MaxIntersections ); //!< Gives maximum number of intersections of an element and neighboring elements
 NEW_PROP_TAG( PressureCoefficientMatrix ); //!< Gives maximum number of intersections of an element and neighboring elements
-
-//! Some properties that became obsolete in dumux, but are still necessary
-//! for sequential models until they are integrated in the general framework
-NEW_PROP_TAG( NumEq );         //!< The number of equations to solve (equal to number of primary variables)
-NEW_PROP_TAG( NumPhases );     //!< Number of fluid phases in the system
-NEW_PROP_TAG( NumComponents ); //!< Number of fluid components in the system
 }
 }
 
@@ -148,15 +139,15 @@ public:
 //! A simplified grid geometry for compatibility with new style models
 SET_PROP(SequentialModel, FVGridGeometry)
 {
-    struct FVGridGeometry
+    struct MockFVGridGeometry
     : public DefaultMapperTraits<typename GET_PROP_TYPE(TypeTag, GridView)>
     {
-        static constexpr DiscretizationMethod discMethod = DiscretizationMethod::cctpfa;
+        static constexpr Dumux::DiscretizationMethod discMethod = Dumux::DiscretizationMethod::cctpfa;
         using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
     };
 
 public:
-    using type = FVGridGeometry;
+    using type = MockFVGridGeometry;
 };
 
 //! For compatibility with new style models we need a solution vector type

test/multidomain/facet/1p_1p/analytical/test_facetcoupling_fv_1p1p.cc

@@ -69,8 +69,6 @@ public:
 namespace Dumux {
 namespace Properties {
 
-NEW_PROP_TAG(CouplingManager);
-
 // set cm property for the box test
 using BoxTraits = TestTraits<TTAG(OnePBulkBox), TTAG(OnePLowDimBox)>;
 SET_TYPE_PROP(OnePBulkBox, CouplingManager, typename BoxTraits::CouplingManager);

test/multidomain/facet/1p_1p/threedomain/test_facetcoupling_tpfa_1p1p_threedomain.cc

@@ -65,7 +65,6 @@ public:
 namespace Dumux {
 namespace Properties {
 
-NEW_PROP_TAG(CouplingManager);
 SET_TYPE_PROP(OnePBulkTpfa, CouplingManager, typename TestTraits::CouplingManager);
 SET_TYPE_PROP(OnePFacetTpfa, CouplingManager, typename TestTraits::CouplingManager);
 SET_TYPE_PROP(OnePEdgeTpfa, CouplingManager, typename TestTraits::CouplingManager);

test/multidomain/poromechanics/el1p/test_el1p.cc

@@ -48,7 +48,6 @@
 // set the coupling manager property in the sub-problems
 namespace Dumux {
 namespace Properties {
-NEW_PROP_TAG(CouplingManager);
 
 SET_PROP(OnePSubTypeTag, CouplingManager)
 {

test/multidomain/poromechanics/el2p/test_el2p.cc

@@ -50,7 +50,6 @@
 // set the coupling manager property in the sub-problems
 namespace Dumux {
 namespace Properties {
-NEW_PROP_TAG(CouplingManager);
 
 SET_PROP(TwoPSubTypeTag, CouplingManager)
 {

test/porousmediumflow/mpnc/implicit/plotoverline2d.hh

@@ -36,23 +36,7 @@
 #include <iostream>
 #include <fstream>
 
-namespace Dumux
-{
-namespace Properties
-{
-    NEW_PROP_TAG(Scalar);
-    NEW_PROP_TAG(Problem);
-    NEW_PROP_TAG(GridView);
-    NEW_PROP_TAG(DofMapper);
-    NEW_PROP_TAG(FluidSystem);
-    NEW_PROP_TAG(ElementSolution);
-    NEW_PROP_TAG(SolutionVector);
-    NEW_PROP_TAG(FVElementGeometry);
-    NEW_PROP_TAG(TwoPIAIndices);
-    NEW_PROP_TAG(NumEq);
-    NEW_PROP_TAG(AwnSurface);
-    NEW_PROP_TAG(AwnSurfaceParams);
-}
+namespace Dumux {
 
 template<class TypeTag>
 class PlotOverLine2D
@@ -62,7 +46,6 @@ class PlotOverLine2D
     using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
 
     using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
-    using DofMapper = typename GET_PROP_TYPE(TypeTag, DofMapper);
     using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
 
     using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables)::LocalView;