From 61c4436b59a2f7cf3fce59dd9b5146aacdac6775 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 1 Dec 2018 11:46:38 +0100
Subject: [PATCH] [box] Move flux implementations to flux/box
---
dumux/{discretization => flux}/box/darcyslaw.hh | 0
dumux/{discretization => flux}/box/effectivestresslaw.hh | 0
dumux/{discretization => flux}/box/fickslaw.hh | 0
dumux/{discretization => flux}/box/fourierslaw.hh | 0
dumux/{discretization => flux}/box/fourierslawnonequilibrium.hh | 0
dumux/{discretization => flux}/box/hookeslaw.hh | 0
dumux/{discretization => flux}/box/maxwellstefanslaw.hh | 0
dumux/flux/darcyslaw.hh | 2 +-
dumux/flux/effectivestresslaw.hh | 2 +-
dumux/flux/fickslaw.hh | 2 +-
dumux/flux/fourierslaw.hh | 2 +-
dumux/flux/fourierslawnonequilibrium.hh | 2 +-
dumux/flux/hookeslaw.hh | 2 +-
dumux/flux/maxwellstefanslaw.hh | 2 +-
dumux/multidomain/facet/box/darcyslaw.hh | 2 +-
15 files changed, 8 insertions(+), 8 deletions(-)
rename dumux/{discretization => flux}/box/darcyslaw.hh (100%)
rename dumux/{discretization => flux}/box/effectivestresslaw.hh (100%)
rename dumux/{discretization => flux}/box/fickslaw.hh (100%)
rename dumux/{discretization => flux}/box/fourierslaw.hh (100%)
rename dumux/{discretization => flux}/box/fourierslawnonequilibrium.hh (100%)
rename dumux/{discretization => flux}/box/hookeslaw.hh (100%)
rename dumux/{discretization => flux}/box/maxwellstefanslaw.hh (100%)
diff --git a/dumux/discretization/box/darcyslaw.hh b/dumux/flux/box/darcyslaw.hh
similarity index 100%
rename from dumux/discretization/box/darcyslaw.hh
rename to dumux/flux/box/darcyslaw.hh
diff --git a/dumux/discretization/box/effectivestresslaw.hh b/dumux/flux/box/effectivestresslaw.hh
similarity index 100%
rename from dumux/discretization/box/effectivestresslaw.hh
rename to dumux/flux/box/effectivestresslaw.hh
diff --git a/dumux/discretization/box/fickslaw.hh b/dumux/flux/box/fickslaw.hh
similarity index 100%
rename from dumux/discretization/box/fickslaw.hh
rename to dumux/flux/box/fickslaw.hh
diff --git a/dumux/discretization/box/fourierslaw.hh b/dumux/flux/box/fourierslaw.hh
similarity index 100%
rename from dumux/discretization/box/fourierslaw.hh
rename to dumux/flux/box/fourierslaw.hh
diff --git a/dumux/discretization/box/fourierslawnonequilibrium.hh b/dumux/flux/box/fourierslawnonequilibrium.hh
similarity index 100%
rename from dumux/discretization/box/fourierslawnonequilibrium.hh
rename to dumux/flux/box/fourierslawnonequilibrium.hh
diff --git a/dumux/discretization/box/hookeslaw.hh b/dumux/flux/box/hookeslaw.hh
similarity index 100%
rename from dumux/discretization/box/hookeslaw.hh
rename to dumux/flux/box/hookeslaw.hh
diff --git a/dumux/discretization/box/maxwellstefanslaw.hh b/dumux/flux/box/maxwellstefanslaw.hh
similarity index 100%
rename from dumux/discretization/box/maxwellstefanslaw.hh
rename to dumux/flux/box/maxwellstefanslaw.hh
diff --git a/dumux/flux/darcyslaw.hh b/dumux/flux/darcyslaw.hh
index 939686a6ce..80e533937d 100644
--- a/dumux/flux/darcyslaw.hh
+++ b/dumux/flux/darcyslaw.hh
@@ -48,7 +48,7 @@ using DarcysLaw = DarcysLawImplementation<TypeTag, GetPropType<TypeTag, Properti
} // end namespace Dumux
-#include <dumux/discretization/box/darcyslaw.hh>
+#include <dumux/flux/box/darcyslaw.hh>
#include <dumux/discretization/cellcentered/tpfa/darcyslaw.hh>
#include <dumux/discretization/cellcentered/mpfa/darcyslaw.hh>
diff --git a/dumux/flux/effectivestresslaw.hh b/dumux/flux/effectivestresslaw.hh
index 755845377e..687140b078 100644
--- a/dumux/flux/effectivestresslaw.hh
+++ b/dumux/flux/effectivestresslaw.hh
@@ -40,6 +40,6 @@ class EffectiveStressLaw;
} // end namespace Dumux
-#include <dumux/discretization/box/effectivestresslaw.hh>
+#include <dumux/flux/box/effectivestresslaw.hh>
#endif
diff --git a/dumux/flux/fickslaw.hh b/dumux/flux/fickslaw.hh
index 3a40c70a4c..5b802c3b40 100644
--- a/dumux/flux/fickslaw.hh
+++ b/dumux/flux/fickslaw.hh
@@ -46,7 +46,7 @@ using FicksLaw = FicksLawImplementation<TypeTag, GetPropType<TypeTag, Properties
#include <dumux/discretization/cellcentered/tpfa/fickslaw.hh>
#include <dumux/discretization/cellcentered/mpfa/fickslaw.hh>
-#include <dumux/discretization/box/fickslaw.hh>
+#include <dumux/flux/box/fickslaw.hh>
#include <dumux/discretization/staggered/freeflow/fickslaw.hh>
#endif
diff --git a/dumux/flux/fourierslaw.hh b/dumux/flux/fourierslaw.hh
index 4c6858f737..a28a924dd3 100644
--- a/dumux/flux/fourierslaw.hh
+++ b/dumux/flux/fourierslaw.hh
@@ -47,7 +47,7 @@ using FouriersLaw = FouriersLawImplementation<TypeTag, GetPropType<TypeTag, Prop
#include <dumux/discretization/cellcentered/tpfa/fourierslaw.hh>
#include <dumux/discretization/cellcentered/mpfa/fourierslaw.hh>
-#include <dumux/discretization/box/fourierslaw.hh>
+#include <dumux/flux/box/fourierslaw.hh>
#include <dumux/discretization/staggered/freeflow/fourierslaw.hh>
#endif
diff --git a/dumux/flux/fourierslawnonequilibrium.hh b/dumux/flux/fourierslawnonequilibrium.hh
index ad6822283a..9abd4f120f 100644
--- a/dumux/flux/fourierslawnonequilibrium.hh
+++ b/dumux/flux/fourierslawnonequilibrium.hh
@@ -44,6 +44,6 @@ using FouriersLawNonEquilibrium = FouriersLawNonEquilibriumImplementation<TypeTa
} // end namespace Dumux
#include <dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh>
-#include <dumux/discretization/box/fourierslawnonequilibrium.hh>
+#include <dumux/flux/box/fourierslawnonequilibrium.hh>
#endif
diff --git a/dumux/flux/hookeslaw.hh b/dumux/flux/hookeslaw.hh
index 726495d30d..46d9874963 100644
--- a/dumux/flux/hookeslaw.hh
+++ b/dumux/flux/hookeslaw.hh
@@ -40,6 +40,6 @@ class HookesLaw;
} // end namespace Dumux
-#include <dumux/discretization/box/hookeslaw.hh>
+#include <dumux/flux/box/hookeslaw.hh>
#endif
diff --git a/dumux/flux/maxwellstefanslaw.hh b/dumux/flux/maxwellstefanslaw.hh
index 3c79e39884..d12d0b6cbf 100644
--- a/dumux/flux/maxwellstefanslaw.hh
+++ b/dumux/flux/maxwellstefanslaw.hh
@@ -44,7 +44,7 @@ using MaxwellStefansLaw = MaxwellStefansLawImplementation<TypeTag, GetPropType<T
} // end namespace
#include <dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh>
-#include <dumux/discretization/box/maxwellstefanslaw.hh>
+#include <dumux/flux/box/maxwellstefanslaw.hh>
#include <dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh>
#endif
diff --git a/dumux/multidomain/facet/box/darcyslaw.hh b/dumux/multidomain/facet/box/darcyslaw.hh
index 9d155d1d74..d747097b2e 100644
--- a/dumux/multidomain/facet/box/darcyslaw.hh
+++ b/dumux/multidomain/facet/box/darcyslaw.hh
@@ -32,7 +32,7 @@
#include <dumux/common/properties.hh>
#include <dumux/discretization/method.hh>
-#include <dumux/discretization/box/darcyslaw.hh>
+#include <dumux/flux/box/darcyslaw.hh>
namespace Dumux {
--
GitLab