[staggered] Remove obsolete staggered model header

dumux/freeflow/staggered/model.hh

@@ -27,12 +27,7 @@
 #ifndef DUMUX_NAVIERSTOKES_MODEL_HH
 #define DUMUX_NAVIERSTOKES_MODEL_HH
 
-// #include <dumux/porousmediumflow/implicit/velocityoutput.hh>
-#include "../staggeredni/model.hh"
-#include "properties.hh"
 
-namespace Dumux
-{
 /*!
  * \ingroup NavierStokesModel
  * \brief A single-phase, isothermal flow model using the fully implicit scheme.
@@ -54,49 +49,8 @@ namespace Dumux
  * and the implicit Euler method as time discretization.
  * The model supports compressible as well as incompressible fluids.
  */
-template<class TypeTag >
-class NavierStokesModel : public GET_PROP_TYPE(TypeTag, BaseModel)
-{
-    using ParentType = typename GET_PROP_TYPE(TypeTag, BaseModel);
-    typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-    typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-    typedef typename GET_PROP_TYPE(TypeTag, FVGridGeometry) FVGridGeometry;
-    typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-    typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
 
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-    enum { dim = GridView::dimension };
-    enum { dimWorld = GridView::dimensionworld };
-
-    enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
-    enum { dofCodim = isBox ? dim : 0 };
-    using Element = typename GridView::template Codim<0>::Entity;
-
-    using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
-    using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
-    typename DofTypeIndices::CellCenterIdx cellCenterIdx;
-    typename DofTypeIndices::FaceIdx faceIdx;
-
-public:
-
-    void init(Problem& problem)
-    {
-        ParentType::init(problem);
-
-        // register standardized vtk output fields
-        auto& vtkOutputModule = problem.vtkOutputModule();
-        vtkOutputModule.addPrimaryVariable("pressure", Indices::pressureIdx);
-        vtkOutputModule.addFacePrimaryVariable("scalarFaceVelocity", 0);
-        vtkOutputModule.addFacePrimaryVariable("faceVelocity", std::vector<unsigned int>{0,1, 2});
-
-//         NonIsothermalModel::maybeAddTemperature(vtkOutputModule);
-    }
-};
-}
-
-#include "propertydefaults.hh"
 
+ #include "../staggeredni/model.hh"
+ #include "properties.hh"
 #endif

dumux/freeflow/staggered/propertydefaults.hh

@@ -101,9 +101,6 @@ SET_TYPE_PROP(NavierStokes, FaceVariables, StaggeredFaceVariables<TypeTag>);
 //! The local residual function
 SET_TYPE_PROP(NavierStokes, LocalResidual, StaggeredNavierStokesResidual<TypeTag>);
 
-//! the Model property
-SET_TYPE_PROP(NavierStokes, Model, NavierStokesModel<TypeTag>);
-
 //! the VolumeVariables property
 SET_TYPE_PROP(NavierStokes, VolumeVariables, NavierStokesVolumeVariables<TypeTag>);
 
@@ -206,9 +203,6 @@ SET_TYPE_PROP(NavierStokes, EnergyFluxVariables, FreeFlowEnergyFluxVariables<Typ
 // Property values for isothermal model required for the general non-isothermal model
 //////////////////////////////////////////////////////////////////
 
-// set isothermal Model
-SET_TYPE_PROP(NavierStokesNI, IsothermalModel, NavierStokesModel<TypeTag>);
-
 //set isothermal Indices
 SET_TYPE_PROP(NavierStokesNI, IsothermalIndices, NavierStokesCommonIndices<TypeTag>);
 

dumux/implicit/staggered/propertydefaults.hh

@@ -57,7 +57,6 @@
 #include "properties.hh"
 #include "newtoncontroller.hh"
 #include "newtonconvergencewriter.hh"
-#include "model.hh"
 #include "primaryvariables.hh"
 #include "gridvariables.hh"
 
@@ -74,9 +73,6 @@ SET_PROP(StaggeredModel, DiscretizationMethod)
 };
 
 
-SET_TYPE_PROP(StaggeredModel, BaseModel, StaggeredBaseModel<TypeTag>);
-
-
 //! Set the default for the global finite volume geometry
 SET_TYPE_PROP(StaggeredModel, FVGridGeometry, StaggeredFVGridGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);