Commit 3fb309ae authored by Andreas Lauser's avatar Andreas Lauser
Browse files

2p2cni: bring it up to stable standards

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@4184 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 231b9bb2
// $Id$
/*****************************************************************************
* Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch *
* Copyright (C) 2008-2010 by Andreas Lauser *
* Copyright (C) 2008-2009 by Melanie Darcis *
* Copyright (C) 2008-2009 by Klaus Mosthaf *
* Copyright (C) 2008-2009 by Bernd Flemisch *
* Institute of Hydraulic Engineering *
* University of Stuttgart, Germany *
* email: <givenname>.<name>@iws.uni-stuttgart.de *
......
// $Id: 2p2cniproperties.hh 3784 2010-06-24 13:43:57Z bernd $
/*****************************************************************************
* Copyright (C) 2008-2010 by Andreas Lauser *
* Copyright (C) 2008-2009 by Melanie Darcis *
* Copyright (C) 2008-2009 by Klaus Mosthaf *
* Copyright (C) 2008-2009 by 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, as long as this copyright notice *
* is included in its original form. *
* *
* This program is distributed WITHOUT ANY WARRANTY. *
*****************************************************************************/
/*!
* \file
*
* \brief Defines the indices used by the 2p2cni box model
*/
#ifndef DUMUX_2P2CNI_INDICES_HH
#define DUMUX_2P2CNI_INDICES_HH
#include <dumux/boxmodels/2p2c/2p2cindices.hh>
namespace Dumux
{
/*!
* \addtogroup TwoPTwoCNIModel
*/
// \{
/*!
* \brief Enumerations for the non-isothermal 2-phase 2-component model
*/
template <class TypeTag, int formulation, int PVOffset>
class TwoPTwoCNIIndices : public TwoPTwoCIndices<TypeTag, formulation, PVOffset>
{
public:
static const int temperatureIdx = PVOffset + 2; //! The index for temperature in primary variable vectors.
static const int energyEqIdx = PVOffset + 2; //! The index for energy in equation vectors.
};
}
#endif
......@@ -26,10 +26,6 @@
#include <dumux/boxmodels/2p2c/2p2cmodel.hh>
#include "2p2cnilocalresidual.hh"
#include "2p2cniproperties.hh"
#include "2p2cniproblem.hh"
namespace Dumux {
/*!
* \ingroup BoxProblems
......@@ -106,4 +102,6 @@ class TwoPTwoCNIModel : public TwoPTwoCModel<TypeTag>
}
#include "2p2cnipropertydefaults.hh"
#endif
......@@ -19,51 +19,17 @@
* \brief Defines the properties required for the non-isothermal two-phase,
* two-component BOX model.
*/
#ifndef DUMUX_2P2CNIPROPERTIES_HH
#define DUMUX_2P2CNIPROPERTIES_HH
#ifndef DUMUX_2P2CNI_PROPERTIES_HH
#define DUMUX_2P2CNI_PROPERTIES_HH
#include <dumux/boxmodels/2p2c/2p2cproperties.hh>
#include "2p2cnivolumevariables.hh"
#include "2p2cnifluxvariables.hh"
namespace Dumux
{
/*!
* \addtogroup TwoPTwoCNIModel
*/
// \{
////////////////////////////////
// forward declarations
////////////////////////////////
template<class TypeTag>
class TwoPTwoCNIModel;
template<class TypeTag>
class TwoPTwoCNILocalResidual;
template <class TypeTag>
class TwoPTwoCNIVolumeVariables;
template <class TypeTag>
class TwoPTwoCNIFluxVariables;
/*!
* \brief Enumerations for the non-isothermal 2-phase 2-component model
*/
template <class TypeTag, int formulation, int PVOffset>
class TwoPTwoCNIIndices : public TwoPTwoCIndices<TypeTag, formulation, PVOffset>
{
public:
static const int temperatureIdx = PVOffset + 2; //! The index for temperature in primary variable vectors.
static const int energyEqIdx = PVOffset + 2; //! The index for energy in equation vectors.
};
////////////////////////////////
// properties
////////////////////////////////
namespace Properties
{
//////////////////////////////////////////////////////////////////
......@@ -76,44 +42,8 @@ NEW_TYPE_TAG(BoxTwoPTwoCNI, INHERITS_FROM(BoxTwoPTwoC));
//////////////////////////////////////////////////////////////////
// Property tags
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG(TwoPTwoCNIIndices); //!< Enumerations for the 2p2cni models
//////////////////////////////////////////////////////////////////
// Properties
//////////////////////////////////////////////////////////////////
SET_INT_PROP(BoxTwoPTwoCNI, NumEq, 3); //!< set the number of equations to 3
//! Use the 2p2cni local jacobian operator for the 2p2cni model
SET_TYPE_PROP(BoxTwoPTwoCNI,
LocalResidual,
TwoPTwoCNILocalResidual<TypeTag>);
//! the Model property
SET_TYPE_PROP(BoxTwoPTwoCNI, Model, TwoPTwoCNIModel<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP(BoxTwoPTwoCNI, VolumeVariables, TwoPTwoCNIVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxTwoPTwoCNI, FluxVariables, TwoPTwoCNIFluxVariables<TypeTag>);
//! The indices required by the non-isothermal 2p2c model
SET_PROP(BoxTwoPTwoCNI, TwoPTwoCIndices)
{ typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCNIIndices)) type; };
SET_PROP(BoxTwoPTwoCNI, TwoPTwoCNIIndices)
{ private:
enum { formulation = GET_PROP_VALUE(TypeTag, PTAG(Formulation)) };
public:
typedef TwoPTwoCNIIndices<TypeTag, formulation, 0> type;
};
}
}
#endif
// $Id: 2p2cniproperties.hh 3784 2010-06-24 13:43:57Z bernd $
/*****************************************************************************
* Copyright (C) 2008-2010 by Andreas Lauser *
* Copyright (C) 2008-2009 by Melanie Darcis *
* Copyright (C) 2008-2009 by Klaus Mosthaf *
* Copyright (C) 2008-2009 by 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, as long as this copyright notice *
* is included in its original form. *
* *
* This program is distributed WITHOUT ANY WARRANTY. *
*****************************************************************************/
/*!
* \file
*
* \brief Defines default values for most properties required by the 2p2cni
* box model.
*/
#ifndef DUMUX_2P2CNI_PROPERTY_DEFAULTS_HH
#define DUMUX_2P2CNI_PROPERTY_DEFAULTS_HH
#include <dumux/boxmodels/2p2c/2p2cpropertydefaults.hh>
#include "2p2cnimodel.hh"
#include "2p2cniproblem.hh"
#include "2p2cniindices.hh"
#include "2p2cnilocalresidual.hh"
#include "2p2cnivolumevariables.hh"
#include "2p2cnifluxvariables.hh"
namespace Dumux
{
namespace Properties
{
//////////////////////////////////////////////////////////////////
// Property values
//////////////////////////////////////////////////////////////////
SET_INT_PROP(BoxTwoPTwoCNI, NumEq, 3); //!< set the number of equations to 3
//! Use the 2p2cni local jacobian operator for the 2p2cni model
SET_TYPE_PROP(BoxTwoPTwoCNI,
LocalResidual,
TwoPTwoCNILocalResidual<TypeTag>);
//! the Model property
SET_TYPE_PROP(BoxTwoPTwoCNI, Model, TwoPTwoCNIModel<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP(BoxTwoPTwoCNI, VolumeVariables, TwoPTwoCNIVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxTwoPTwoCNI, FluxVariables, TwoPTwoCNIFluxVariables<TypeTag>);
//! The indices required by the non-isothermal 2p2c model
SET_PROP(BoxTwoPTwoCNI, TwoPTwoCIndices)
{ typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCNIIndices)) type; };
SET_PROP(BoxTwoPTwoCNI, TwoPTwoCNIIndices)
{ private:
enum { formulation = GET_PROP_VALUE(TypeTag, PTAG(Formulation)) };
public:
typedef TwoPTwoCNIIndices<TypeTag, formulation, 0> type;
};
}
}
#endif
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