From 0772761fa4799a6195a45a321eb77206af2e4187 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Sun, 10 Dec 2017 09:27:26 +0100
Subject: [PATCH] [freeflow][navierstokes] Fix all tests

* clean-up
* use correct discretization tag
* use correct includes
---
 test/freeflow/staggered/angelitestproblem.hh       | 11 +++++------
 test/freeflow/staggered/channeltestproblem.hh      | 13 ++++++-------
 test/freeflow/staggered/closedsystemtestproblem.hh | 10 ++++------
 test/freeflow/staggered/kovasznaytestproblem.hh    | 10 ++++------
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/test/freeflow/staggered/angelitestproblem.hh b/test/freeflow/staggered/angelitestproblem.hh
index 69de101db6..bc4b39e890 100644
--- a/test/freeflow/staggered/angelitestproblem.hh
+++ b/test/freeflow/staggered/angelitestproblem.hh
@@ -24,14 +24,13 @@
 #ifndef DUMUX_ANGELI_TEST_PROBLEM_HH
 #define DUMUX_ANGELI_TEST_PROBLEM_HH
 
-#include <dumux/freeflow/staggered/problem.hh>
-#include <dumux/discretization/staggered/properties.hh>
-#include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/components/constant.hh>
+#include <dumux/material/fluidsystems/1p.hh>
 
-#include <dumux/discretization/staggered/properties.hh>
-#include <dumux/freeflow/staggered/properties.hh>
+#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/discretization/staggered/freeflow/properties.hh>
+#include <dumux/freeflow/navierstokes/model.hh>
 
 namespace Dumux
 {
@@ -47,7 +46,7 @@ namespace Capabilities
 
 namespace Properties
 {
-NEW_TYPE_TAG(AngeliTestProblem, INHERITS_FROM(StaggeredModel, NavierStokes));
+NEW_TYPE_TAG(AngeliTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
 SET_PROP(AngeliTestProblem, FluidSystem)
diff --git a/test/freeflow/staggered/channeltestproblem.hh b/test/freeflow/staggered/channeltestproblem.hh
index 6efa1b79ac..244cf54cce 100644
--- a/test/freeflow/staggered/channeltestproblem.hh
+++ b/test/freeflow/staggered/channeltestproblem.hh
@@ -24,15 +24,14 @@
 #ifndef DUMUX_CHANNEL_TEST_PROBLEM_HH
 #define DUMUX_CHANNEL_TEST_PROBLEM_HH
 
-#include <dumux/freeflow/staggered/problem.hh>
-#include <dumux/discretization/staggered/properties.hh>
-#include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
+#include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1p.hh>
 
-#include <dumux/discretization/staggered/properties.hh>
-#include <dumux/freeflow/staggered/properties.hh>
+#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/discretization/staggered/freeflow/properties.hh>
+#include <dumux/freeflow/navierstokes/model.hh>
 
 namespace Dumux
 {
@@ -49,9 +48,9 @@ namespace Capabilities
 namespace Properties
 {
 #if !NONISOTHERMAL
-NEW_TYPE_TAG(ChannelTestProblem, INHERITS_FROM(StaggeredModel, NavierStokes));
+NEW_TYPE_TAG(ChannelTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 #else
-NEW_TYPE_TAG(ChannelTestProblem, INHERITS_FROM(StaggeredModel, NavierStokesNI));
+NEW_TYPE_TAG(ChannelTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNI));
 #endif
 
 // the fluid system
diff --git a/test/freeflow/staggered/closedsystemtestproblem.hh b/test/freeflow/staggered/closedsystemtestproblem.hh
index ed70b62ee5..7aff81ee79 100644
--- a/test/freeflow/staggered/closedsystemtestproblem.hh
+++ b/test/freeflow/staggered/closedsystemtestproblem.hh
@@ -24,15 +24,13 @@
 #ifndef DUMUX_CLOSEDSYSTEM_TEST_PROBLEM_HH
 #define DUMUX_CLOSEDSYSTEM_TEST_PROBLEM_HH
 
-#include <dumux/freeflow/staggered/problem.hh>
-#include <dumux/discretization/staggered/properties.hh>
-#include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1p.hh>
 
-#include <dumux/discretization/staggered/properties.hh>
-#include <dumux/freeflow/staggered/properties.hh>
+#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/discretization/staggered/freeflow/properties.hh>
+#include <dumux/freeflow/navierstokes/model.hh>
 
 namespace Dumux
 {
@@ -48,7 +46,7 @@ namespace Capabilities
 
 namespace Properties
 {
-NEW_TYPE_TAG(ClosedSystemTestProblem, INHERITS_FROM(StaggeredModel, NavierStokes));
+NEW_TYPE_TAG(ClosedSystemTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
 SET_PROP(ClosedSystemTestProblem, FluidSystem)
diff --git a/test/freeflow/staggered/kovasznaytestproblem.hh b/test/freeflow/staggered/kovasznaytestproblem.hh
index 645503eae9..8f421f8601 100644
--- a/test/freeflow/staggered/kovasznaytestproblem.hh
+++ b/test/freeflow/staggered/kovasznaytestproblem.hh
@@ -24,15 +24,13 @@
 #ifndef DUMUX_KOVASZNAY_TEST_PROBLEM_HH
 #define DUMUX_KOVASZNAY_TEST_PROBLEM_HH
 
-#include <dumux/freeflow/staggered/problem.hh>
-#include <dumux/discretization/staggered/properties.hh>
-#include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1p.hh>
 
-#include <dumux/discretization/staggered/properties.hh>
-#include <dumux/freeflow/staggered/properties.hh>
+#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/discretization/staggered/freeflow/properties.hh>
+#include <dumux/freeflow/navierstokes/model.hh>
 
 // solve Navier-Stokes equations
 #define ENABLE_NAVIERSTOKES 1
@@ -52,7 +50,7 @@ namespace Capabilities
 
 namespace Properties
 {
-NEW_TYPE_TAG(KovasznayTestProblem, INHERITS_FROM(StaggeredModel, NavierStokes));
+NEW_TYPE_TAG(KovasznayTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
 SET_PROP(KovasznayTestProblem, FluidSystem)
-- 
GitLab