Commit 1d8585c8 authored by Andreas Lauser's avatar Andreas Lauser
Browse files

fix 'make headercheck'

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7514 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 834b576e
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......@@ -31,44 +33,11 @@
#ifndef DUMUX_STOKESPROPERTIES_HH
#define DUMUX_STOKESPROPERTIES_HH
#include "stokesindices.hh"
#include <dumux/boxmodels/common/boxproperties.hh>
#include "stokeslocaljacobian.hh"
#include "stokesnewtoncontroller.hh"
#include <dumux/material/fluidsystems/gasphase.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/nullcomponent.hh>
#include <dumux/material/fluidsystems/1pfluidsystem.hh>
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
namespace Dumux
{
////////////////////////////////
// forward declarations
////////////////////////////////
template<class TypeTag>
class StokesModel;
template<class TypeTag>
class StokesLocalResidual;
template <class TypeTag>
class StokesVolumeVariables;
template <class TypeTag>
class StokesFluxVariables;
template <class TypeTag>
class StokesNewtonController;
// \}
////////////////////////////////
// properties
////////////////////////////////
......@@ -106,79 +75,6 @@ NEW_PROP_TAG(PhaseIndex);
NEW_PROP_TAG(SpatialParameters);
NEW_PROP_TAG(Scaling); //!Defines Scaling of the model
//////////////////////////////////////////////////////////////////
// Properties
//////////////////////////////////////////////////////////////////
//! The local jacobian operator for the stokes box scheme
SET_TYPE_PROP(BoxStokes, LocalJacobian, Dumux::StokesLocalJacobian<TypeTag>);
SET_PROP(BoxStokes, NumEq) //!< set the number of equations
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
static const int dim = Grid::dimension;
public:
static constexpr int value = 1 + dim;
};
SET_SCALAR_PROP(BoxStokes, Scaling, 1); //!< set scaling to 1 by default
//! Use the Stokes local residual function for the Stokes model
SET_TYPE_PROP(BoxStokes,
LocalResidual,
StokesLocalResidual<TypeTag>);
// Use the Stokes specific newton controller for the Stokes model
SET_PROP(BoxStokes, NewtonController)
{public:
typedef StokesNewtonController<TypeTag> type;
};
#if HAVE_SUPERLU
SET_TYPE_PROP(BoxStokes, LinearSolver, SuperLUBackend<TypeTag>);
#endif
//! the Model property
SET_TYPE_PROP(BoxStokes, Model, StokesModel<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP(BoxStokes, VolumeVariables, StokesVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxStokes, FluxVariables, StokesFluxVariables<TypeTag>);
//! the upwind factor for the mobility.
SET_SCALAR_PROP(BoxStokes, MassUpwindWeight, 1.0);
//! The fluid system to use by default
SET_PROP(BoxStokes, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef FluidSystems::OneP<Scalar, Fluid> type;
};
SET_PROP(BoxStokes, Fluid)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
SET_TYPE_PROP(BoxStokes, StokesIndices, StokesCommonIndices<TypeTag>);
//! Choose the type of the employed fluid state
SET_PROP(BoxStokes, FluidState)
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> type;
};
SET_INT_PROP(BoxStokes, PhaseIndex, 0);
// \}
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
* Institute of Hydraulic Engineering *
* 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/>. *
*****************************************************************************/
/*!
* \ingroup Properties
* \ingroup BoxProperties
* \ingroup BoxStokesModel
*
* \file
*
* \brief Defines the properties required for the Stokes BOX model.
*/
#ifndef DUMUX_STOKES_PROPERTY_DEFAULTS_HH
#define DUMUX_STOKES_PROPERTY_DEFAULTS_HH
#include "stokesproperties.hh"
#include "stokesindices.hh"
#include "stokeslocaljacobian.hh"
#include "stokesnewtoncontroller.hh"
#include <dumux/material/fluidsystems/gasphase.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/nullcomponent.hh>
#include <dumux/material/fluidsystems/1pfluidsystem.hh>
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
namespace Dumux
{
////////////////////////////////
// forward declarations
////////////////////////////////
template<class TypeTag>
class StokesModel;
template<class TypeTag>
class StokesLocalResidual;
template <class TypeTag>
class StokesVolumeVariables;
template <class TypeTag>
class StokesFluxVariables;
template <class TypeTag>
class StokesNewtonController;
// \}
////////////////////////////////
// properties
////////////////////////////////
namespace Properties
{
/*!
* \addtogroup BoxStokesModel
*/
// \{
//////////////////////////////////////////////////////////////////
// Properties
//////////////////////////////////////////////////////////////////
//! The local jacobian operator for the stokes box scheme
SET_TYPE_PROP(BoxStokes, LocalJacobian, Dumux::StokesLocalJacobian<TypeTag>);
SET_PROP(BoxStokes, NumEq) //!< set the number of equations
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
static const int dim = Grid::dimension;
public:
static constexpr int value = 1 + dim;
};
SET_SCALAR_PROP(BoxStokes, Scaling, 1); //!< set scaling to 1 by default
//! Use the Stokes local residual function for the Stokes model
SET_TYPE_PROP(BoxStokes,
LocalResidual,
StokesLocalResidual<TypeTag>);
// Use the Stokes specific newton controller for the Stokes model
SET_PROP(BoxStokes, NewtonController)
{public:
typedef StokesNewtonController<TypeTag> type;
};
#if HAVE_SUPERLU
SET_TYPE_PROP(BoxStokes, LinearSolver, SuperLUBackend<TypeTag>);
#endif
//! the Model property
SET_TYPE_PROP(BoxStokes, Model, StokesModel<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP(BoxStokes, VolumeVariables, StokesVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxStokes, FluxVariables, StokesFluxVariables<TypeTag>);
//! the upwind factor for the mobility.
SET_SCALAR_PROP(BoxStokes, MassUpwindWeight, 1.0);
//! The fluid system to use by default
SET_PROP(BoxStokes, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef FluidSystems::OneP<Scalar, Fluid> type;
};
SET_PROP(BoxStokes, Fluid)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
SET_TYPE_PROP(BoxStokes, StokesIndices, StokesCommonIndices<TypeTag>);
//! Choose the type of the employed fluid state
SET_PROP(BoxStokes, FluidState)
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> type;
};
SET_INT_PROP(BoxStokes, PhaseIndex, 0);
// \}
}
}
#endif
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2011 by Katherina Baber, Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......@@ -161,4 +163,6 @@ public:
}
#include "stokes2cpropertydefaults.hh"
#endif
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch *
* Institute of Hydraulic Engineering *
......@@ -30,12 +32,7 @@
#ifndef DUMUX_STOKES2CPROPERTIES_HH
#define DUMUX_STOKES2CPROPERTIES_HH
#include "stokes2cindices.hh"
#include <dumux/freeflow/stokes/stokesproperties.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
#include "stokes2clocalresidual.hh"
namespace Dumux
{
......@@ -43,24 +40,6 @@ namespace Dumux
* \addtogroup BoxStokes2cModel
*/
// \{
////////////////////////////////
// forward declarations
////////////////////////////////
template<class TypeTag>
class Stokes2cModel;
template<class TypeTag>
class Stokes2cLocalResidual;
template <class TypeTag>
class Stokes2cVolumeVariables;
template <class TypeTag>
class Stokes2cFluxVariables;
////////////////////////////////
// properties
////////////////////////////////
namespace Properties
{
......@@ -78,59 +57,8 @@ NEW_TYPE_TAG(BoxStokes2c, INHERITS_FROM(BoxStokes));
NEW_PROP_TAG(Stokes2cIndices); //!< Enumerations for the compositional stokes models
NEW_PROP_TAG(NumComponents); //!< Number of components
//////////////////////////////////////////////////////////////////
// Properties
//////////////////////////////////////////////////////////////////
SET_PROP(BoxStokes2c, NumEq) //!< set the number of equations
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
static const int dim = Grid::dimension;
public:
static constexpr int value = 2 + dim;
};
//! Use the stokes2c local jacobian operator for the compositional stokes model
SET_TYPE_PROP(BoxStokes2c,
LocalResidual,
Stokes2cLocalResidual<TypeTag>);
//! the Model property
SET_TYPE_PROP(BoxStokes2c, Model, Stokes2cModel<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP(BoxStokes2c, VolumeVariables, Stokes2cVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxStokes2c, FluxVariables, Stokes2cFluxVariables<TypeTag>);
//! the Indices for the Stokes2c model
SET_TYPE_PROP(BoxStokes2c,
Stokes2cIndices,
Stokes2cCommonIndices<TypeTag>);
//! Set the number of components to 2
SET_INT_PROP(BoxStokes2c, NumComponents, 2);
//! Choose the type of the employed fluid state
SET_PROP(BoxStokes2c, FluidState)
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
};
//! Choose the considered phase
SET_PROP(BoxStokes2c, PhaseIndex)
{
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
public:
static constexpr int value = Indices::gPhaseIdx;
};
}
}
#endif
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch *
* Institute of Hydraulic Engineering *
* 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/>. *
*****************************************************************************/
/*!
* \ingroup Properties
* \ingroup BoxProperties
* \ingroup BoxStokes2cModel
*
* \file
*
* \brief Defines the properties required for the compositional
* stokes BOX model.
*/
#ifndef DUMUX_STOKES2C_PROPERTY_DEFAULTS_HH
#define DUMUX_STOKES2C_PROPERTY_DEFAULTS_HH
#include "stokes2cproperties.hh"
#include "stokes2cindices.hh"
#include "stokes2clocalresidual.hh"
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
namespace Dumux
{
/*!
* \addtogroup BoxStokes2cModel
*/
// \{
////////////////////////////////
// forward declarations
////////////////////////////////
template<class TypeTag>
class Stokes2cModel;
template<class TypeTag>
class Stokes2cLocalResidual;
template <class TypeTag>
class Stokes2cVolumeVariables;
template <class TypeTag>
class Stokes2cFluxVariables;
////////////////////////////////
// properties
////////////////////////////////
namespace Properties
{
//////////////////////////////////////////////////////////////////
// Properties
//////////////////////////////////////////////////////////////////
SET_PROP(BoxStokes2c, NumEq) //!< set the number of equations
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
static const int dim = Grid::dimension;
public:
static constexpr int value = 2 + dim;
};
//! Use the stokes2c local jacobian operator for the compositional stokes model
SET_TYPE_PROP(BoxStokes2c,
LocalResidual,
Stokes2cLocalResidual<TypeTag>);
//! the Model property
SET_TYPE_PROP(BoxStokes2c, Model, Stokes2cModel<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP(BoxStokes2c, VolumeVariables, Stokes2cVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxStokes2c, FluxVariables, Stokes2cFluxVariables<TypeTag>);
//! the Indices for the Stokes2c model
SET_TYPE_PROP(BoxStokes2c,
Stokes2cIndices,
Stokes2cCommonIndices<TypeTag>);
//! Set the number of components to 2
SET_INT_PROP(BoxStokes2c, NumComponents, 2);
//! Choose the type of the employed fluid state
SET_PROP(BoxStokes2c, FluidState)
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
};
//! Choose the considered phase
SET_PROP(BoxStokes2c, PhaseIndex)
{
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
public:
static constexpr int value = Indices::gPhaseIdx;
};
}
}
#endif
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2011 by Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010 by Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser *
......@@ -177,4 +179,7 @@ public:
};
}
#include "stokes2cnipropertydefaults.hh"
#endif
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch *
* Institute of Hydraulic Engineering *
......@@ -27,43 +29,13 @@
* \brief Defines the properties required for the non-isothermal compositional
* stokes BOX model.
*/
#ifndef DUMUX_STOKES2CNIPROPERTIES_HH
#define DUMUX_STOKES2CNIPROPERTIES_HH