From 851c24c207a6f91df3c6cf8344e721f1a502963b Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Sun, 2 Dec 2018 12:26:27 +0100 Subject: [PATCH] [staggered] Move flux implementations to flux/staggered/freeflow --- dumux/flux/fickslaw.hh | 2 +- dumux/flux/fourierslaw.hh | 2 +- dumux/flux/maxwellstefanslaw.hh | 2 +- dumux/{discretization => flux}/staggered/freeflow/fickslaw.hh | 0 .../{discretization => flux}/staggered/freeflow/fourierslaw.hh | 0 .../staggered/freeflow/maxwellstefanslaw.hh | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename dumux/{discretization => flux}/staggered/freeflow/fickslaw.hh (100%) rename dumux/{discretization => flux}/staggered/freeflow/fourierslaw.hh (100%) rename dumux/{discretization => flux}/staggered/freeflow/maxwellstefanslaw.hh (100%) diff --git a/dumux/flux/fickslaw.hh b/dumux/flux/fickslaw.hh index 1edb6d2e2c..73a73c9769 100644 --- a/dumux/flux/fickslaw.hh +++ b/dumux/flux/fickslaw.hh @@ -47,6 +47,6 @@ using FicksLaw = FicksLawImplementation<TypeTag, GetPropType<TypeTag, Properties #include <dumux/flux/cctpfa/fickslaw.hh> #include <dumux/flux/ccmpfa/fickslaw.hh> #include <dumux/flux/box/fickslaw.hh> -#include <dumux/discretization/staggered/freeflow/fickslaw.hh> +#include <dumux/flux/staggered/freeflow/fickslaw.hh> #endif diff --git a/dumux/flux/fourierslaw.hh b/dumux/flux/fourierslaw.hh index dc9a714a43..d9d6a4ac8d 100644 --- a/dumux/flux/fourierslaw.hh +++ b/dumux/flux/fourierslaw.hh @@ -48,6 +48,6 @@ using FouriersLaw = FouriersLawImplementation<TypeTag, GetPropType<TypeTag, Prop #include <dumux/flux/cctpfa/fourierslaw.hh> #include <dumux/flux/ccmpfa/fourierslaw.hh> #include <dumux/flux/box/fourierslaw.hh> -#include <dumux/discretization/staggered/freeflow/fourierslaw.hh> +#include <dumux/flux/staggered/freeflow/fourierslaw.hh> #endif diff --git a/dumux/flux/maxwellstefanslaw.hh b/dumux/flux/maxwellstefanslaw.hh index 8c51832ec3..e4cb4a02bd 100644 --- a/dumux/flux/maxwellstefanslaw.hh +++ b/dumux/flux/maxwellstefanslaw.hh @@ -45,6 +45,6 @@ using MaxwellStefansLaw = MaxwellStefansLawImplementation<TypeTag, GetPropType<T #include <dumux/flux/cctpfa/maxwellstefanslaw.hh> #include <dumux/flux/box/maxwellstefanslaw.hh> -#include <dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh> +#include <dumux/flux/staggered/freeflow/maxwellstefanslaw.hh> #endif diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/flux/staggered/freeflow/fickslaw.hh similarity index 100% rename from dumux/discretization/staggered/freeflow/fickslaw.hh rename to dumux/flux/staggered/freeflow/fickslaw.hh diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/flux/staggered/freeflow/fourierslaw.hh similarity index 100% rename from dumux/discretization/staggered/freeflow/fourierslaw.hh rename to dumux/flux/staggered/freeflow/fourierslaw.hh diff --git a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh b/dumux/flux/staggered/freeflow/maxwellstefanslaw.hh similarity index 100% rename from dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh rename to dumux/flux/staggered/freeflow/maxwellstefanslaw.hh -- GitLab