From 6ed71b4cc4ee78be5aa0b5f43f198541a53b6620 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 16 Dec 2017 19:19:58 +0100
Subject: [PATCH] Rename FVSpatialParams to SequentialFVSpatialParams
---
dumux/material/spatialparams/fv.hh | 6 +++---
dumux/material/spatialparams/fv1p.hh | 4 ++--
dumux/porousmediumflow/1p/sequential/properties.hh | 2 +-
dumux/porousmediumflow/2p/sequential/properties.hh | 4 ++--
dumux/porousmediumflow/2p2c/sequential/properties.hh | 2 +-
test/porousmediumflow/1p/sequential/test_1pspatialparams.hh | 4 ++--
.../1p/sequential/test_diffusionspatialparams.hh | 4 ++--
.../1p/sequential/test_diffusionspatialparams3d.hh | 4 ++--
.../2p/sequential/test_3d2pspatialparams.hh | 4 ++--
.../2p/sequential/test_impesadaptivespatialparams.hh | 4 ++--
.../2p/sequential/test_impesspatialparams.hh | 4 ++--
.../2p/sequential/test_mpfa2pspatialparams.hh | 4 ++--
.../2p/sequential/test_transportspatialparams.hh | 4 ++--
.../2p2c/sequential/test_dec2p2c_spatialparams.hh | 4 ++--
14 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/dumux/material/spatialparams/fv.hh b/dumux/material/spatialparams/fv.hh
index f5c0a2d41c..b37dc2b2f9 100644
--- a/dumux/material/spatialparams/fv.hh
+++ b/dumux/material/spatialparams/fv.hh
@@ -44,7 +44,7 @@ NEW_PROP_TAG(MaterialLaw);
* fv method.
*/
template<class TypeTag>
-class FVSpatialParams: public FVSpatialParamsOneP<TypeTag>
+class SequentialFVSpatialParams: public SequentialFVSpatialParamsOneP<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -62,8 +62,8 @@ class FVSpatialParams: public FVSpatialParamsOneP<TypeTag>
/// @endcond
public:
- FVSpatialParams(const GridView &gridView)
- :FVSpatialParamsOneP<TypeTag>(gridView)
+ SequentialFVSpatialParams(const GridView &gridView)
+ :SequentialFVSpatialParamsOneP<TypeTag>(gridView)
{
}
diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh
index 0072bd25ff..a63db540af 100644
--- a/dumux/material/spatialparams/fv1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -49,7 +49,7 @@ NEW_PROP_TAG(SpatialParams);
* fv method.
*/
template<class TypeTag>
-class FVSpatialParamsOneP
+class SequentialFVSpatialParamsOneP
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -66,7 +66,7 @@ class FVSpatialParamsOneP
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimWorldMatrix;
public:
- FVSpatialParamsOneP(const GridView &gridView)
+ SequentialFVSpatialParamsOneP(const GridView &gridView)
{
}
/*!
diff --git a/dumux/porousmediumflow/1p/sequential/properties.hh b/dumux/porousmediumflow/1p/sequential/properties.hh
index eeb35d831b..da2668b6be 100644
--- a/dumux/porousmediumflow/1p/sequential/properties.hh
+++ b/dumux/porousmediumflow/1p/sequential/properties.hh
@@ -97,7 +97,7 @@ SET_TYPE_PROP(SequentialOneP, Variables, VariableClass<TypeTag>);
SET_TYPE_PROP(SequentialOneP, CellData, CellData1P<TypeTag>);
//! The spatial parameters to be employed. Use BoxSpatialParams by default.
-SET_TYPE_PROP(SequentialOneP, SpatialParams, FVSpatialParamsOneP<TypeTag>);
+SET_TYPE_PROP(SequentialOneP, SpatialParams, SequentialFVSpatialParamsOneP<TypeTag>);
}
}
#endif
diff --git a/dumux/porousmediumflow/2p/sequential/properties.hh b/dumux/porousmediumflow/2p/sequential/properties.hh
index 8fd74b05d0..4a221cff8f 100644
--- a/dumux/porousmediumflow/2p/sequential/properties.hh
+++ b/dumux/porousmediumflow/2p/sequential/properties.hh
@@ -143,8 +143,8 @@ public:
typedef IsothermalImmiscibleFluidState<Scalar, FluidSystem> type;
};
-//! The spatial parameters to be employed. Use FVSpatialParams by default.
-SET_TYPE_PROP(SequentialTwoP, SpatialParams, FVSpatialParams<TypeTag>);
+//! The spatial parameters to be employed. Use SequentialFVSpatialParams by default.
+SET_TYPE_PROP(SequentialTwoP, SpatialParams, SequentialFVSpatialParams<TypeTag>);
//! Default error term factor
SET_SCALAR_PROP(SequentialTwoP, ImpetErrorTermFactor, 0.5);
diff --git a/dumux/porousmediumflow/2p2c/sequential/properties.hh b/dumux/porousmediumflow/2p2c/sequential/properties.hh
index 1ae60a90bb..3edb1d5c9e 100644
--- a/dumux/porousmediumflow/2p2c/sequential/properties.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/properties.hh
@@ -156,7 +156,7 @@ SET_TYPE_PROP(SequentialTwoPTwoC, FluidState, TwoPTwoCFluidState<typename GET_PR
//! The spatial parameters to be employed.
-SET_TYPE_PROP(SequentialTwoPTwoC, SpatialParams, FVSpatialParams<TypeTag>);
+SET_TYPE_PROP(SequentialTwoPTwoC, SpatialParams, SequentialFVSpatialParams<TypeTag>);
//! Switch off permeability regularization at Dirichlet boundaries by default.
SET_BOOL_PROP(SequentialTwoPTwoC, RegulateBoundaryPermeability, false);
diff --git a/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh b/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh
index a4ab72f60b..259cbf4d19 100644
--- a/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh
+++ b/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh
@@ -34,9 +34,9 @@ namespace Dumux
* \brief spatial parameters for the test problem for 1-p diffusion models.
*/
template<class TypeTag>
-class TestOnePSpatialParams: public FVSpatialParamsOneP<TypeTag>
+class TestOnePSpatialParams: public SequentialFVSpatialParamsOneP<TypeTag>
{
- typedef FVSpatialParamsOneP<TypeTag> ParentType;
+ typedef SequentialFVSpatialParamsOneP<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/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
index a6caea6e4a..8585fa2cea 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
@@ -60,9 +60,9 @@ public:
* \brief spatial parameters for the test problem for diffusion models.
*/
template<class TypeTag>
-class TestDiffusionSpatialParams: public FVSpatialParams<TypeTag>
+class TestDiffusionSpatialParams: public SequentialFVSpatialParams<TypeTag>
{
- typedef FVSpatialParams<TypeTag> ParentType;
+ typedef SequentialFVSpatialParams<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/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
index 6cf94c8b6a..c2c7a4329f 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
@@ -59,9 +59,9 @@ public:
* \brief spatial parameters for the test problem for diffusion models.
*/
template<class TypeTag>
-class TestDiffusionSpatialParams3d: public FVSpatialParams<TypeTag>
+class TestDiffusionSpatialParams3d: public SequentialFVSpatialParams<TypeTag>
{
- typedef FVSpatialParams<TypeTag> ParentType;
+ typedef SequentialFVSpatialParams<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/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
index 470927961d..264c5798f4 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
@@ -61,9 +61,9 @@ public:
* \brief spatial parameters for the 2p test using MPFAL 3D method
*/
template<class TypeTag>
-class Test3d2pSpatialParams: public FVSpatialParams<TypeTag>
+class Test3d2pSpatialParams: public SequentialFVSpatialParams<TypeTag>
{
- typedef FVSpatialParams<TypeTag> ParentType;
+ typedef SequentialFVSpatialParams<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/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
index 25473c4209..de31956d9d 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
@@ -61,12 +61,12 @@ public:
* \brief spatial parameters for the sequential 2p test
*/
template<class TypeTag>
-class TestIMPESAdaptiveSpatialParams: public FVSpatialParams<TypeTag>
+class TestIMPESAdaptiveSpatialParams: public SequentialFVSpatialParams<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 FVSpatialParams<TypeTag> ParentType;
+ typedef SequentialFVSpatialParams<TypeTag> ParentType;
typedef typename Grid::ctype CoordScalar;
enum
diff --git a/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
index c288a11f88..33463c8a9b 100644
--- a/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
@@ -61,12 +61,12 @@ public:
* \brief spatial parameters for the sequential 2p test
*/
template<class TypeTag>
-class TestIMPESSpatialParams: public FVSpatialParams<TypeTag>
+class TestIMPESSpatialParams: public SequentialFVSpatialParams<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 FVSpatialParams<TypeTag> ParentType;
+ typedef SequentialFVSpatialParams<TypeTag> ParentType;
typedef typename Grid::ctype CoordScalar;
enum
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
index 00cbf152cb..c91ba96212 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
@@ -56,9 +56,9 @@ public:
/** \todo Please doc me! */
template<class TypeTag>
-class Test2PSpatialParams: public FVSpatialParams<TypeTag>
+class Test2PSpatialParams: public SequentialFVSpatialParams<TypeTag>
{
- typedef FVSpatialParams<TypeTag> ParentType;
+ typedef SequentialFVSpatialParams<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/porousmediumflow/2p/sequential/test_transportspatialparams.hh b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
index d44fa78262..9dde52c974 100644
--- a/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
@@ -60,9 +60,9 @@ public:
* \brief spatial parameters for the explicit transport test
*/
template<class TypeTag>
-class TestTransportSpatialParams: public FVSpatialParams<TypeTag>
+class TestTransportSpatialParams: public SequentialFVSpatialParams<TypeTag>
{
- typedef FVSpatialParams<TypeTag> ParentType;
+ typedef SequentialFVSpatialParams<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/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
index 1420f937d6..39fd432b3a 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
@@ -59,7 +59,7 @@ public:
* \brief spatial parameters for the sequential 2p2c test
*/
template<class TypeTag>
-class Test2P2CSpatialParams : public FVSpatialParams<TypeTag>
+class Test2P2CSpatialParams : public SequentialFVSpatialParams<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -93,7 +93,7 @@ public:
}
- Test2P2CSpatialParams(const GridView& gridView) : FVSpatialParams<TypeTag>(gridView),
+ Test2P2CSpatialParams(const GridView& gridView) : SequentialFVSpatialParams<TypeTag>(gridView),
constPermeability_(0)
{
// residual saturations
--
GitLab