From 8ef069bc09bf2e7c44715d20ad9d52f0ebc46645 Mon Sep 17 00:00:00 2001
From: Markus Wolff <markus.wolff@twt-gmbh.de>
Date: Wed, 25 Apr 2012 07:41:10 +0000
Subject: [PATCH] changed naming in decoupled 1p and 2p tests
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8134 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
test/decoupled/1p/benchmarkresult.hh | 6 +++---
test/decoupled/1p/test_1pproblem.hh | 4 ++--
test/decoupled/1p/test_diffusionproblem.hh | 4 ++--
test/decoupled/1p/test_diffusionspatialparams.hh | 2 +-
test/decoupled/2p/test_impesspatialparams.hh | 2 +-
test/decoupled/2p/test_transportspatialparams.hh | 2 +-
.../decoupled/2padaptive/test_impesadaptivespatialparams.hh | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/decoupled/1p/benchmarkresult.hh b/test/decoupled/1p/benchmarkresult.hh
index a007ea06a3..50a726dde0 100644
--- a/test/decoupled/1p/benchmarkresult.hh
+++ b/test/decoupled/1p/benchmarkresult.hh
@@ -194,7 +194,7 @@ public:
sumf += volume*(problem.source(global, element, local)[0]);
// get the absolute permeability
- Dune::FieldMatrix<double,dim,dim> K = problem.spatialParameters().K(global, element, local);
+ Dune::FieldMatrix<double,dim,dim> K = problem.spatialParams().K(global, element, local);
numerator += volume*(exactValue - approximateValue)*(exactValue - approximateValue);
denominator += volume*exactValue*exactValue;
@@ -441,7 +441,7 @@ public:
sumf += volume*sourceVec[0];
// get the absolute permeability
- Dune::FieldMatrix<double,dim,dim> K = problem.spatialParameters().intrinsicPermeability(element);
+ Dune::FieldMatrix<double,dim,dim> K = problem.spatialParams().intrinsicPermeability(element);
int isIdx = -1;
Dune::FieldVector<Scalar,2*dim> fluxVector;
@@ -618,7 +618,7 @@ public:
sumf += volume*problem.source(global, element, local)[0];
// get the absolute permeability
- Dune::FieldMatrix<Scalar,dim,dim> K = problem.spatialParameters().K(global, element, local);
+ Dune::FieldMatrix<Scalar,dim,dim> K = problem.spatialParams().K(global, element, local);
int i = -1;
Dune::FieldVector<Scalar,dim> exactGradient;
diff --git a/test/decoupled/1p/test_1pproblem.hh b/test/decoupled/1p/test_1pproblem.hh
index cbb3ce9d1c..aed5f386e8 100644
--- a/test/decoupled/1p/test_1pproblem.hh
+++ b/test/decoupled/1p/test_1pproblem.hh
@@ -77,7 +77,7 @@ public:
};
// Set the spatial parameters
-SET_TYPE_PROP(TestProblemOneP, SpatialParameters, Dumux::TestOnePSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestProblemOneP, SpatialParams, Dumux::TestOnePSpatialParams<TypeTag>);
// Enable gravity
SET_BOOL_PROP(TestProblemOneP, EnableGravity, false);
@@ -145,7 +145,7 @@ public:
exit(1);
}
- this->spatialParameters().setDelta(delta_);
+ this->spatialParams().setDelta(delta_);
}
/*!
diff --git a/test/decoupled/1p/test_diffusionproblem.hh b/test/decoupled/1p/test_diffusionproblem.hh
index d76e087e50..263478c270 100644
--- a/test/decoupled/1p/test_diffusionproblem.hh
+++ b/test/decoupled/1p/test_diffusionproblem.hh
@@ -220,7 +220,7 @@ public:
void init()
{
this->variables().initialize();
- this->spatialParameters().initialize(delta_);
+ this->spatialParams().initialize(delta_);
for (int i = 0; i < this->gridView().size(0); i++)
{
this->variables().cellData(i).setSaturation(wPhaseIdx, 1.0);
@@ -257,7 +257,7 @@ public:
this->resultWriter().attachCellData(*exactPressure, "exact pressure");
- this->spatialParameters().addOutputVtkFields(this->resultWriter());
+ this->spatialParams().addOutputVtkFields(this->resultWriter());
return;
}
diff --git a/test/decoupled/1p/test_diffusionspatialparams.hh b/test/decoupled/1p/test_diffusionspatialparams.hh
index 945bfbc101..3ff1dcf574 100644
--- a/test/decoupled/1p/test_diffusionspatialparams.hh
+++ b/test/decoupled/1p/test_diffusionspatialparams.hh
@@ -44,7 +44,7 @@ namespace Properties
NEW_TYPE_TAG(TestDiffusionSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TestDiffusionSpatialParams, SpatialParameters, Dumux::TestDiffusionSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestDiffusionSpatialParams, SpatialParams, Dumux::TestDiffusionSpatialParams<TypeTag>);
// Set the material law
SET_PROP(TestDiffusionSpatialParams, MaterialLaw)
diff --git a/test/decoupled/2p/test_impesspatialparams.hh b/test/decoupled/2p/test_impesspatialparams.hh
index aaff506a1e..7ca9d3c209 100644
--- a/test/decoupled/2p/test_impesspatialparams.hh
+++ b/test/decoupled/2p/test_impesspatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
NEW_TYPE_TAG(TestIMPESSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TestIMPESSpatialParams, SpatialParameters, Dumux::TestIMPESSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestIMPESSpatialParams, SpatialParams, Dumux::TestIMPESSpatialParams<TypeTag>);
// Set the material law
SET_PROP(TestIMPESSpatialParams, MaterialLaw)
diff --git a/test/decoupled/2p/test_transportspatialparams.hh b/test/decoupled/2p/test_transportspatialparams.hh
index 5494438ed3..779aaf3e9f 100644
--- a/test/decoupled/2p/test_transportspatialparams.hh
+++ b/test/decoupled/2p/test_transportspatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
NEW_TYPE_TAG(TestTransportSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TestTransportSpatialParams, SpatialParameters, Dumux::TestTransportSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestTransportSpatialParams, SpatialParams, Dumux::TestTransportSpatialParams<TypeTag>);
// Set the material law
SET_PROP(TestTransportSpatialParams, MaterialLaw)
diff --git a/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh b/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
index 9c26fedf91..4f5d997ff6 100644
--- a/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
+++ b/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
NEW_TYPE_TAG(TestIMPESAdaptiveSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TestIMPESAdaptiveSpatialParams, SpatialParameters, Dumux::TestIMPESAdaptiveSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestIMPESAdaptiveSpatialParams, SpatialParams, Dumux::TestIMPESAdaptiveSpatialParams<TypeTag>);
// Set the material law
SET_PROP(TestIMPESAdaptiveSpatialParams, MaterialLaw)
--
GitLab