Commit 39e8e074 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[cleanup] Remove or deprecate everything related with SGrid.

(reviewed by nicolas)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15112 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 91a76d84
......@@ -13,6 +13,8 @@ Differences Between DuMuX 2.7 and DuMuX 2.8
with flow in a porous medium have been added.
* IMMEDIATE INTERFACE CHANGES not allowing/requiring a deprecation period:
- The use and support for SGrid is dropped. SGrid is deprecated in Dune 2.4.
Use YaspGrid instead.
* Deprecated PROPERTY and PARAMETER NAMES, to be removed after 2.8: BEWARE: The
compiler will not print any warning if a deprecated property or parameter name
......@@ -23,7 +25,7 @@ Differences Between DuMuX 2.7 and DuMuX 2.8
* Deprecated MEMBER FUNCTIONS, to be removed after 2.8:
- The method simulate(Scalar dtInitial, Scalar tEnd) from MultiDomainProblem,
it is unused and wil be dropped.
it is unused and will be dropped.
* Deprecated protected MEMBER VARIABLES, to be removed after 2.8: BEWARE: Older
compilers will not print any warning if a deprecated protected member variable
......
......@@ -63,7 +63,7 @@ namespace Dumux
*
* Remark1: only for 2-D quadrilateral grid
*
* Remark2: implemented for UGGrid, ALUGrid, or SGrid/YaspGrid
* Remark2: implemented for UGGrid, ALUGrid, or YaspGrid
*
*\tparam TypeTag The problem Type Tag
*/
......@@ -553,8 +553,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// get 'nextIsIt'
switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid and YaspGrid
case GridTypeIndices::sGrid:
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
if (nextIsIt == isEndIt)
......@@ -650,8 +649,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// get 'nextIsIt'
switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid and YaspGrid
case GridTypeIndices::sGrid:
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
if (nextIsIt == isEndIt)
......@@ -780,8 +778,7 @@ void FvMpfaL2dPressure2p<TypeTag>::storeInteractionVolumeInfo()
//get isIt14
switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid and YaspGrid
case GridTypeIndices::sGrid:
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
if (isIt14 == isIt12End)
......
......@@ -39,7 +39,7 @@ namespace Dumux
*
* Remark1: only for 2-D quadrilateral grids!
*
* Remark2: can use UGGrid, ALUGrid or SGrid/YaspGrid!
* Remark2: can use UGGrid, ALUGrid, or YaspGrid
*
* \tparam TypeTag The problem Type Tag
*/
......
......@@ -58,7 +58,7 @@ namespace Dumux
*
* Remark1: only for 2-D quadrilateral grid
*
* Remark2: implemented for UGGrid, ALUGrid, or SGrid/YaspGrid
* Remark2: implemented for UGGrid, ALUGrid, or YaspGrid
*
*\tparam TypeTag The problem Type Tag
*/
......@@ -528,8 +528,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// get 'nextIsIt'
switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid and YaspGrid
case GridTypeIndices::sGrid:
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
if (nextIsIt == isEndIt)
......@@ -628,8 +627,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// get 'nextIsIt'
switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid and YaspGrid
case GridTypeIndices::sGrid:
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
if (nextIsIt == isEndIt)
......@@ -774,8 +772,7 @@ void FvMpfaO2dPressure2p<TypeTag>::storeInteractionVolumeInfo()
//get isIt14
switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid and YaspGrid
case GridTypeIndices::sGrid:
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
if (isIt14 == isIt12End)
......
......@@ -38,7 +38,7 @@ namespace Dumux
*
* Remark1: only for 2-D quadrilateral grids!
*
* Remark2: can use UGGrid, ALUGrid or SGrid/YaspGrid!
* Remark2: can use UGGrid, ALUGrid, or YaspGrid
*
* \tparam TypeTag The problem Type Tag
*/
......
......@@ -30,7 +30,6 @@
// dumux environment
#include <dumux/decoupled/common/decoupledproperties.hh>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/sgrid.hh>
#if HAVE_ALUGRID
#include <dune/grid/alugrid/2d/alugrid.hh>
#include <dune/grid/alugrid/3d/alugrid.hh>
......@@ -53,8 +52,6 @@ struct GridTypes
public:
//
static const int any = 0;
//SGrid
static const int sGrid = 1;
//YaspGrid
static const int yaspGrid = 2;
//UGGrid
......@@ -75,12 +72,6 @@ struct GridImp<Dune::YaspGrid<dim>, dim>
static const int imp = GridTypes::yaspGrid;
};
template<int dim>
struct GridImp<Dune::SGrid<dim, dim>, dim>
{
static const int imp = GridTypes::sGrid;
};
#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
template<int dim>
struct GridImp<Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming>, dim>
......
......@@ -23,6 +23,8 @@
#ifndef DUMUX_ADAPTIVEGRIDRESTART_HH
#define DUMUX_ADAPTIVEGRIDRESTART_HH
#include <dune/common/deprecated.hh>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/sgrid.hh>
#if HAVE_ALUGRID
......@@ -61,7 +63,9 @@ struct GridRestartCheck<Dune::YaspGrid<dim>, dim>
};
template<int dim>
struct GridRestartCheck<Dune::SGrid<dim, dim>, dim>
struct
DUNE_DEPRECATED_MSG("SGrid is deprecated in Dune 2.4, use YaspGrid instead.")
GridRestartCheck<Dune::SGrid<dim, dim>, dim>
{
static const bool allowRestart = false;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment