From 7c9d11f6ab940b66591ca39fe9f8124764e2810a Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 16 Dec 2017 20:27:47 +0100
Subject: [PATCH] Move spatialparams/implicit<>.hh to spatialparams/fv<>.hh
---
dumux/material/spatialparams/{implicit.hh => fv.hh} | 6 +++---
.../material/spatialparams/{implicit1p.hh => fv1p.hh} | 11 ++++++-----
dumux/material/spatialparams/sequentialfv.hh | 10 +++-------
dumux/material/spatialparams/sequentialfv1p.hh | 4 ++--
.../1pncmin/implicit/propertydefaults.hh | 2 +-
dumux/porousmediumflow/2p/model.hh | 2 +-
dumux/porousmediumflow/2p1c/model.hh | 2 +-
dumux/porousmediumflow/2p2c/model.hh | 2 +-
dumux/porousmediumflow/2pnc/model.hh | 2 +-
dumux/porousmediumflow/3p/model.hh | 2 +-
dumux/porousmediumflow/3p3c/model.hh | 2 +-
dumux/porousmediumflow/3pwateroil/propertydefaults.hh | 2 +-
.../mpnc/implicit/propertydefaults.hh | 2 +-
dumux/porousmediumflow/richards/model.hh | 2 +-
dumux/porousmediumflow/richardsnc/model.hh | 2 +-
dumux/porousmediumflow/tracer/model.hh | 2 +-
.../1p2c_richards2c/richardstestspatialparams.hh | 2 +-
.../1p2c_richards2c/rootsystemtestspatialparams.hh | 2 +-
.../embedded/1p_1p/bloodflowspatialparams.hh | 2 +-
.../embedded/1p_1p/tissuespatialparams.hh | 2 +-
.../embedded/1p_richards/richardstestspatialparams.hh | 2 +-
.../1p_richards/rootsystemtestspatialparams.hh | 2 +-
.../facet/1p2c_1p2c/fracturespatialparams.hh | 2 +-
.../facet/1p2c_1p2c/matrixspatialparams.hh | 2 +-
.../facet/1p_1p/fracturespatialparams.hh | 2 +-
.../mixeddimension/facet/1p_1p/matrixspatialparams.hh | 2 +-
.../porousmediumflow/1p/implicit/1pnispatialparams.hh | 2 +-
.../1p/implicit/1ptestspatialparams.hh | 2 +-
.../1p/implicit/compressible/spatialparams.hh | 2 +-
.../1p/implicit/fracturespatialparams.hh | 2 +-
.../1p/implicit/incompressible/spatialparams.hh | 2 +-
.../pointsources/1psingularityspatialparams.hh | 2 +-
.../1p/implicit/tubesspatialparams.hh | 2 +-
.../1pnc/implicit/1pnctestspatialparams.hh | 2 +-
.../1pncmin/implicit/thermochemspatialparams.hh | 2 +-
.../2p/implicit/fracture/spatialparams.hh | 2 +-
.../2p/implicit/incompressible/spatialparams.hh | 2 +-
.../2p1c/implicit/steaminjectionspatialparams.hh | 2 +-
.../2p2c/implicit/injectionspatialparams.hh | 2 +-
.../2p2c/implicit/waterairspatialparams.hh | 2 +-
.../2pnc/implicit/fuelcellspatialparams.hh | 2 +-
.../2pncmin/implicit/dissolutionspatialparams.hh | 2 +-
.../porousmediumflow/3p/implicit/3pnispatialparams.hh | 2 +-
.../3p/implicit/infiltration3pspatialparams.hh | 2 +-
.../3p3c/implicit/columnxylolspatialparams.hh | 2 +-
.../3p3c/implicit/infiltration3p3cspatialparams.hh | 2 +-
.../3p3c/implicit/kuevettespatialparams.hh | 2 +-
.../implicit/3pwateroilsagdspatialparams.hh | 2 +-
.../co2/implicit/heterogeneousspatialparameters.hh | 2 +-
.../mpnc/implicit/combustionspatialparams.hh | 2 +-
.../implicit/evaporationatmospherespatialparams.hh | 2 +-
.../mpnc/implicit/forchheimerspatialparams.hh | 2 +-
.../mpnc/implicit/obstaclespatialparams.hh | 2 +-
.../implicit/richardsanalyticalspatialparams.hh | 2 +-
.../richards/implicit/richardslensspatialparams.hh | 2 +-
.../richards/implicit/richardsnispatialparams.hh | 2 +-
.../implicit/richardswelltracerspatialparams.hh | 2 +-
.../tracer/1ptracer/1ptestspatialparams.hh | 2 +-
.../tracer/1ptracer/tracertestspatialparams.hh | 2 +-
.../tracer/constvel/tracertestspatialparams.hh | 2 +-
60 files changed, 70 insertions(+), 73 deletions(-)
rename dumux/material/spatialparams/{implicit.hh => fv.hh} (97%)
rename dumux/material/spatialparams/{implicit1p.hh => fv1p.hh} (97%)
diff --git a/dumux/material/spatialparams/implicit.hh b/dumux/material/spatialparams/fv.hh
similarity index 97%
rename from dumux/material/spatialparams/implicit.hh
rename to dumux/material/spatialparams/fv.hh
index 61f681c969..a78c43b7be 100644
--- a/dumux/material/spatialparams/implicit.hh
+++ b/dumux/material/spatialparams/fv.hh
@@ -23,11 +23,11 @@
* \brief The base class for spatial parameters of multi-phase problems
* using a fully implicit discretization method.
*/
-#ifndef DUMUX_IMPLICIT_SPATIAL_PARAMS_HH
-#define DUMUX_IMPLICIT_SPATIAL_PARAMS_HH
+#ifndef DUMUX_FV_SPATIAL_PARAMS_HH
+#define DUMUX_FV_SPATIAL_PARAMS_HH
#include <dumux/common/properties.hh>
-#include "implicit1p.hh"
+#include "fv1p.hh"
namespace Dumux {
diff --git a/dumux/material/spatialparams/implicit1p.hh b/dumux/material/spatialparams/fv1p.hh
similarity index 97%
rename from dumux/material/spatialparams/implicit1p.hh
rename to dumux/material/spatialparams/fv1p.hh
index f26aeed98f..95117999c3 100644
--- a/dumux/material/spatialparams/implicit1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -23,8 +23,8 @@
* \brief The base class for spatial parameters of one-phase problems
* using a fully implicit discretization method.
*/
-#ifndef DUMUX_IMPLICIT_SPATIAL_PARAMS_ONE_P_HH
-#define DUMUX_IMPLICIT_SPATIAL_PARAMS_ONE_P_HH
+#ifndef DUMUX_FV_SPATIAL_PARAMS_ONE_P_HH
+#define DUMUX_FV_SPATIAL_PARAMS_ONE_P_HH
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
@@ -131,9 +131,10 @@ public:
* \param elemSol The solution at the dofs connected to the element.
* \return permeability
*/
- auto permeability(const Element& element,
- const SubControlVolume& scv,
- const ElementSolutionVector& elemSol) const
+ decltype(auto)
+ permeability(const Element& element,
+ const SubControlVolume& scv,
+ const ElementSolutionVector& elemSol) const
{
return asImp_().permeabilityAtPos(scv.center());
}
diff --git a/dumux/material/spatialparams/sequentialfv.hh b/dumux/material/spatialparams/sequentialfv.hh
index 6a469d7f99..d6e7c6ecf8 100644
--- a/dumux/material/spatialparams/sequentialfv.hh
+++ b/dumux/material/spatialparams/sequentialfv.hh
@@ -23,18 +23,14 @@
* \brief The base class for spatial parameters of problems using the
* fv method.
*/
-#ifndef DUMUX_FV_SPATIAL_PARAMS_HH
-#define DUMUX_FV_SPATIAL_PARAMS_HH
+#ifndef DUMUX_SEQUENTIAL_FV_SPATIAL_PARAMS_HH
+#define DUMUX_SEQUENTIAL_FV_SPATIAL_PARAMS_HH
+#include <dumux/common/properties.hh>
#include "sequentialfv1p.hh"
namespace Dumux
{
-// forward declation of property tags
-namespace Properties {
-NEW_PROP_TAG(MaterialLaw);
-}
-
/*!
* \ingroup SpatialParameters
*/
diff --git a/dumux/material/spatialparams/sequentialfv1p.hh b/dumux/material/spatialparams/sequentialfv1p.hh
index a63db540af..4af5835a01 100644
--- a/dumux/material/spatialparams/sequentialfv1p.hh
+++ b/dumux/material/spatialparams/sequentialfv1p.hh
@@ -23,8 +23,8 @@
* \brief The base class for spatial parameters of problems using the
* fv method.
*/
-#ifndef DUMUX_FV_SPATIAL_PARAMS_ONE_P_HH
-#define DUMUX_FV_SPATIAL_PARAMS_ONE_P_HH
+#ifndef DUMUX_SEQUENTIAL_FV_SPATIAL_PARAMS_ONE_P_HH
+#define DUMUX_SEQUENTIAL_FV_SPATIAL_PARAMS_ONE_P_HH
#include <dumux/common/properties.hh>
#include <dumux/common/math.hh>
diff --git a/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh b/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
index d46e37cdd8..6d1104d56e 100644
--- a/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
@@ -35,7 +35,7 @@
#include <dumux/porousmediumflow/nonisothermal/model.hh>
#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
namespace Dumux
diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh
index 207d575017..1e87d6bcbc 100644
--- a/dumux/porousmediumflow/2p/model.hh
+++ b/dumux/porousmediumflow/2p/model.hh
@@ -62,7 +62,7 @@
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
#include <dumux/material/fluidstates/immiscible.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/porousmediumflow/properties.hh>
#include <dumux/porousmediumflow/immiscible/localresidual.hh>
diff --git a/dumux/porousmediumflow/2p1c/model.hh b/dumux/porousmediumflow/2p1c/model.hh
index 6a34bddc1c..4774dd47c3 100644
--- a/dumux/porousmediumflow/2p1c/model.hh
+++ b/dumux/porousmediumflow/2p1c/model.hh
@@ -27,7 +27,7 @@
#include <dumux/common/properties.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
#include <dumux/material/fluidstates/immiscible.hh>
diff --git a/dumux/porousmediumflow/2p2c/model.hh b/dumux/porousmediumflow/2p2c/model.hh
index c9cb39bdea..37e69ed139 100644
--- a/dumux/porousmediumflow/2p2c/model.hh
+++ b/dumux/porousmediumflow/2p2c/model.hh
@@ -82,7 +82,7 @@
#include <dumux/porousmediumflow/properties.hh>
#include <dumux/porousmediumflow/nonisothermal/model.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh
index abc5f4c9d0..39389bbda3 100644
--- a/dumux/porousmediumflow/2pnc/model.hh
+++ b/dumux/porousmediumflow/2pnc/model.hh
@@ -88,7 +88,7 @@
#include <dumux/common/properties.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
diff --git a/dumux/porousmediumflow/3p/model.hh b/dumux/porousmediumflow/3p/model.hh
index 1b1f8ab2bb..7f7125bc65 100644
--- a/dumux/porousmediumflow/3p/model.hh
+++ b/dumux/porousmediumflow/3p/model.hh
@@ -56,7 +56,7 @@
#include <dumux/common/properties.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidstates/immiscible.hh>
#include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
diff --git a/dumux/porousmediumflow/3p3c/model.hh b/dumux/porousmediumflow/3p3c/model.hh
index 65497af249..6b6d4de935 100644
--- a/dumux/porousmediumflow/3p3c/model.hh
+++ b/dumux/porousmediumflow/3p3c/model.hh
@@ -82,7 +82,7 @@
#include <dumux/porousmediumflow/properties.hh>
#include <dumux/porousmediumflow/nonisothermal/model.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidstates/compositional.hh>
#include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
#include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
diff --git a/dumux/porousmediumflow/3pwateroil/propertydefaults.hh b/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
index 804c938d26..317152fae9 100644
--- a/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
+++ b/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
@@ -29,7 +29,7 @@
#define DUMUX_3P2CNI_PROPERTY_DEFAULTS_HH
#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
#include <dumux/porousmediumflow/nonisothermal/model.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
diff --git a/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh b/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
index 466cb5b46f..708a466945 100644
--- a/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
@@ -32,7 +32,7 @@
#include "energy/vtkwriter.hh"
#include <dumux/material/constraintsolvers/compositionfromfugacities.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
diff --git a/dumux/porousmediumflow/richards/model.hh b/dumux/porousmediumflow/richards/model.hh
index 01d7e94da9..0ecedffa1a 100644
--- a/dumux/porousmediumflow/richards/model.hh
+++ b/dumux/porousmediumflow/richards/model.hh
@@ -98,7 +98,7 @@
#include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/material/fluidstates/immiscible.hh>
diff --git a/dumux/porousmediumflow/richardsnc/model.hh b/dumux/porousmediumflow/richardsnc/model.hh
index dfea1a76cd..64055776a2 100644
--- a/dumux/porousmediumflow/richardsnc/model.hh
+++ b/dumux/porousmediumflow/richardsnc/model.hh
@@ -31,7 +31,7 @@
#include <dumux/porousmediumflow/compositional/localresidual.hh>
#include <dumux/porousmediumflow/richards/newtoncontroller.hh>
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
#include <dumux/material/components/simpleh2o.hh>
diff --git a/dumux/porousmediumflow/tracer/model.hh b/dumux/porousmediumflow/tracer/model.hh
index cddd611cc6..280658df6d 100644
--- a/dumux/porousmediumflow/tracer/model.hh
+++ b/dumux/porousmediumflow/tracer/model.hh
@@ -51,7 +51,7 @@
*/
#include <dumux/common/properties.hh>
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
#include <dumux/discretization/stationaryvelocityfield.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
#include <dumux/porousmediumflow/properties.hh>
diff --git a/test/mixeddimension/embedded/1p2c_richards2c/richardstestspatialparams.hh b/test/mixeddimension/embedded/1p2c_richards2c/richardstestspatialparams.hh
index 8ad980e66c..47cdb6972b 100644
--- a/test/mixeddimension/embedded/1p2c_richards2c/richardstestspatialparams.hh
+++ b/test/mixeddimension/embedded/1p2c_richards2c/richardstestspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_RICHARDS_TEST_SPATIAL_PARAMETERS_HH
#define DUMUX_RICHARDS_TEST_SPATIAL_PARAMETERS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestspatialparams.hh b/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestspatialparams.hh
index 1048fb802a..a74c09783b 100644
--- a/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestspatialparams.hh
+++ b/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_ROOTSYSTEM_TEST_SPATIALPARAMS_HH
#define DUMUX_ROOTSYSTEM_TEST_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
#include <dumux/material/components/simpleh2o.hh>
namespace Dumux
diff --git a/test/mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh b/test/mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh
index 62aaf90b70..a0671748f0 100644
--- a/test/mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh
+++ b/test/mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_BlOOD_FLOW_SPATIALPARAMS_HH
#define DUMUX_BlOOD_FLOW_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh b/test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh
index c55ce02c7d..6b6366b2ea 100644
--- a/test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh
+++ b/test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_TISSUE_SPATIAL_PARAMS_HH
#define DUMUX_TISSUE_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/mixeddimension/embedded/1p_richards/richardstestspatialparams.hh b/test/mixeddimension/embedded/1p_richards/richardstestspatialparams.hh
index cc1b889007..6d437f9c6d 100644
--- a/test/mixeddimension/embedded/1p_richards/richardstestspatialparams.hh
+++ b/test/mixeddimension/embedded/1p_richards/richardstestspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_RICHARDS_TEST_SPATIAL_PARAMETERS_HH
#define DUMUX_RICHARDS_TEST_SPATIAL_PARAMETERS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/mixeddimension/embedded/1p_richards/rootsystemtestspatialparams.hh b/test/mixeddimension/embedded/1p_richards/rootsystemtestspatialparams.hh
index 56401d123a..59871212e0 100644
--- a/test/mixeddimension/embedded/1p_richards/rootsystemtestspatialparams.hh
+++ b/test/mixeddimension/embedded/1p_richards/rootsystemtestspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_ROOTSYSTEM_TEST_SPATIALPARAMS_HH
#define DUMUX_ROOTSYSTEM_TEST_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
#include <dumux/material/components/simpleh2o.hh>
namespace Dumux
diff --git a/test/mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh b/test/mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh
index 6009ff03ee..87403af266 100644
--- a/test/mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh
+++ b/test/mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_1P_FRACTURE_SPATIALPARAMS_HH
#define DUMUX_1P_FRACTURE_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh b/test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh
index 1bd92b009b..e4f72fcc18 100644
--- a/test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh
+++ b/test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_1P_MATRIX_SPATIALPARAMS_HH
#define DUMUX_1P_MATRIX_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/mixeddimension/facet/1p_1p/fracturespatialparams.hh b/test/mixeddimension/facet/1p_1p/fracturespatialparams.hh
index 798487ef19..5d7957bb02 100644
--- a/test/mixeddimension/facet/1p_1p/fracturespatialparams.hh
+++ b/test/mixeddimension/facet/1p_1p/fracturespatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_1P_FRACTURE_SPATIALPARAMS_HH
#define DUMUX_1P_FRACTURE_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/mixeddimension/facet/1p_1p/matrixspatialparams.hh b/test/mixeddimension/facet/1p_1p/matrixspatialparams.hh
index 9404bb8086..138b36a64a 100644
--- a/test/mixeddimension/facet/1p_1p/matrixspatialparams.hh
+++ b/test/mixeddimension/facet/1p_1p/matrixspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_1P_MATRIX_SPATIALPARAMS_HH
#define DUMUX_1P_MATRIX_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/1p/implicit/1pnispatialparams.hh b/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
index 92cc02d542..c25b752a0a 100644
--- a/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_TEST_1PNI_SPATIAL_PARAMS_HH
#define DUMUX_TEST_1PNI_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh b/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
index e7e0124c5c..7d73936881 100644
--- a/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_1P_TEST_SPATIALPARAMS_HH
#define DUMUX_1P_TEST_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
#include <dumux/material/spatialparams/gstatrandomfield.hh>
namespace Dumux
diff --git a/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
index 15506993af..3cb4c280a0 100644
--- a/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_COMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
#define DUMUX_COMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/1p/implicit/fracturespatialparams.hh b/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
index 5ae752bf34..34e1a50db7 100644
--- a/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_ONEP_FRACTURE_TEST_SPATIALPARAMS_HH
#define DUMUX_ONEP_FRACTURE_TEST_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
index 46561d443a..e4c69ca87c 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_INCOMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
index 9d9189339c..c28c7aa621 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_1P_SINGULARITY_SPATIALPARAMS_HH
#define DUMUX_1P_SINGULARITY_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/1p/implicit/tubesspatialparams.hh b/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
index 4d8c85edb1..a35f34a5be 100644
--- a/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_ONEP_TUBES_TEST_SPATIALPARAMS_HH
#define DUMUX_ONEP_TUBES_TEST_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh b/test/porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh
index ecabdc2b4a..c3ee726c48 100644
--- a/test/porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh
+++ b/test/porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_1PNC_TEST_SPATIAL_PARAMS_HH
#define DUMUX_1PNC_TEST_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh b/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
index ae938d9098..3ba54bb16a 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_THERMOCHEM_SPATIAL_PARAMS_HH
#define DUMUX_THERMOCHEM_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
#include <dumux/porousmediumflow/1pncmin/implicit/indices.hh>
#include <dumux/material/fluidmatrixinteractions/porosityreactivebed.hh>
#include <dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh>
diff --git a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
index 0fb5ca37d6..820f7baf32 100644
--- a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_TWOP_FRACTURE_TEST_SPATIALPARAMS_HH
#define DUMUX_TWOP_FRACTURE_TEST_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
index 47656484f0..a5729bb735 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_COMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
#define DUMUX_COMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh b/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
index 37a01e5fa8..9763594045 100644
--- a/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
+++ b/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_STEAMINJECTION_SPATIAL_PARAMS_HH
#define DUMUX_STEAMINJECTION_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
index 16a7eca089..5c0a1fe446 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
@@ -27,7 +27,7 @@
#ifndef DUMUX_INJECTION_SPATIAL_PARAMS_HH
#define DUMUX_INJECTION_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
index 46c62b9499..11881601e4 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
@@ -28,7 +28,7 @@
#include <dumux/io/ploteffectivediffusivitymodel.hh>
#include <dumux/io/plotmateriallaw.hh>
#include <dumux/io/plotthermalconductivitymodel.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
index 285cb2ae70..8f6e6f18d6 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_FUELCELL_SPATIAL_PARAMS_HH
#define DUMUX_FUELCELL_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
index 74d56db83b..c82c0b3a9d 100644
--- a/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
+++ b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
@@ -19,7 +19,7 @@
#ifndef DUMUX_INJECTION_SPATIAL_PARAMETERS_HH
#define DUMUX_INJECTION_SPATIAL_PARAMETERS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
index 3bdae69b0d..1d6899c308 100644
--- a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_THREEPNI_SPATIAL_PARAMS_HH
#define DUMUX_THREEPNI_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
index f4810d3566..b5002b5669 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_INFILTRATION_THREEP_SPATIAL_PARAMS_HH
#define DUMUX_INFILTRATION_THREEP_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
index aa19b5dc0a..bdebcf5ae0 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_COLUMNXYLOL_SPATIAL_PARAMS_HH
#define DUMUX_COLUMNXYLOL_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh b/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
index cadadbd4c9..f0d7638c1b 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_INFILTRATION_THREEPTHREEC_SPATIAL_PARAMETERS_HH
#define DUMUX_INFILTRATION_THREEPTHREEC_SPATIAL_PARAMETERS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
index c2c2e3dd9a..d74ea4aa6a 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
@@ -26,7 +26,7 @@
#include <dune/common/float_cmp.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
index 6b2703ea61..eb4e9ef788 100644
--- a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_SAGD_SPATIAL_PARAMS_HH
#define DUMUX_SAGD_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/porousmediumflow/3pwateroil/indices.hh>
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
index f223e355d1..d849f1918f 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
@@ -27,7 +27,7 @@
#ifndef DUMUX_HETEROGENEOUS_SPATIAL_PARAMS_HH
#define DUMUX_HETEROGENEOUS_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
index fec8076e34..81f5af84e6 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
@@ -30,7 +30,7 @@
#include <dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/mp/2padapter.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index 4e2bd0ee9b..01ffa9cf84 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_EVAPORATION_ATMOSPHERE_SPATIALPARAMS_HH
#define DUMUX_EVAPORATION_ATMOSPHERE_SPATIALPARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh b/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
index dd04c9621b..0f50bdb80d 100644
--- a/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_FORCHHEIMER_SPATIAL_PARAMS_HH
#define DUMUX_FORCHHEIMER_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
index cf12ac8ea1..da0fe32e0a 100644
--- a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_OBSTACLE_SPATIAL_PARAMS_HH
#define DUMUX_OBSTACLE_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
index 4bbcbea4d0..2e2c179fe6 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_RICHARDS_ANALYTICAL_SPATIAL_PARAMETERS_HH
#define DUMUX_RICHARDS_ANALYTICAL_SPATIAL_PARAMETERS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/brookscorey.hh>
diff --git a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
index eb9a2cdc73..8f03ca8460 100644
--- a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_RICHARDS_LENS_SPATIAL_PARAMETERS_HH
#define DUMUX_RICHARDS_LENS_SPATIAL_PARAMETERS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
index 656660f14c..fef5226895 100644
--- a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
@@ -28,7 +28,7 @@
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh b/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
index f02f4e5cd6..0e2308a243 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
+++ b/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_RICHARDS_LENS_SPATIAL_PARAMETERS_HH
#define DUMUX_RICHARDS_LENS_SPATIAL_PARAMETERS_HH
-#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
index d17195316b..6566ec1328 100644
--- a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
+++ b/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
@@ -24,7 +24,7 @@
#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
#include <random>
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
index 270d645878..b2cfb7b9d7 100644
--- a/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
+++ b/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_TRACER_TEST_SPATIAL_PARAMS_HH
#define DUMUX_TRACER_TEST_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh b/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
index c53d4a3c61..c238116a97 100644
--- a/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
+++ b/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_TRACER_TEST_SPATIAL_PARAMS_HH
#define DUMUX_TRACER_TEST_SPATIAL_PARAMS_HH
-#include <dumux/material/spatialparams/implicit1p.hh>
+#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
--
GitLab