From 0091d3da3835124e979a79b15fac087e5a5c8d92 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 21 Nov 2018 16:48:11 +0100
Subject: [PATCH] [flux] Create new flux folder move headers
---
dumux/CMakeLists.txt | 1 +
dumux/discretization/CMakeLists.txt | 12 ------------
dumux/discretization/box/effectivestresslaw.hh | 2 +-
dumux/discretization/box/hookeslaw.hh | 2 +-
dumux/discretization/box/maxwellstefanslaw.hh | 2 +-
.../cellcentered/tpfa/maxwellstefanslaw.hh | 2 +-
.../discretization/staggered/freeflow/fickslaw.hh | 2 +-
.../staggered/freeflow/fourierslaw.hh | 2 +-
.../staggered/freeflow/maxwellstefanslaw.hh | 2 +-
dumux/discretization/staggered/properties.hh | 2 +-
dumux/flux/CMakeLists.txt | 14 ++++++++++++++
dumux/{discretization => flux}/darcyslaw.hh | 0
.../{discretization => flux}/effectivestresslaw.hh | 0
dumux/{discretization => flux}/fickslaw.hh | 0
.../{discretization => flux}/fluxvariablesbase.hh | 0
.../fluxvariablescaching.hh | 0
dumux/{discretization => flux}/forchheimerslaw.hh | 0
dumux/{discretization => flux}/fourierslaw.hh | 0
.../fourierslawnonequilibrium.hh | 0
dumux/{discretization => flux}/hookeslaw.hh | 0
.../{discretization => flux}/maxwellstefanslaw.hh | 0
.../stationaryvelocityfield.hh | 2 +-
dumux/{discretization => flux}/upwindscheme.hh | 0
.../freeflow/compositional/navierstokesncmodel.hh | 4 ++--
.../compositional/staggered/fluxvariables.hh | 2 +-
dumux/freeflow/navierstokes/model.hh | 2 +-
.../navierstokes/staggered/fluxvariables.hh | 2 +-
dumux/freeflow/properties.hh | 2 +-
.../freeflow/rans/oneeq/staggered/fluxvariables.hh | 2 +-
.../rans/twoeq/kepsilon/staggered/fluxvariables.hh | 2 +-
.../rans/twoeq/komega/staggered/fluxvariables.hh | 2 +-
.../twoeq/lowrekepsilon/staggered/fluxvariables.hh | 2 +-
dumux/geomechanics/elastic/model.hh | 2 +-
dumux/geomechanics/poroelastic/model.hh | 4 ++--
dumux/geomechanics/properties.hh | 2 +-
dumux/geomechanics/stressvariablescache.hh | 2 +-
dumux/porousmediumflow/2p1c/darcyslaw.hh | 2 +-
.../porousmediumflow/boxdfm/fluxvariablescache.hh | 2 +-
dumux/porousmediumflow/fluxvariables.hh | 4 ++--
dumux/porousmediumflow/fluxvariablescache.hh | 2 +-
dumux/porousmediumflow/nonequilibrium/model.hh | 4 ++--
dumux/porousmediumflow/properties.hh | 6 +++---
dumux/porousmediumflow/tracer/model.hh | 2 +-
.../navierstokesnc/maxwellstefan/problem.hh | 2 +-
.../1p/implicit/isothermal/problem.hh | 2 +-
.../2pnc/implicit/diffusion/problem.hh | 2 +-
test/porousmediumflow/tracer/multicomp/problem.hh | 2 +-
47 files changed, 54 insertions(+), 51 deletions(-)
create mode 100644 dumux/flux/CMakeLists.txt
rename dumux/{discretization => flux}/darcyslaw.hh (100%)
rename dumux/{discretization => flux}/effectivestresslaw.hh (100%)
rename dumux/{discretization => flux}/fickslaw.hh (100%)
rename dumux/{discretization => flux}/fluxvariablesbase.hh (100%)
rename dumux/{discretization => flux}/fluxvariablescaching.hh (100%)
rename dumux/{discretization => flux}/forchheimerslaw.hh (100%)
rename dumux/{discretization => flux}/fourierslaw.hh (100%)
rename dumux/{discretization => flux}/fourierslawnonequilibrium.hh (100%)
rename dumux/{discretization => flux}/hookeslaw.hh (100%)
rename dumux/{discretization => flux}/maxwellstefanslaw.hh (100%)
rename dumux/{discretization => flux}/stationaryvelocityfield.hh (98%)
rename dumux/{discretization => flux}/upwindscheme.hh (100%)
diff --git a/dumux/CMakeLists.txt b/dumux/CMakeLists.txt
index ffa73c2f91..4e865412d8 100644
--- a/dumux/CMakeLists.txt
+++ b/dumux/CMakeLists.txt
@@ -2,6 +2,7 @@ add_subdirectory(adaptive)
add_subdirectory(assembly)
add_subdirectory(common)
add_subdirectory(discretization)
+add_subdirectory(flux)
add_subdirectory(freeflow)
add_subdirectory(geomechanics)
add_subdirectory(io)
diff --git a/dumux/discretization/CMakeLists.txt b/dumux/discretization/CMakeLists.txt
index 5e45341da0..5c76249126 100644
--- a/dumux/discretization/CMakeLists.txt
+++ b/dumux/discretization/CMakeLists.txt
@@ -5,27 +5,15 @@ add_subdirectory(staggered)
install(FILES
basefvgridgeometry.hh
checkoverlapsize.hh
-darcyslaw.hh
-effectivestresslaw.hh
elementsolution.hh
evalgradients.hh
evalsolution.hh
-fickslaw.hh
fluxstencil.hh
-fluxvariablesbase.hh
-fluxvariablescaching.hh
-forchheimerslaw.hh
-fourierslaw.hh
-fourierslawnonequilibrium.hh
fvgridvariables.hh
fvproperties.hh
-hookeslaw.hh
localview.hh
-maxwellstefanslaw.hh
method.hh
scvandscvfiterators.hh
-stationaryvelocityfield.hh
subcontrolvolumebase.hh
subcontrolvolumefacebase.hh
-upwindscheme.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization)
diff --git a/dumux/discretization/box/effectivestresslaw.hh b/dumux/discretization/box/effectivestresslaw.hh
index e05016eefb..1aa5752a95 100644
--- a/dumux/discretization/box/effectivestresslaw.hh
+++ b/dumux/discretization/box/effectivestresslaw.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_DISCRETIZATION_BOX_EFFECTIVE_STRESS_LAW_HH
#define DUMUX_DISCRETIZATION_BOX_EFFECTIVE_STRESS_LAW_HH
-#include <dumux/discretization/effectivestresslaw.hh>
+#include <dumux/flux/effectivestresslaw.hh>
#include <dumux/discretization/method.hh>
namespace Dumux {
diff --git a/dumux/discretization/box/hookeslaw.hh b/dumux/discretization/box/hookeslaw.hh
index 65b45236e5..323ed70be0 100644
--- a/dumux/discretization/box/hookeslaw.hh
+++ b/dumux/discretization/box/hookeslaw.hh
@@ -27,7 +27,7 @@
#include <dune/common/fmatrix.hh>
#include <dumux/common/math.hh>
-#include <dumux/discretization/hookeslaw.hh>
+#include <dumux/flux/hookeslaw.hh>
#include <dumux/discretization/method.hh>
namespace Dumux {
diff --git a/dumux/discretization/box/maxwellstefanslaw.hh b/dumux/discretization/box/maxwellstefanslaw.hh
index 3b1287a62d..3303d083ac 100644
--- a/dumux/discretization/box/maxwellstefanslaw.hh
+++ b/dumux/discretization/box/maxwellstefanslaw.hh
@@ -30,7 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
namespace Dumux {
diff --git a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
index 2da51ac99d..28456638df 100644
--- a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
@@ -30,7 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
namespace Dumux {
diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/discretization/staggered/freeflow/fickslaw.hh
index b60a7941f0..b59ed496cf 100644
--- a/dumux/discretization/staggered/freeflow/fickslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fickslaw.hh
@@ -32,7 +32,7 @@
#include <dumux/common/math.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
namespace Dumux
{
diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/discretization/staggered/freeflow/fourierslaw.hh
index 87190ee824..afb3b3aeb4 100644
--- a/dumux/discretization/staggered/freeflow/fourierslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fourierslaw.hh
@@ -28,7 +28,7 @@
#include <dumux/common/math.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
namespace Dumux
{
diff --git a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
index db4019e618..593b701437 100644
--- a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
+++ b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
@@ -30,7 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
namespace Dumux {
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 7eda80d694..763bfc7fca 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -32,7 +32,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/discretization/fvproperties.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
#include <dumux/discretization/cellcentered/elementboundarytypes.hh>
#include <dumux/assembly/staggeredlocalresidual.hh>
diff --git a/dumux/flux/CMakeLists.txt b/dumux/flux/CMakeLists.txt
new file mode 100644
index 0000000000..fdfac89136
--- /dev/null
+++ b/dumux/flux/CMakeLists.txt
@@ -0,0 +1,14 @@
+install(FILES
+darcyslaw.hh
+effectivestresslaw.hh
+fickslaw.hh
+fluxvariablesbase.hh
+fluxvariablescaching.hh
+forchheimerslaw.hh
+fourierslaw.hh
+fourierslawnonequilibrium.hh
+hookeslaw.hh
+maxwellstefanslaw.hh
+stationaryvelocityfield.hh
+upwindscheme.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/flux)
diff --git a/dumux/discretization/darcyslaw.hh b/dumux/flux/darcyslaw.hh
similarity index 100%
rename from dumux/discretization/darcyslaw.hh
rename to dumux/flux/darcyslaw.hh
diff --git a/dumux/discretization/effectivestresslaw.hh b/dumux/flux/effectivestresslaw.hh
similarity index 100%
rename from dumux/discretization/effectivestresslaw.hh
rename to dumux/flux/effectivestresslaw.hh
diff --git a/dumux/discretization/fickslaw.hh b/dumux/flux/fickslaw.hh
similarity index 100%
rename from dumux/discretization/fickslaw.hh
rename to dumux/flux/fickslaw.hh
diff --git a/dumux/discretization/fluxvariablesbase.hh b/dumux/flux/fluxvariablesbase.hh
similarity index 100%
rename from dumux/discretization/fluxvariablesbase.hh
rename to dumux/flux/fluxvariablesbase.hh
diff --git a/dumux/discretization/fluxvariablescaching.hh b/dumux/flux/fluxvariablescaching.hh
similarity index 100%
rename from dumux/discretization/fluxvariablescaching.hh
rename to dumux/flux/fluxvariablescaching.hh
diff --git a/dumux/discretization/forchheimerslaw.hh b/dumux/flux/forchheimerslaw.hh
similarity index 100%
rename from dumux/discretization/forchheimerslaw.hh
rename to dumux/flux/forchheimerslaw.hh
diff --git a/dumux/discretization/fourierslaw.hh b/dumux/flux/fourierslaw.hh
similarity index 100%
rename from dumux/discretization/fourierslaw.hh
rename to dumux/flux/fourierslaw.hh
diff --git a/dumux/discretization/fourierslawnonequilibrium.hh b/dumux/flux/fourierslawnonequilibrium.hh
similarity index 100%
rename from dumux/discretization/fourierslawnonequilibrium.hh
rename to dumux/flux/fourierslawnonequilibrium.hh
diff --git a/dumux/discretization/hookeslaw.hh b/dumux/flux/hookeslaw.hh
similarity index 100%
rename from dumux/discretization/hookeslaw.hh
rename to dumux/flux/hookeslaw.hh
diff --git a/dumux/discretization/maxwellstefanslaw.hh b/dumux/flux/maxwellstefanslaw.hh
similarity index 100%
rename from dumux/discretization/maxwellstefanslaw.hh
rename to dumux/flux/maxwellstefanslaw.hh
diff --git a/dumux/discretization/stationaryvelocityfield.hh b/dumux/flux/stationaryvelocityfield.hh
similarity index 98%
rename from dumux/discretization/stationaryvelocityfield.hh
rename to dumux/flux/stationaryvelocityfield.hh
index 91ff078a12..e261d63353 100644
--- a/dumux/discretization/stationaryvelocityfield.hh
+++ b/dumux/flux/stationaryvelocityfield.hh
@@ -28,7 +28,7 @@
#define DUMUX_DISCRETIZATION_STATIONARY_VELOCITY_FIELD_HH
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
namespace Dumux {
diff --git a/dumux/discretization/upwindscheme.hh b/dumux/flux/upwindscheme.hh
similarity index 100%
rename from dumux/discretization/upwindscheme.hh
rename to dumux/flux/upwindscheme.hh
diff --git a/dumux/freeflow/compositional/navierstokesncmodel.hh b/dumux/freeflow/compositional/navierstokesncmodel.hh
index ce3cdc8dc5..7df4a068b2 100644
--- a/dumux/freeflow/compositional/navierstokesncmodel.hh
+++ b/dumux/freeflow/compositional/navierstokesncmodel.hh
@@ -56,8 +56,8 @@
#include <dumux/freeflow/nonisothermal/model.hh>
#include <dumux/freeflow/nonisothermal/indices.hh>
#include <dumux/freeflow/nonisothermal/iofields.hh>
-#include <dumux/discretization/fickslaw.hh>
-#include <dumux/discretization/fourierslaw.hh>
+#include <dumux/flux/fickslaw.hh>
+#include <dumux/flux/fourierslaw.hh>
#include "volumevariables.hh"
#include "localresidual.hh"
diff --git a/dumux/freeflow/compositional/staggered/fluxvariables.hh b/dumux/freeflow/compositional/staggered/fluxvariables.hh
index 62120ac8c0..7a42ee8d7a 100644
--- a/dumux/freeflow/compositional/staggered/fluxvariables.hh
+++ b/dumux/freeflow/compositional/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
#include <numeric>
#include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
#include <dumux/discretization/method.hh>
#include <dumux/freeflow/navierstokes/fluxvariables.hh>
diff --git a/dumux/freeflow/navierstokes/model.hh b/dumux/freeflow/navierstokes/model.hh
index 3fdb573ea2..413b45c9ad 100644
--- a/dumux/freeflow/navierstokes/model.hh
+++ b/dumux/freeflow/navierstokes/model.hh
@@ -63,7 +63,7 @@
#include <dumux/material/fluidstates/immiscible.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fourierslaw.hh>
+#include <dumux/flux/fourierslaw.hh>
namespace Dumux {
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index 6debed8933..f308c4607b 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -28,7 +28,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
#include <dumux/discretization/method.hh>
namespace Dumux {
diff --git a/dumux/freeflow/properties.hh b/dumux/freeflow/properties.hh
index 5b9d414f2f..c89b01bc47 100644
--- a/dumux/freeflow/properties.hh
+++ b/dumux/freeflow/properties.hh
@@ -28,7 +28,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/properties/model.hh>
-#include <dumux/discretization/fourierslaw.hh>
+#include <dumux/flux/fourierslaw.hh>
namespace Dumux {
namespace Properties {
diff --git a/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh b/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
index 38bab2114e..55db12b575 100644
--- a/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
#include <numeric>
#include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
#include <dumux/discretization/method.hh>
#include <dumux/freeflow/navierstokes/fluxvariables.hh>
#include <dumux/freeflow/rans/oneeq/fluxvariables.hh>
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
index 1f1bdb4b34..714c38f843 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
#include <numeric>
#include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
#include <dumux/discretization/method.hh>
#include <dumux/freeflow/navierstokes/fluxvariables.hh>
#include <dumux/freeflow/rans/twoeq/kepsilon/fluxvariables.hh>
diff --git a/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
index 235d6502b5..31cffed6a0 100644
--- a/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
#include <numeric>
#include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
#include <dumux/discretization/method.hh>
#include <dumux/freeflow/navierstokes/fluxvariables.hh>
#include <dumux/freeflow/rans/twoeq/komega/fluxvariables.hh>
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
index 6037562952..a199216028 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
@@ -26,7 +26,7 @@
#include <numeric>
#include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
#include <dumux/discretization/method.hh>
#include <dumux/freeflow/navierstokes/fluxvariables.hh>
#include <dumux/freeflow/rans/twoeq/lowrekepsilon/fluxvariables.hh>
diff --git a/dumux/geomechanics/elastic/model.hh b/dumux/geomechanics/elastic/model.hh
index da9bfbe695..d580968bf9 100644
--- a/dumux/geomechanics/elastic/model.hh
+++ b/dumux/geomechanics/elastic/model.hh
@@ -32,7 +32,7 @@
#include <dumux/common/properties/model.hh>
#include <dumux/geomechanics/properties.hh>
-#include <dumux/discretization/hookeslaw.hh>
+#include <dumux/flux/hookeslaw.hh>
#include "indices.hh"
#include "localresidual.hh"
diff --git a/dumux/geomechanics/poroelastic/model.hh b/dumux/geomechanics/poroelastic/model.hh
index c2eac3e9ac..abb8d1e2b0 100644
--- a/dumux/geomechanics/poroelastic/model.hh
+++ b/dumux/geomechanics/poroelastic/model.hh
@@ -32,8 +32,8 @@
#include <dumux/geomechanics/elastic/indices.hh>
#include <dumux/geomechanics/elastic/model.hh>
-#include <dumux/discretization/hookeslaw.hh>
-#include <dumux/discretization/effectivestresslaw.hh>
+#include <dumux/flux/hookeslaw.hh>
+#include <dumux/flux/effectivestresslaw.hh>
#include "localresidual.hh"
#include "volumevariables.hh"
diff --git a/dumux/geomechanics/properties.hh b/dumux/geomechanics/properties.hh
index 5e1d44c342..7c602d899c 100644
--- a/dumux/geomechanics/properties.hh
+++ b/dumux/geomechanics/properties.hh
@@ -31,7 +31,7 @@
#include <dumux/material/components/constant.hh>
#include <dumux/material/solidstates/inertsolidstate.hh>
#include <dumux/material/solidsystems/inertsolidphase.hh>
-#include <dumux/discretization/hookeslaw.hh>
+#include <dumux/flux/hookeslaw.hh>
#include "stressvariablescache.hh"
#include "velocityoutput.hh"
diff --git a/dumux/geomechanics/stressvariablescache.hh b/dumux/geomechanics/stressvariablescache.hh
index f1dc05fbe8..3c976b3d5f 100644
--- a/dumux/geomechanics/stressvariablescache.hh
+++ b/dumux/geomechanics/stressvariablescache.hh
@@ -27,7 +27,7 @@
#include <dune/common/exceptions.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
#include <dumux/discretization/box/fluxvariablescache.hh>
namespace Dumux {
diff --git a/dumux/porousmediumflow/2p1c/darcyslaw.hh b/dumux/porousmediumflow/2p1c/darcyslaw.hh
index 624128bdeb..6e3ae6dfe4 100644
--- a/dumux/porousmediumflow/2p1c/darcyslaw.hh
+++ b/dumux/porousmediumflow/2p1c/darcyslaw.hh
@@ -28,7 +28,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/darcyslaw.hh>
+#include <dumux/flux/darcyslaw.hh>
namespace Dumux
{
diff --git a/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh b/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
index cf69e32347..3b49c4dffe 100644
--- a/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
+++ b/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
@@ -28,7 +28,7 @@
#include <dumux/common/properties.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
namespace Dumux {
diff --git a/dumux/porousmediumflow/fluxvariables.hh b/dumux/porousmediumflow/fluxvariables.hh
index ef15dc6d2e..080ed71282 100644
--- a/dumux/porousmediumflow/fluxvariables.hh
+++ b/dumux/porousmediumflow/fluxvariables.hh
@@ -27,8 +27,8 @@
#include <array>
#include <dumux/common/properties.hh>
-#include <dumux/discretization/fluxvariablesbase.hh>
-#include <dumux/discretization/upwindscheme.hh>
+#include <dumux/flux/fluxvariablesbase.hh>
+#include <dumux/flux/upwindscheme.hh>
namespace Dumux {
diff --git a/dumux/porousmediumflow/fluxvariablescache.hh b/dumux/porousmediumflow/fluxvariablescache.hh
index f35e0e691c..774b6ba151 100644
--- a/dumux/porousmediumflow/fluxvariablescache.hh
+++ b/dumux/porousmediumflow/fluxvariablescache.hh
@@ -25,7 +25,7 @@
#include <dumux/common/properties.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/fluxvariablescaching.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
#include <dumux/discretization/box/fluxvariablescache.hh>
namespace Dumux {
diff --git a/dumux/porousmediumflow/nonequilibrium/model.hh b/dumux/porousmediumflow/nonequilibrium/model.hh
index 1fae5b6f48..1013d40312 100644
--- a/dumux/porousmediumflow/nonequilibrium/model.hh
+++ b/dumux/porousmediumflow/nonequilibrium/model.hh
@@ -30,8 +30,8 @@
#include <dumux/common/dimensionlessnumbers.hh>
#include <dumux/material/fluidstates/nonequilibrium.hh>
-#include <dumux/discretization/fourierslawnonequilibrium.hh>
-#include <dumux/discretization/fourierslawnonequilibrium.hh>
+#include <dumux/flux/fourierslawnonequilibrium.hh>
+#include <dumux/flux/fourierslawnonequilibrium.hh>
#include <dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh>
#include <dumux/porousmediumflow/nonequilibrium/localresidual.hh>
diff --git a/dumux/porousmediumflow/properties.hh b/dumux/porousmediumflow/properties.hh
index f04eb75a8f..54273367d9 100644
--- a/dumux/porousmediumflow/properties.hh
+++ b/dumux/porousmediumflow/properties.hh
@@ -36,9 +36,9 @@
#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
#include <dumux/porousmediumflow/velocityoutput.hh>
-#include <dumux/discretization/darcyslaw.hh>
-#include <dumux/discretization/fickslaw.hh>
-#include <dumux/discretization/fourierslaw.hh>
+#include <dumux/flux/darcyslaw.hh>
+#include <dumux/flux/fickslaw.hh>
+#include <dumux/flux/fourierslaw.hh>
#include <dumux/material/solidstates/inertsolidstate.hh>
#include <dumux/material/solidsystems/inertsolidphase.hh>
diff --git a/dumux/porousmediumflow/tracer/model.hh b/dumux/porousmediumflow/tracer/model.hh
index 7b5f57931a..63853886d5 100644
--- a/dumux/porousmediumflow/tracer/model.hh
+++ b/dumux/porousmediumflow/tracer/model.hh
@@ -53,7 +53,7 @@
#include <dumux/common/properties.hh>
#include <dumux/material/spatialparams/fv1p.hh>
-#include <dumux/discretization/stationaryvelocityfield.hh>
+#include <dumux/flux/stationaryvelocityfield.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
#include <dumux/porousmediumflow/properties.hh>
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
index 34e66b6fb2..1fdee6b90c 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
+++ b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
@@ -32,7 +32,7 @@
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
-#include <dumux/discretization/maxwellstefanslaw.hh>
+#include <dumux/flux/maxwellstefanslaw.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/io/gnuplotinterface.hh>
diff --git a/test/porousmediumflow/1p/implicit/isothermal/problem.hh b/test/porousmediumflow/1p/implicit/isothermal/problem.hh
index 4f5d6bdc47..ef54bf7078 100644
--- a/test/porousmediumflow/1p/implicit/isothermal/problem.hh
+++ b/test/porousmediumflow/1p/implicit/isothermal/problem.hh
@@ -38,7 +38,7 @@
#include "spatialparams.hh"
#if FORCHHEIMER
-#include <dumux/discretization/forchheimerslaw.hh>
+#include <dumux/flux/forchheimerslaw.hh>
#endif
namespace Dumux {
diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
index d56ad14ef4..b60f44e73e 100644
--- a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
+++ b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
@@ -33,7 +33,7 @@
#include <dumux/material/fluidsystems/h2on2.hh>
#include "spatialparams.hh"
-#include <dumux/discretization/maxwellstefanslaw.hh>
+#include <dumux/flux/maxwellstefanslaw.hh>
#ifndef DIFFUSIONTYPE // default to Fick's law if not set through CMake
#define DIFFUSIONTYPE FicksLaw<TypeTag>
diff --git a/test/porousmediumflow/tracer/multicomp/problem.hh b/test/porousmediumflow/tracer/multicomp/problem.hh
index eb7f6e01d1..0d1054c77a 100644
--- a/test/porousmediumflow/tracer/multicomp/problem.hh
+++ b/test/porousmediumflow/tracer/multicomp/problem.hh
@@ -35,7 +35,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include "spatialparams.hh"
-#include <dumux/discretization/maxwellstefanslaw.hh>
+#include <dumux/flux/maxwellstefanslaw.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidsystems/base.hh>
--
GitLab