From cdff8cc3f79edcaa80c5551c25fe3906ba37e6bb Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 15 Dec 2017 16:12:12 +0100
Subject: [PATCH] Move staggeredlocalresidual.hh to assembly folder
---
dumux/assembly/CMakeLists.txt | 1 +
dumux/assembly/staggeredfvassembler.hh | 2 +-
.../localresidual.hh => assembly/staggeredlocalresidual.hh} | 0
dumux/discretization/staggered/properties.hh | 2 +-
dumux/freeflow/navierstokes/staggered/localresidual.hh | 5 +++--
dumux/freeflow/navierstokesnc/model.hh | 2 +-
6 files changed, 7 insertions(+), 5 deletions(-)
rename dumux/{implicit/staggered/localresidual.hh => assembly/staggeredlocalresidual.hh} (100%)
diff --git a/dumux/assembly/CMakeLists.txt b/dumux/assembly/CMakeLists.txt
index cc5de8c508..f7ea8bb601 100644
--- a/dumux/assembly/CMakeLists.txt
+++ b/dumux/assembly/CMakeLists.txt
@@ -9,4 +9,5 @@ fvassembler.hh
fvlocalresidual.hh
staggeredfvassembler.hh
staggeredlocalassembler.hh
+staggeredlocalresidual.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/assembly)
diff --git a/dumux/assembly/staggeredfvassembler.hh b/dumux/assembly/staggeredfvassembler.hh
index 96999afe5a..2d803bfd9a 100644
--- a/dumux/assembly/staggeredfvassembler.hh
+++ b/dumux/assembly/staggeredfvassembler.hh
@@ -30,11 +30,11 @@
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
-#include <dumux/implicit/staggered/localresidual.hh>
#include <dumux/discretization/methods.hh>
#include "diffmethod.hh"
#include "staggeredlocalassembler.hh"
+#include "staggeredlocalresidual.hh"
namespace Dumux {
diff --git a/dumux/implicit/staggered/localresidual.hh b/dumux/assembly/staggeredlocalresidual.hh
similarity index 100%
rename from dumux/implicit/staggered/localresidual.hh
rename to dumux/assembly/staggeredlocalresidual.hh
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 3388f00788..d76d2506a6 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -32,7 +32,7 @@
#include <dumux/discretization/fvproperties.hh>
#include <dumux/implicit/cellcentered/elementboundarytypes.hh>
-#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/assembly/staggeredlocalresidual.hh>
#include <dumux/implicit/staggered/primaryvariables.hh>
#include <dumux/implicit/staggered/gridvariables.hh>
diff --git a/dumux/freeflow/navierstokes/staggered/localresidual.hh b/dumux/freeflow/navierstokes/staggered/localresidual.hh
index 6dcd354f0b..75024913c3 100644
--- a/dumux/freeflow/navierstokes/staggered/localresidual.hh
+++ b/dumux/freeflow/navierstokes/staggered/localresidual.hh
@@ -25,7 +25,7 @@
#include <dumux/common/properties.hh>
#include <dumux/discretization/methods.hh>
-#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/assembly/staggeredlocalresidual.hh>
#include <dune/common/hybridutilities.hh>
namespace Dumux
@@ -52,7 +52,8 @@ NEW_PROP_TAG(ElementFaceVariables);
template<class TypeTag>
-class NavierStokesResidualImpl<TypeTag, DiscretizationMethods::Staggered> : public Dumux::StaggeredLocalResidual<TypeTag>
+class NavierStokesResidualImpl<TypeTag, DiscretizationMethods::Staggered>
+: public StaggeredLocalResidual<TypeTag>
{
using ParentType = StaggeredLocalResidual<TypeTag>;
friend class StaggeredLocalResidual<TypeTag>;
diff --git a/dumux/freeflow/navierstokesnc/model.hh b/dumux/freeflow/navierstokesnc/model.hh
index 3542b1bf1e..6ead117b84 100644
--- a/dumux/freeflow/navierstokesnc/model.hh
+++ b/dumux/freeflow/navierstokesnc/model.hh
@@ -39,7 +39,7 @@
#include "fluxvariables.hh"
#include "vtkoutputfields.hh"
-#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/assembly/staggeredlocalresidual.hh>
#include <dumux/material/fluidsystems/gasphase.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
--
GitLab