From 8cdc23b350f88f1743c2462efd71b5d7e2d45214 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Thu, 2 Nov 2017 14:33:31 +0100
Subject: [PATCH] [staggered] Remove obsolete staggered model header
---
dumux/freeflow/staggered/model.hh | 50 +-
dumux/freeflow/staggered/propertydefaults.hh | 6 -
dumux/implicit/staggered/model.hh | 565 -------------------
dumux/implicit/staggered/propertydefaults.hh | 4 -
4 files changed, 2 insertions(+), 623 deletions(-)
delete mode 100644 dumux/implicit/staggered/model.hh
diff --git a/dumux/freeflow/staggered/model.hh b/dumux/freeflow/staggered/model.hh
index 4e781c517d..6b0dab51f4 100644
--- a/dumux/freeflow/staggered/model.hh
+++ b/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
diff --git a/dumux/freeflow/staggered/propertydefaults.hh b/dumux/freeflow/staggered/propertydefaults.hh
index a9bd1f7af1..ce0b78f645 100644
--- a/dumux/freeflow/staggered/propertydefaults.hh
+++ b/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>);
diff --git a/dumux/implicit/staggered/model.hh b/dumux/implicit/staggered/model.hh
deleted file mode 100644
index e59dbaab15..0000000000
--- a/dumux/implicit/staggered/model.hh
+++ /dev/null
@@ -1,565 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Base class for all models which use the one-phase,
- * fully implicit model.
- * Adaption of the fully implicit scheme to the one-phase flow model.
- */
-
-#ifndef DUMUX_STAGGERED_BASEMODEL_HH
-#define DUMUX_STAGGERED_BASEMODEL_HH
-
-// #include <dumux/porousmediumflow/implicit/velocityoutput.hh>
-#include <dumux/implicit/model.hh>
-#include <dumux/discretization/staggered/globalfacevariables.hh>
-#include "properties.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup NavierStokesModel
- * \brief A single-phase, isothermal flow model using the fully implicit scheme.
- *
- * Single-phase, isothermal flow model, which uses a standard Darcy approach as the
- * equation for the conservation of momentum:
- * \f[
- v = - \frac{\textbf K}{\mu}
- \left(\textbf{grad}\, p - \varrho {\textbf g} \right)
- * \f]
- *
- * and solves the mass continuity equation:
- * \f[
- \phi \frac{\partial \varrho}{\partial t} + \text{div} \left\lbrace
- - \varrho \frac{\textbf K}{\mu} \left( \textbf{grad}\, p -\varrho {\textbf g} \right) \right\rbrace = q,
- * \f]
- * All equations are discretized using a vertex-centered finite volume (box)
- * or cell-centered finite volume scheme as spatial
- * and the implicit Euler method as time discretization.
- * The model supports compressible as well as incompressible fluids.
- */
-template<class TypeTag >
-class StaggeredBaseModel : public ImplicitModel<TypeTag>
-{
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using JacobianAssembler = typename GET_PROP_TYPE(TypeTag, JacobianAssembler);
-
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-
- enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
- using Element = typename GridView::template Codim<0>::Entity;
- using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using Implementation = typename GET_PROP_TYPE(TypeTag, Model);
- using NewtonMethod = typename GET_PROP_TYPE(TypeTag, NewtonMethod);
- using NewtonController = typename GET_PROP_TYPE(TypeTag, NewtonController);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
-
- using GlobalFaceVariables = Dumux::StaggeredGlobalFaceVariables<TypeTag>;
- using ParentType = ImplicitModel<TypeTag>;
-
- using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
- typename DofTypeIndices::CellCenterIdx cellCenterIdx;
- typename DofTypeIndices::FaceIdx faceIdx;
-
- static_assert(!isBox, "must not be box!");
-
-public:
-
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The object representing the problem which needs to
- * be simulated.
- */
- void init(Problem &problem)
- {
- this->problemPtr_ = &problem;
-
- this->updateBoundaryIndices_();
-
- this->fvGridGeometryPtr_ = std::make_shared<FVGridGeometry>(problem.gridView());
- this->fvGridGeometryPtr_->update(problem);
-
- this->uCur_[cellCenterIdx].resize(asImp_().numCellCenterDofs());
- this->uCur_[faceIdx].resize(asImp_().numFaceDofs());
-
- // apply initial solution
- // for compositional models initial the phase presence herein
- asImp_().applyInitialSolution_();
-
- // resize and update the volVars with the initial solution
- this->curGlobalVolVars_.update(problem, this->curSol());
-
- curGlobalFaceVariables_.update(problem, this->curSol()[faceIdx]);
-
- // update the flux variables caches
- this->globalfluxVarsCache_.update(problem);
-
- // initialize assembler and create matrix
- this->localJacobian_.init(problem);
- this->jacAsm_ = std::make_shared<JacobianAssembler>();
- this->jacAsm_->init(problem);
-
- // also set the solution of the "previous" time step to the
- // initial solution.
- this->uPrev_ = this->uCur_;
- this->prevGlobalVolVars_ = this->curGlobalVolVars_;
- prevGlobalFaceVariables_ = curGlobalFaceVariables_;
- }
-
- /*!
- * \brief Try to progress the model to the next timestep.
- *
- * \param solver The non-linear solver
- * \param controller The controller which specifies the behaviour
- * of the non-linear solver
- */
- bool update(NewtonMethod &solver,
- NewtonController &controller)
- {
-#if HAVE_VALGRIND
- for (size_t i = 0; i < this->curSol()[cellCenterIdx].size(); ++i)
- Valgrind::CheckDefined(this->curSol()[cellCenterIdx][i]);
- for (size_t i = 0; i < this->curSol()[faceIdx].size(); ++i)
- Valgrind::CheckDefined(this->curSol()[faceIdx][i]);
-#endif // HAVE_VALGRIND
-
- asImp_().updateBegin();
-
- int converged = solver.execute(controller);
-
- if (this->gridView_().comm().size() > 1)
- {
- converged = this->gridView_().comm().min(converged);
- }
- if (converged) {
- asImp_().updateSuccessful();
- }
- else
- asImp_().updateFailed();
-
-#if HAVE_VALGRIND
- for (size_t i = 0; i < this->curSol()[cellCenterIdx].size(); ++i)
- Valgrind::CheckDefined(this->curSol()[cellCenterIdx][i]);
- for (size_t i = 0; i < this->curSol()[faceIdx].size(); ++i)
- Valgrind::CheckDefined(this->curSol()[faceIdx][i]);
-#endif // HAVE_VALGRIND
-
- return converged;
- }
-
- void newtonEndStep()
- {
- ParentType::newtonEndStep();
- curGlobalFaceVariables_.update(this->problem_(), this->curSol()[faceIdx]);
-
- }
-
- /*!
- * \brief Returns the maximum relative shift between two vectors of
- * primary variables.
- *
- * \param priVars1 The first vector of primary variables
- * \param priVars2 The second vector of primary variables
- */
- template<class CellCenterOrFacePriVars>
- Scalar relativeShiftAtDof(const CellCenterOrFacePriVars &priVars1,
- const CellCenterOrFacePriVars &priVars2)
- {
- const auto numEq = priVars1.size();
- Scalar result = 0.0;
- for (int j = 0; j < numEq; ++j) {
- Scalar eqErr = std::abs(priVars1[j] - priVars2[j]);
- eqErr /= std::max<Scalar>(1.0, std::abs(priVars1[j] + priVars2[j])/2);
-
- result = std::max(result, eqErr);
- }
- return result;
- }
-
- /*!
- * \brief Called by the update() method if it was
- * unsuccessful. This is primarily a hook which the actual
- * model can overload.
- */
- void updateFailed()
- {
- ParentType::updateFailed();
- curGlobalFaceVariables_ = prevGlobalFaceVariables_;
- }
-
- /*!
- * \brief Called by the problem if a time integration was
- * successful, post processing of the solution is done and
- * the result has been written to disk.
- *
- * This should prepare the model for the next time integration.
- */
- void advanceTimeLevel()
- {
- ParentType::advanceTimeLevel();
- // make the current solution the previous one.
- prevGlobalFaceVariables_ = curGlobalFaceVariables_;
- }
-
- /*!
- * \brief Applies the initial solution for all vertices of the grid.
- *
- * \todo the initial condition needs to be unique for
- * each vertex. we should think about the API...
- */
- void applyInitialSolution_()
- {
- // first set the whole domain to zero
- this->uCur_ = Scalar(0.0);
-
- // iterate through leaf grid and evaluate initial
- // condition at the center of each sub control volume
- for (const auto& element : elements(this->gridView_()))
- {
- // deal with the current element, bind FVGeometry to it
- auto fvGeometry = localView(this->fvGridGeometry());
- fvGeometry.bindElement(element);
-
- // loop over sub control volumes
- for (auto&& scv : scvs(fvGeometry))
- {
- // let the problem do the dirty work of nailing down
- // the initial solution.
- auto initPriVars = this->problem_().initialAtPos(scv.center())[cellCenterIdx];
-
- auto dofIdxGlobal = scv.dofIndex();
- this->uCur_[cellCenterIdx][dofIdxGlobal] += initPriVars;
- }
-
- // loop over faces
- for(auto&& scvf : scvfs(fvGeometry))
- {
- auto initPriVars = this->problem_().initialAtPos(scvf.center())[faceIdx][scvf.directionIndex()];
- this->uCur_[faceIdx][scvf.dofIndex()] = initPriVars;
- }
- }
- }
-
- /*!
- * \brief Returns the element solution
- *
- * \param element The element
- * \param sol The solution vector
- * \NOTE: Only returns cell-center related values. Might be revised if face data are needed as well.
- */
- ElementSolution elementSolution(const Element& element, const SolutionVector& sol) const
- {
- PrimaryVariables priVars(0.0);
- priVars[cellCenterIdx] = sol[cellCenterIdx][this->elementMapper().index(element)];
- return ElementSolution{std::move(priVars)};
- }
-
- /*!
- * \brief Write the current solution for a vertex to a restart
- * file.
- *
- * \param outstream The stream into which the vertex data should
- * be serialized to
- * \param entity The entity which's data should be
- * serialized, i.e. a vertex for the box method
- * and an element for the cell-centered method
- */
- template <class Entity>
- void serializeEntity(std::ostream &outstream,
- const Entity &entity)
- {
- DUNE_THROW(Dune::NotImplemented, "deserializeEntity() not implemented yet");
-// int dofIdxGlobal = dofMapper().index(entity);
-// int dofIdxGlobal = dofMapper().index(entity);
-//
-// // write phase state
-// if (!outstream.good()) {
-// DUNE_THROW(Dune::IOError,
-// "Could not serialize vertex "
-// << dofIdxGlobal);
-// }
-//
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
-// outstream << curSol()[dofIdxGlobal][eqIdx] << " ";
-// }
- }
-
- /*!
- * \brief Reads the current solution variables for a vertex from a
- * restart file.
- *
- * \param instream The stream from which the vertex data should
- * be deserialized from
- * \param entity The entity which's data should be
- * serialized, i.e. a vertex for the box method
- * and an element for the cell-centered method
- */
- template <class Entity>
- void deserializeEntity(std::istream &instream,
- const Entity &entity)
- {
- DUNE_THROW(Dune::NotImplemented, "deserializeEntity() not implemented yet");
-// int dofIdxGlobal = dofMapper().index(entity);
-//
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
-// if (!instream.good())
-// DUNE_THROW(Dune::IOError,
-// "Could not deserialize vertex "
-// << dofIdxGlobal);
-// instream >> curSol()[dofIdxGlobal][eqIdx];
-// }
- }
-
- /*!
- * \brief \copybrief Dumux::ImplicitModel::addOutputVtkFields
- *
- * Specialization for the NavierStokesModel, adding the pressure and
- * the process rank to the VTK writer.
- */
- template<class MultiWriter>
- void addOutputVtkFields(const SolutionVector &sol,
- MultiWriter &writer)
- {
- // TODO: implement vtk output
-// // typedef Dune::BlockVector<Dune::FieldVector<double, dimWorld> > VectorField;
-//
-// // create the required scalar fields
-// unsigned numDofs = this->numDofs();
-// auto *p = writer.allocateManagedBuffer(numDofs);
-// // VectorField *velocity = writer.template allocateManagedBuffer<double, dimWorld>(numDofs);
-// // ImplicitVelocityOutput<TypeTag> velocityOutput(this->problem_());
-//
-// // if (velocityOutput.enableOutput())
-// // {
-// // // initialize velocity field
-// // for (unsigned int i = 0; i < numDofs; ++i)
-// // {
-// // (*velocity)[i] = double(0);
-// // }
-// // }
-//
-// unsigned numElements = this->gridView_().size(0);
-// auto *rank = writer.allocateManagedBuffer(numElements);
-//
-// for (const auto& element : elements(this->gridView_(), Dune::Partitions::interior))
-// {
-// auto eIdx = this->elementMapper().index(element);
-// (*rank)[eIdx] = this->gridView_().comm().rank();
-//
-// // get the local fv geometry
-// auto fvGeometry = localView(this->fvGridGeometry());
-// fvGeometry.bindElement(element);
-//
-// auto elemVolVars = localView(this->curGlobalVolVars());
-// elemVolVars.bindElement(element, fvGeometry, this->curSol());
-//
-// for (auto&& scv : scvs(fvGeometry))
-// {
-// const auto& volVars = elemVolVars[scv];
-// auto dofIdxGlobal = scv.dofIndex();
-//
-// (*p)[dofIdxGlobal] = volVars.pressure();
-// }
-//
-// // velocity output
-// //velocityOutput.calculateVelocity(*velocity, elemVolVars, fvGeometry, element, /*phaseIdx=*/0);
-// }
-//
-// writer.attachDofData(*p, "p", isBox);
-// // if (velocityOutput.enableOutput())
-// // {
-// // writer.attachDofData(*velocity, "velocity", isBox, dim);
-// // }
-// writer.attachCellData(*rank, "process rank");
- }
-
- /*!
- * \brief Add the vector fields for analysing the convergence of
- * the newton method to the a VTK multi writer.
- *
- * \tparam MultiWriter The type of the VTK multi writer
- *
- * \param writer The VTK multi writer object on which the fields should be added.
- * \param u The solution function
- * \param deltaU The delta of the solution function before and after the Newton update
- */
- template <class MultiWriter>
- void addConvergenceVtkFields(MultiWriter &writer,
- const SolutionVector &u,
- const SolutionVector &deltaU)
- {
-// typedef Dune::BlockVector<Dune::FieldVector<double, 1> > ScalarField;
-//
-// SolutionVector residual(u);
-// asImp_().globalResidual(residual, u);
-//
-// // create the required scalar fields
-// unsigned numDofs = asImp_().numDofs();
-//
-// // global defect of the two auxiliary equations
-// ScalarField* def[numEq];
-// ScalarField* delta[numEq];
-// ScalarField* x[numEq];
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
-// x[eqIdx] = writer.allocateManagedBuffer(numDofs);
-// delta[eqIdx] = writer.allocateManagedBuffer(numDofs);
-// def[eqIdx] = writer.allocateManagedBuffer(numDofs);
-// }
-//
-// for (unsigned int dofIdxGlobal = 0; dofIdxGlobal < u.size(); dofIdxGlobal++)
-// {
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
-// {
-// (*x[eqIdx])[dofIdxGlobal] = u[dofIdxGlobal][eqIdx];
-// (*delta[eqIdx])[dofIdxGlobal] = - deltaU[dofIdxGlobal][eqIdx];
-// (*def[eqIdx])[dofIdxGlobal] = residual[dofIdxGlobal][eqIdx];
-// }
-// }
-//
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
-// std::ostringstream oss;
-// oss.str(""); oss << "x_" << eqIdx;
-// if (isBox)
-// writer.attachVertexData(*x[eqIdx], oss.str());
-// else
-// writer.attachCellData(*x[eqIdx], oss.str());
-// oss.str(""); oss << "delta_" << eqIdx;
-// if (isBox)
-// writer.attachVertexData(*delta[eqIdx], oss.str());
-// else
-// writer.attachCellData(*delta[eqIdx], oss.str());
-// oss.str(""); oss << "defect_" << eqIdx;
-// if (isBox)
-// writer.attachVertexData(*def[eqIdx], oss.str());
-// else
-// writer.attachCellData(*def[eqIdx], oss.str());
-// }
-//
-// asImp_().addOutputVtkFields(u, writer);
- }
-
- /*!
- * \brief Compute the global residual for an arbitrary solution
- * vector.
- *
- * \param residual Stores the result
- * \param u The solution for which the residual ought to be calculated
- */
- Scalar globalResidual(SolutionVector &residual,
- const SolutionVector &u)
- {
- SolutionVector tmp(this->curSol());
- this->curSol() = u;
- Scalar res = globalResidual(residual);
- this->curSol() = tmp;
- return res;
- }
-
- /*!
- * \brief Compute the global residual for the current solution
- * vector.
- *
- * \param residual Stores the result
- */
- Scalar globalResidual(SolutionVector &residual)
- {
- residual = 0;
-
- for (const auto& element : elements(this->gridView_())) {
- this->localResidual().eval(element);
-
-
-// int globalI = this->elementMapper().index(element);
-// residual[cellCenterIdx][globalI] = this->localResidual().residual(0);
- }
-
- // calculate the square norm of the residual
- Scalar result2 = residual.two_norm2();
- if (this->gridView_().comm().size() > 1)
- result2 = this->gridView_().comm().sum(result2);
-
- return std::sqrt(result2);
- }
-
- /*!
- * \brief Returns the number of global degrees of freedoms (DOFs)
- */
- size_t numDofs() const
- {
- return numCellCenterDofs() + numFaceDofs();
- }
-
- /*!
- * \brief Returns the number of cell center degrees of freedoms (DOFs)
- */
- size_t numCellCenterDofs() const
- {
- return this->gridView_().size(0);
- }
-
- /*!
- * \brief Returns the number of face degrees of freedoms (DOFs)
- */
- size_t numFaceDofs() const
- {
- return this->fvGridGeometryPtr_->numIntersections();
- }
-
- const GlobalFaceVariables& curGlobalFaceVars() const
- { return curGlobalFaceVariables_; }
-
- const GlobalFaceVariables& prevGlobalFaceVars() const
- { return prevGlobalFaceVariables_; }
-
-protected:
-
- GlobalFaceVariables& nonConstCurFaceVars()
- { return curGlobalFaceVariables_; }
-
- GlobalFaceVariables curGlobalFaceVariables_;
- GlobalFaceVariables prevGlobalFaceVariables_;
-
-
-private:
-
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-
-};
-}
-
-#include "propertydefaults.hh"
-
-#endif
diff --git a/dumux/implicit/staggered/propertydefaults.hh b/dumux/implicit/staggered/propertydefaults.hh
index b3d7c27bd0..aa2fe95eab 100644
--- a/dumux/implicit/staggered/propertydefaults.hh
+++ b/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)>);
--
GitLab