Commit 05ceb4c1 authored by Klaus Mosthaf's avatar Klaus Mosthaf
Browse files

renamed spatialparameters to spatialparams in 2p2c and 2p2cni box test

folders


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8189 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent ede2be67
......@@ -35,7 +35,7 @@
#include <dumux/boxmodels/common/porousmediaboxproblem.hh>
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
#include "injectionspatialparameters.hh"
#include "injectionspatialparams.hh"
namespace Dumux
{
......@@ -45,7 +45,7 @@ class InjectionProblem;
namespace Properties
{
NEW_TYPE_TAG(InjectionProblem, INHERITS_FROM(BoxTwoPTwoC, InjectionSpatialParameters));
NEW_TYPE_TAG(InjectionProblem, INHERITS_FROM(BoxTwoPTwoC, InjectionSpatialParams));
// Set the grid type
SET_PROP(InjectionProblem, Grid)
......
......@@ -27,8 +27,8 @@
* problem which uses the isothermal 2p2c box model
*/
#ifndef DUMUX_INJECTION_SPATIAL_PARAMETERS_HH
#define DUMUX_INJECTION_SPATIAL_PARAMETERS_HH
#ifndef DUMUX_INJECTION_SPATIAL_PARAMS_HH
#define DUMUX_INJECTION_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparameters/boxspatialparameters.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
......@@ -42,18 +42,18 @@ namespace Dumux
//forward declaration
template<class TypeTag>
class InjectionSpatialParameters;
class InjectionSpatialParams;
namespace Properties
{
// The spatial parameters TypeTag
NEW_TYPE_TAG(InjectionSpatialParameters);
NEW_TYPE_TAG(InjectionSpatialParams);
// Set the spatial parameters
SET_TYPE_PROP(InjectionSpatialParameters, SpatialParams, Dumux::InjectionSpatialParameters<TypeTag>);
SET_TYPE_PROP(InjectionSpatialParams, SpatialParams, Dumux::InjectionSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(InjectionSpatialParameters, MaterialLaw)
SET_PROP(InjectionSpatialParams, MaterialLaw)
{
private:
// define the material law which is parameterized by effective
......@@ -73,7 +73,7 @@ SET_PROP(InjectionSpatialParameters, MaterialLaw)
* problem which uses the isothermal 2p2c box model
*/
template<class TypeTag>
class InjectionSpatialParameters : public BoxSpatialParameters<TypeTag>
class InjectionSpatialParams : public BoxSpatialParameters<TypeTag>
{
typedef BoxSpatialParameters<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
......@@ -107,7 +107,7 @@ public:
*
* \param gridView The grid view
*/
InjectionSpatialParameters(const GridView &gridView)
InjectionSpatialParams(const GridView &gridView)
: ParentType(gridView)
{
layerBottom_ = 22.0;
......@@ -133,7 +133,7 @@ public:
coarseMaterialParams_.setLambda(2.0);
}
~InjectionSpatialParameters()
~InjectionSpatialParams()
{}
/*!
......
......@@ -38,7 +38,7 @@
#include <dumux/boxmodels/2p2cni/2p2cnimodel.hh>
#include <dumux/boxmodels/common/porousmediaboxproblem.hh>
#include "waterairspatialparameters.hh"
#include "waterairspatialparams.hh"
#define ISOTHERMAL 0
......@@ -49,7 +49,7 @@ class WaterAirProblem;
namespace Properties
{
NEW_TYPE_TAG(WaterAirProblem, INHERITS_FROM(BoxTwoPTwoCNI, WaterAirSpatialParameters));
NEW_TYPE_TAG(WaterAirProblem, INHERITS_FROM(BoxTwoPTwoCNI, WaterAirSpatialParams));
// Set the grid type
SET_PROP(WaterAirProblem, Grid)
......
......@@ -25,8 +25,8 @@
*
* \brief Definition of the spatial parameters for the water-air problem.
*/
#ifndef DUMUX_WATER_AIR_SPATIAL_PARAMETERS_HH
#define DUMUX_WATER_AIR_SPATIAL_PARAMETERS_HH
#ifndef DUMUX_WATER_AIR_SPATIAL_PARAMS_HH
#define DUMUX_WATER_AIR_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparameters/boxspatialparameters.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
......@@ -40,18 +40,18 @@ namespace Dumux
//forward declaration
template<class TypeTag>
class WaterAirSpatialParameters;
class WaterAirSpatialParams;
namespace Properties
{
// The spatial parameters TypeTag
NEW_TYPE_TAG(WaterAirSpatialParameters);
NEW_TYPE_TAG(WaterAirSpatialParams);
// Set the spatial parameters
SET_TYPE_PROP(WaterAirSpatialParameters, SpatialParams, Dumux::WaterAirSpatialParameters<TypeTag>);
SET_TYPE_PROP(WaterAirSpatialParams, SpatialParams, Dumux::WaterAirSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(WaterAirSpatialParameters, MaterialLaw)
SET_PROP(WaterAirSpatialParams, MaterialLaw)
{
private:
// define the material law which is parameterized by effective
......@@ -70,7 +70,7 @@ SET_PROP(WaterAirSpatialParameters, MaterialLaw)
* \brief Definition of the spatial parameters for the water-air problem
*/
template<class TypeTag>
class WaterAirSpatialParameters : public BoxSpatialParameters<TypeTag>
class WaterAirSpatialParams : public BoxSpatialParameters<TypeTag>
{
typedef BoxSpatialParameters<TypeTag> ParentType;
......@@ -106,7 +106,7 @@ public:
*
* \param gridView The grid view
*/
WaterAirSpatialParameters(const GridView &gridView)
WaterAirSpatialParams(const GridView &gridView)
: ParentType(gridView)
{
layerBottom_ = 22.0;
......@@ -132,7 +132,7 @@ public:
coarseMaterialParams_.setLambda(2.0);
}
~WaterAirSpatialParameters()
~WaterAirSpatialParams()
{}
/*!
......
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