diff --git a/dumux/common/structuredcubegridcreator.hh b/dumux/common/structuredcubegridcreator.hh
new file mode 100644
index 0000000000000000000000000000000000000000..c9fb064887e65e7ed7a90e1fc102b8c6a0960f9e
--- /dev/null
+++ b/dumux/common/structuredcubegridcreator.hh
@@ -0,0 +1,126 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * Copyright (C) 2007-2008 by Melanie Darcis *
+ * Copyright (C) 2007-2008 by Bernd Flemisch *
+ * Copyright (C) 2008-2009 by Andreas Lauser *
+ * Institute for Modelling Hydraulic and Environmental Systems *
+ * University of Stuttgart, Germany *
+ * email: <givenname>.<name>@iws.uni-stuttgart.de *
+ * *
+ * 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 test for the 2pni box model
+ */
+
+#ifndef DUMUX_STRUCTURED_CUBE_GRID_CREATOR_HH
+#define DUMUX_STRUCTURED_CUBE_GRID_CREATOR_HH
+
+#include <dune/grid/io/file/dgfparser.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+
+
+#include <dumux/common/basicproperties.hh>
+#include <dune/grid/utility/structuredgridfactory.hh>
+//#include <dumux/../util/structuredgridfactorysg.hh> //under discussion!
+
+
+namespace Dumux
+{
+
+namespace Properties
+{
+NEW_PROP_TAG(Scalar);
+NEW_PROP_TAG(Grid);
+}
+
+//! \cond INTERNAL
+////////////////////////
+// helper class for grid instantiation
+////////////////////////
+
+
+template <class TypeTag>
+class CubeGridCreator
+{
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef Dune::shared_ptr<Grid> GridPointer;
+
+ enum
+ {
+ dim = Grid::dimension
+ };
+
+public:
+ /*!
+ * \brief Create the Grid
+ */
+ static void makeGrid()
+ {
+ Dune::array< unsigned int, dim > cellRes;
+ Dune::FieldVector<Scalar, dim> upperRight;
+ Dune::FieldVector<Scalar, dim> lowerLeft;
+
+ lowerLeft[0] = 0.0;
+ upperRight[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightX);
+ cellRes[0] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsX);
+ if (dim > 1)
+ {
+ lowerLeft[1] = 0.0;
+ upperRight[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightY);
+ cellRes[1] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsY);
+ }
+ if (dim > 2)
+ {
+ lowerLeft[2] = 0.0;
+ upperRight[2] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightZ);
+ cellRes[2] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsZ);
+ }
+
+ cubeGrid_ = Dune::StructuredGridFactory<Grid>::createCubeGrid(lowerLeft, upperRight, cellRes);
+ }
+
+ /*!
+ * \brief Returns a reference to the grid.
+ */
+ static Grid &grid()
+ {
+ return *cubeGrid_;
+ };
+
+ /*!
+ * \brief Call loadBalance() function of Grid.
+ */
+ static void loadBalance()
+ {
+ cubeGrid_->loadBalance();
+ };
+
+private:
+ static GridPointer cubeGrid_;
+};
+
+template <class TypeTag>
+typename CubeGridCreator<TypeTag>::GridPointer CubeGridCreator<TypeTag>::cubeGrid_;
+
+}
+
+//! \endcond
+#endif
diff --git a/dumux/common/structuredgridcreator.hh b/dumux/common/structuredsimplexgridcreator.hh
similarity index 66%
rename from dumux/common/structuredgridcreator.hh
rename to dumux/common/structuredsimplexgridcreator.hh
index 9115312612771ed810d53603bfa1d0919e2609d4..5a0eadddf87aa4faba50050dbfce6e0a9c6d0f5e 100644
--- a/dumux/common/structuredgridcreator.hh
+++ b/dumux/common/structuredsimplexgridcreator.hh
@@ -27,8 +27,8 @@
* \brief test for the 2pni box model
*/
-#ifndef DUMUX_STRUCTURED_GRID_CREATOR_HH
-#define DUMUX_STRUCTURED_GRID_CREATOR_HH
+#ifndef DUMUX_STRUCTURED_SIMPLEX_GRID_CREATOR_HH
+#define DUMUX_STRUCTURED_SIMPLEX_GRID_CREATOR_HH
#include <dune/grid/io/file/dgfparser.hh>
@@ -56,70 +56,6 @@ NEW_PROP_TAG(Grid);
////////////////////////
-template <class TypeTag>
-class CubeGridCreator
-{
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef Dune::shared_ptr<Grid> GridPointer;
-
- enum
- {
- dim = Grid::dimension
- };
-
-public:
- /*!
- * \brief Create the Grid
- */
- static void makeGrid()
- {
- Dune::array< unsigned int, dim > cellRes;
- Dune::FieldVector<Scalar, dim> upperRight;
- Dune::FieldVector<Scalar, dim> lowerLeft;
-
- lowerLeft[0] = 0.0;
- upperRight[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightX);
- cellRes[0] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsX);
- if (dim > 1)
- {
- lowerLeft[1] = 0.0;
- upperRight[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightY);
- cellRes[1] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsY);
- }
- if (dim > 2)
- {
- lowerLeft[2] = 0.0;
- upperRight[2] = GET_RUNTIME_PARAM(TypeTag, Scalar, Grid.upperRightZ);
- cellRes[2] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsZ);
- }
-
- grid_ = Dune::StructuredGridFactory<Grid>::createCubeGrid(lowerLeft, upperRight, cellRes);
- }
-
- /*!
- * \brief Returns a reference to the grid.
- */
- static Grid &grid()
- {
- return *grid_;
- };
-
- /*!
- * \brief Call loadBalance() function of Grid.
- */
- static void loadBalance()
- {
- grid_->loadBalance();
- };
-
-private:
- static GridPointer grid_;
-};
-
-template <class TypeTag>
-typename CubeGridCreator<TypeTag>::GridPointer CubeGridCreator<TypeTag>::grid_;
-
template <class TypeTag>
class SimplexGridCreator
{
@@ -158,7 +94,7 @@ public:
cellRes[2] = GET_RUNTIME_PARAM(TypeTag, int, Grid.numberOfCellsZ);
}
- grid_ = Dune::StructuredGridFactory<Grid>::createSimplexGrid(lowerLeft, upperRight, cellRes);
+ simplexGrid_ = Dune::StructuredGridFactory<Grid>::createSimplexGrid(lowerLeft, upperRight, cellRes);
}
/*!
@@ -166,7 +102,7 @@ public:
*/
static Grid &grid()
{
- return *grid_;
+ return *simplexGrid_;
};
/*!
@@ -174,15 +110,15 @@ public:
*/
static void loadBalance()
{
- grid_->loadBalance();
+ simplexGrid_->loadBalance();
};
private:
- static GridPointer grid_;
+ static GridPointer simplexGrid_;
};
template <class TypeTag>
-typename SimplexGridCreator<TypeTag>::GridPointer SimplexGridCreator<TypeTag>::grid_;
+typename SimplexGridCreator<TypeTag>::GridPointer SimplexGridCreator<TypeTag>::simplexGrid_;
}