From 30d4a3c96c68bd95dee423fa745dd110b5fe79f4 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 10 May 2012 12:21:08 +0000
Subject: [PATCH] more SpatialParameters -> SpatialParams
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8293 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../generalproblem/generallensproblem.hh | 10 ++++-----
...ameters.hh => generallensspatialparams.hh} | 21 +++++++++---------
test/decoupled/1p/test_1pspatialparams.hh | 10 ++++-----
.../1p/test_diffusionspatialparams.hh | 10 ++++-----
test/decoupled/2p/test_impesspatialparams.hh | 10 ++++-----
.../2p/test_transportspatialparams.hh | 10 ++++-----
.../2p2c/test_dec2p2c_spatialparams.hh | 10 ++++-----
.../test_impesadaptivespatialparams.hh | 10 ++++-----
tutorial/tutorialproblem_decoupled.hh | 4 ++--
....hh => tutorialspatialparams_decoupled.hh} | 22 +++++++++----------
10 files changed, 58 insertions(+), 59 deletions(-)
rename test/common/generalproblem/{generallensspatialparameters.hh => generallensspatialparams.hh} (89%)
rename tutorial/{tutorialspatialparameters_decoupled.hh => tutorialspatialparams_decoupled.hh} (87%)
diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh
index 1b5882199a..8ac7688dad 100644
--- a/test/common/generalproblem/generallensproblem.hh
+++ b/test/common/generalproblem/generallensproblem.hh
@@ -53,7 +53,7 @@
#include<dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
-#include "generallensspatialparameters.hh"
+#include "generallensspatialparams.hh"
namespace Dumux
{
@@ -67,7 +67,7 @@ class GeneralLensProblem;
namespace Properties
{
//Set the general problem TypeTag which does not depend on the model
-NEW_TYPE_TAG(GeneralLensProblem, INHERITS_FROM(GeneralLensSpatialParameters));
+NEW_TYPE_TAG(GeneralLensProblem, INHERITS_FROM(GeneralLensSpatialParams));
// Property for defining the model specific problem base class
NEW_PROP_TAG(ProblemBaseClass);
@@ -122,7 +122,7 @@ SET_PROP(BoxGeneralLensProblem, ProblemBaseClass)
// Set the problem property
SET_PROP(BoxGeneralLensProblem, SpatialParamsBaseClass)
{
- typedef Dumux::BoxSpatialParameters<TypeTag> type;
+ typedef Dumux::BoxSpatialParams<TypeTag> type;
};
@@ -142,7 +142,7 @@ SET_PROP(DecoupledGeneralLensProblem, ProblemBaseClass)
// Set the problem property
SET_PROP(DecoupledGeneralLensProblem, SpatialParamsBaseClass)
{
- typedef Dumux::FVSpatialParameters<TypeTag> type;
+ typedef Dumux::FVSpatialParams<TypeTag> type;
};
SET_INT_PROP(DecoupledGeneralLensProblem, Formulation,
@@ -255,7 +255,7 @@ public:
{
eps_ = 3e-6;
temperature_ = 273.15 + 20; // -> 20°C
- this->spatialParameters().setLensCoords(lensLowerLeft, lensUpperRight);
+ this->spatialParams().setLensCoords(lensLowerLeft, lensUpperRight);
this->timeManager().startNextEpisode(500);
}
diff --git a/test/common/generalproblem/generallensspatialparameters.hh b/test/common/generalproblem/generallensspatialparams.hh
similarity index 89%
rename from test/common/generalproblem/generallensspatialparameters.hh
rename to test/common/generalproblem/generallensspatialparams.hh
index 524032f31a..45ff3e139a 100644
--- a/test/common/generalproblem/generallensspatialparameters.hh
+++ b/test/common/generalproblem/generallensspatialparams.hh
@@ -28,11 +28,11 @@
* \brief The spatial parameters for the GeneralLensProblem which uses the
* twophase box model or twophase decoupled model
*/
-#ifndef DUMUX_GENERALLENSSPATIALPARAMETERS_HH
-#define DUMUX_GENERALLENSSPATIALPARAMETERS_HH
+#ifndef DUMUX_GENERALLENSSPATIALPARAMS_HH
+#define DUMUX_GENERALLENSSPATIALPARAMS_HH
-#include <dumux/material/spatialparameters/boxspatialparameters.hh>
-#include <dumux/material/spatialparameters/fvspatialparameters.hh>
+#include <dumux/material/spatialparams/boxspatialparams.hh>
+#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -42,22 +42,21 @@ namespace Dumux
{
//forward declaration
template<class TypeTag>
-class GeneralLensSpatialParameters;
+class GeneralLensSpatialParams;
namespace Properties
{
// The spatial parameters TypeTag
-NEW_TYPE_TAG(GeneralLensSpatialParameters);
+NEW_TYPE_TAG(GeneralLensSpatialParams);
// Property to define the spatial parameters base class -> allows switch with model switch!
NEW_PROP_TAG(SpatialParamsBaseClass);
// Set the spatial parameters
-SET_TYPE_PROP(GeneralLensSpatialParameters, SpatialParameters, Dumux::GeneralLensSpatialParameters<TypeTag>);
-SET_TYPE_PROP(GeneralLensSpatialParameters, SpatialParams, Dumux::GeneralLensSpatialParameters<TypeTag>);
+SET_TYPE_PROP(GeneralLensSpatialParams, SpatialParams, Dumux::GeneralLensSpatialParams<TypeTag>);
// Set the material Law
-SET_PROP(GeneralLensSpatialParameters, MaterialLaw)
+SET_PROP(GeneralLensSpatialParams, MaterialLaw)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -75,7 +74,7 @@ public:
* twophase box model or twophase decoupled model
*/
template<class TypeTag>
-class GeneralLensSpatialParameters : public GET_PROP_TYPE(TypeTag, SpatialParamsBaseClass)
+class GeneralLensSpatialParams : public GET_PROP_TYPE(TypeTag, SpatialParamsBaseClass)
{
typedef typename GET_PROP_TYPE(TypeTag, SpatialParamsBaseClass) ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
@@ -103,7 +102,7 @@ public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
- GeneralLensSpatialParameters(const GridView& gridView)
+ GeneralLensSpatialParams(const GridView& gridView)
: ParentType(gridView)
{
// residual saturations
diff --git a/test/decoupled/1p/test_1pspatialparams.hh b/test/decoupled/1p/test_1pspatialparams.hh
index dfdc6075fc..56aa59e073 100644
--- a/test/decoupled/1p/test_1pspatialparams.hh
+++ b/test/decoupled/1p/test_1pspatialparams.hh
@@ -24,10 +24,10 @@
*
* \brief spatial parameters for the test problem for diffusion models.
*/
-#ifndef TEST_1P_SPATIALPARAMETERS_HH
-#define TEST_1P_SPATIALPARAMETERS_HH
+#ifndef TEST_1P_SPATIALPARAMS_HH
+#define TEST_1P_SPATIALPARAMS_HH
-#include <dumux/material/spatialparameters/fvspatialparameters1p.hh>
+#include <dumux/material/spatialparams/fvspatialparams1p.hh>
namespace Dumux
{
@@ -37,9 +37,9 @@ namespace Dumux
* \brief spatial parameters for the test problem for 1-p diffusion models.
*/
template<class TypeTag>
-class TestOnePSpatialParams: public FVSpatialParametersOneP<TypeTag>
+class TestOnePSpatialParams: public FVSpatialParamsOneP<TypeTag>
{
- typedef FVSpatialParametersOneP<TypeTag> ParentType;
+ typedef FVSpatialParamsOneP<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/test/decoupled/1p/test_diffusionspatialparams.hh b/test/decoupled/1p/test_diffusionspatialparams.hh
index 3ff1dcf574..a360b9aa5f 100644
--- a/test/decoupled/1p/test_diffusionspatialparams.hh
+++ b/test/decoupled/1p/test_diffusionspatialparams.hh
@@ -24,10 +24,10 @@
*
* \brief spatial parameters for the test problem for diffusion models.
*/
-#ifndef TEST_DIFFUSION_SPATIALPARAMETERS_HH
-#define TEST_DIFFUSION_SPATIALPARAMETERS_HH
+#ifndef TEST_DIFFUSION_SPATIALPARAMS_HH
+#define TEST_DIFFUSION_SPATIALPARAMS_HH
-#include <dumux/material/spatialparameters/fvspatialparameters.hh>
+#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -62,9 +62,9 @@ public:
* \brief spatial parameters for the test problem for diffusion models.
*/
template<class TypeTag>
-class TestDiffusionSpatialParams: public FVSpatialParameters<TypeTag>
+class TestDiffusionSpatialParams: public FVSpatialParams<TypeTag>
{
- typedef FVSpatialParameters<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::IndexSet IndexSet;
diff --git a/test/decoupled/2p/test_impesspatialparams.hh b/test/decoupled/2p/test_impesspatialparams.hh
index 7ca9d3c209..3c56018758 100644
--- a/test/decoupled/2p/test_impesspatialparams.hh
+++ b/test/decoupled/2p/test_impesspatialparams.hh
@@ -24,10 +24,10 @@
*
* \brief spatial parameters for the sequential 2p test
*/
-#ifndef TEST_IMPES_SPATIALPARAMETERS_HH
-#define TEST_IMPES_SPATIALPARAMETERS_HH
+#ifndef TEST_IMPES_SPATIALPARAMS_HH
+#define TEST_IMPES_SPATIALPARAMS_HH
-#include <dumux/material/spatialparameters/fvspatialparameters.hh>
+#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -64,12 +64,12 @@ public:
* \brief spatial parameters for the sequential 2p test
*/
template<class TypeTag>
-class TestIMPESSpatialParams: public FVSpatialParameters<TypeTag>
+class TestIMPESSpatialParams: public FVSpatialParams<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef FVSpatialParameters<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename Grid::ctype CoordScalar;
enum
diff --git a/test/decoupled/2p/test_transportspatialparams.hh b/test/decoupled/2p/test_transportspatialparams.hh
index 779aaf3e9f..6af96fbb18 100644
--- a/test/decoupled/2p/test_transportspatialparams.hh
+++ b/test/decoupled/2p/test_transportspatialparams.hh
@@ -24,10 +24,10 @@
*
* \brief spatial parameters for the explicit transport test
*/
-#ifndef TEST_TRANSPORT_SPATIALPARAMETERS_HH
-#define TEST_TRANSPORT_SPATIALPARAMETERS_HH
+#ifndef TEST_TRANSPORT_SPATIALPARAMS_HH
+#define TEST_TRANSPORT_SPATIALPARAMS_HH
-#include <dumux/material/spatialparameters/fvspatialparameters.hh>
+#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -63,9 +63,9 @@ public:
* \brief spatial parameters for the explicit transport test
*/
template<class TypeTag>
-class TestTransportSpatialParams: public FVSpatialParameters<TypeTag>
+class TestTransportSpatialParams: public FVSpatialParams<TypeTag>
{
- typedef FVSpatialParameters<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
index 0ef2a8647b..5dc805b3f4 100644
--- a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
+++ b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
@@ -24,11 +24,11 @@
*
* \brief spatial parameters for the sequential 2p2c test
*/
-#ifndef TEST_2P2C_SPATIALPARAMETERS_HH
-#define TEST_2P2C_SPATIALPARAMETERS_HH
+#ifndef TEST_2P2C_SPATIALPARAMS_HH
+#define TEST_2P2C_SPATIALPARAMS_HH
#include <dumux/decoupled/2p2c/2p2cproperties.hh>
-#include <dumux/material/spatialparameters/fvspatialparameters.hh>
+#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
//#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -64,7 +64,7 @@ public:
* \brief spatial parameters for the sequential 2p2c test
*/
template<class TypeTag>
-class Test2P2CSpatialParams : public FVSpatialParameters<TypeTag>
+class Test2P2CSpatialParams : public FVSpatialParams<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -101,7 +101,7 @@ public:
}
- Test2P2CSpatialParams(const GridView& gridView) : FVSpatialParameters<TypeTag>(gridView),
+ Test2P2CSpatialParams(const GridView& gridView) : FVSpatialParams<TypeTag>(gridView),
constPermeability_(0)
{
// residual saturations
diff --git a/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh b/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
index 4f5d997ff6..72d363d78d 100644
--- a/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
+++ b/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
@@ -24,10 +24,10 @@
*
* \brief spatial parameters for the sequential 2p test
*/
-#ifndef TEST_IMPES_ADAPTIVE_SPATIALPARAMETERS_HH
-#define TEST_IMPES_ADAPTIVE_SPATIALPARAMETERS_HH
+#ifndef TEST_IMPES_ADAPTIVE_SPATIALPARAMS_HH
+#define TEST_IMPES_ADAPTIVE_SPATIALPARAMS_HH
-#include <dumux/material/spatialparameters/fvspatialparameters.hh>
+#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -64,12 +64,12 @@ public:
* \brief spatial parameters for the sequential 2p test
*/
template<class TypeTag>
-class TestIMPESAdaptiveSpatialParams: public FVSpatialParameters<TypeTag>
+class TestIMPESAdaptiveSpatialParams: public FVSpatialParams<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef FVSpatialParameters<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename Grid::ctype CoordScalar;
enum
diff --git a/tutorial/tutorialproblem_decoupled.hh b/tutorial/tutorialproblem_decoupled.hh
index f88465f7ba..a01a96ed36 100644
--- a/tutorial/tutorialproblem_decoupled.hh
+++ b/tutorial/tutorialproblem_decoupled.hh
@@ -40,7 +40,7 @@
#include <dumux/decoupled/2p/impes/impesproblem2p.hh> /*@\label{tutorial-decoupled:parent-problem}@*/
// assign parameters dependent on space (e.g. spatial parameters)
-#include "tutorialspatialparameters_decoupled.hh" /*@\label{tutorial-decoupled:spatialparameters}@*/
+#include "tutorialspatialparams_decoupled.hh" /*@\label{tutorial-decoupled:spatialparameters}@*/
// include cfl-criterion after coats: more suitable if the problem is not advection dominated
#include<dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
@@ -61,7 +61,7 @@ class TutorialProblemDecoupled;
namespace Properties
{
// create a new type tag for the problem
-NEW_TYPE_TAG(TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TutorialSpatialParametersDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/
+NEW_TYPE_TAG(TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TutorialSpatialParamsDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/
// Set the problem property
SET_PROP(TutorialProblemDecoupled, Problem) /*@\label{tutorial-decoupled:set-problem}@*/
diff --git a/tutorial/tutorialspatialparameters_decoupled.hh b/tutorial/tutorialspatialparams_decoupled.hh
similarity index 87%
rename from tutorial/tutorialspatialparameters_decoupled.hh
rename to tutorial/tutorialspatialparams_decoupled.hh
index 47d7f8a992..ced09fae4b 100644
--- a/tutorial/tutorialspatialparameters_decoupled.hh
+++ b/tutorial/tutorialspatialparams_decoupled.hh
@@ -24,11 +24,11 @@
*
* \brief spatial parameters for the sequential tutorial
*/
-#ifndef DUMUX_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
-#define DUMUX_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
+#ifndef DUMUX_TUTORIAL_SPATIAL_PARAMS_DECOUPLED_HH
+#define DUMUX_TUTORIAL_SPATIAL_PARAMS_DECOUPLED_HH
-#include <dumux/material/spatialparameters/fvspatialparameters.hh>
+#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -38,19 +38,19 @@ namespace Dumux
//forward declaration
template<class TypeTag>
-class TutorialSpatialParametersDecoupled;
+class TutorialSpatialParamsDecoupled;
namespace Properties
{
// The spatial parameters TypeTag
-NEW_TYPE_TAG(TutorialSpatialParametersDecoupled);
+NEW_TYPE_TAG(TutorialSpatialParamsDecoupled);
// Set the spatial parameters
-SET_TYPE_PROP(TutorialSpatialParametersDecoupled, SpatialParams,
- Dumux::TutorialSpatialParametersDecoupled<TypeTag>); /*@\label{tutorial-decoupled:set-spatialparameters}@*/
+SET_TYPE_PROP(TutorialSpatialParamsDecoupled, SpatialParams,
+ Dumux::TutorialSpatialParamsDecoupled<TypeTag>); /*@\label{tutorial-decoupled:set-spatialparameters}@*/
// Set the material law
-SET_PROP(TutorialSpatialParametersDecoupled, MaterialLaw)
+SET_PROP(TutorialSpatialParamsDecoupled, MaterialLaw)
{
private:
// material law typedefs
@@ -64,9 +64,9 @@ public:
//! Definition of the spatial parameters for the decoupled tutorial
template<class TypeTag>
-class TutorialSpatialParametersDecoupled: public FVSpatialParameters<TypeTag>
+class TutorialSpatialParamsDecoupled: public FVSpatialParams<TypeTag>
{
- typedef FVSpatialParameters<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -125,7 +125,7 @@ public:
}
//! Constructor
- TutorialSpatialParametersDecoupled(const GridView& gridView)
+ TutorialSpatialParamsDecoupled(const GridView& gridView)
: ParentType(gridView), K_(0)
{
for (int i = 0; i < dim; i++)
--
GitLab