From bfa16c88f34ad70767e0b69845a4627de71ddaa6 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 24 Mar 2011 11:13:57 +0000
Subject: [PATCH] box models: fix rebase fallout
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@5463 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/common/boxproblem.hh | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/dumux/boxmodels/common/boxproblem.hh b/dumux/boxmodels/common/boxproblem.hh
index 4aeb1514d6..d64a04d0ce 100644
--- a/dumux/boxmodels/common/boxproblem.hh
+++ b/dumux/boxmodels/common/boxproblem.hh
@@ -70,12 +70,7 @@ private:
dimWorld = GridView::dimensionworld
};
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
-
-
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
@@ -405,15 +400,6 @@ public:
"a initial() method.");
}
-
- /*!
- * \brief Returns the maximum allowed time step size [s]
- *
- * By default this the time step size is unrestricted.
- */
- Scalar maxTimeStepSize() const
- { return std::numeric_limits<Scalar>::infinity(); }
-
/*!
* \brief If model coupling is used, this updates the parameters
* required to calculate the coupling fluxes between the
--
GitLab