From 56f5085d384da8776ec697507c183ed32dba7579 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Mon, 13 Apr 2020 21:56:55 +0200
Subject: [PATCH] [ex-coupling-ffpm] fix headercheck
---
exercises/exercise-coupling-ff-pm/interface/properties.hh | 2 ++
.../exercise-coupling-ff-pm/models/freeflowsubproblem.hh | 5 +++--
.../models/porousmediumsubproblem.hh | 5 ++++-
exercises/exercise-coupling-ff-pm/models/properties.hh | 2 ++
.../turbulence/freeflowsubproblem.hh | 6 ++++--
.../turbulence/porousmediumsubproblem.hh | 2 ++
exercises/exercise-coupling-ff-pm/turbulence/properties.hh | 2 ++
.../exercise-coupling-ff-pm/interface/freeflowsubproblem.hh | 5 +++--
.../exercise-coupling-ff-pm/interface/properties.hh | 2 ++
.../exercise-coupling-ff-pm/models/freeflowsubproblem.hh | 5 +++--
.../models/porousmediumsubproblem.hh | 6 ++++--
.../solution/exercise-coupling-ff-pm/models/properties.hh | 2 ++
.../turbulence/freeflowsubproblem.hh | 2 ++
.../turbulence/porousmediumsubproblem.hh | 6 ++++--
.../exercise-coupling-ff-pm/turbulence/properties.hh | 2 ++
15 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/exercises/exercise-coupling-ff-pm/interface/properties.hh b/exercises/exercise-coupling-ff-pm/interface/properties.hh
index 67a3dc85..c18e541b 100644
--- a/exercises/exercise-coupling-ff-pm/interface/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/properties.hh
@@ -25,6 +25,8 @@
// Both Domains
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// TODO: dumux-course-task 1.C
//****** uncomment for the last exercise *****//
diff --git a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index fe8b3ce9..08465b89 100644
--- a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -24,11 +24,12 @@
#ifndef DUMUX_STOKES1P2C_SUBPROBLEM_HH
#define DUMUX_STOKES1P2C_SUBPROBLEM_HH
-#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/freeflow/navierstokes/problem.hh>
+namespace Dumux {
/*!
* \ingroup NavierStokesTests
* \brief Test problem for the one-phase compositional (Navier-) Stokes problem.
diff --git a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 3ac0dd9e..4d3f7ebb 100644
--- a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -24,8 +24,11 @@
#ifndef DUMUX_DARCY_SUBPROBLEM_HH
#define DUMUX_DARCY_SUBPROBLEM_HH
-#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
+#include <dumux/io/gnuplotinterface.hh>
+
+#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
diff --git a/exercises/exercise-coupling-ff-pm/models/properties.hh b/exercises/exercise-coupling-ff-pm/models/properties.hh
index 447e5c86..fee538b7 100644
--- a/exercises/exercise-coupling-ff-pm/models/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/models/properties.hh
@@ -26,6 +26,8 @@
// Both Domains
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 6a42d300..6367854e 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -23,13 +23,15 @@
#ifndef DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
+#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
+
// TODO: dumux-course-task 3.A
// Include headers for turbulence problem (rans) here.
#include <dumux/freeflow/navierstokes/problem.hh>
-#include <dumux/common/properties.hh>
namespace Dumux {
-
/*!
* \brief The free-flow sub problem
*/
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 376c3171..f4ecbabf 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -26,6 +26,8 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
namespace Dumux {
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/properties.hh b/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
index d1ea847b..f7c79ed5 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
@@ -26,6 +26,8 @@
// Both domain
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index dd740702..48c8929e 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -23,11 +23,12 @@
#ifndef DUMUX_STOKES_SUBPROBLEM_HH
#define DUMUX_STOKES_SUBPROBLEM_HH
-#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/freeflow/navierstokes/problem.hh>
+namespace Dumux {
/*!
* \brief The free flow sub problem
*/
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh b/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
index ebca1dee..3574bd07 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
@@ -26,6 +26,8 @@
// Both domains
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#if EXNUMBER >= 3
#include <dumux/io/grid/gridmanager_sub.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index c53bb64f..70ca05e3 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -24,11 +24,12 @@
#ifndef DUMUX_STOKES1P2C_SUBPROBLEM_HH
#define DUMUX_STOKES1P2C_SUBPROBLEM_HH
-#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/freeflow/navierstokes/problem.hh>
+namespace Dumux {
/*!
* \ingroup NavierStokesTests
* \brief Test problem for the one-phase compositional (Navier-) Stokes problem.
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 896d75c4..537126e0 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -24,11 +24,13 @@
#ifndef DUMUX_DARCY_SUBPROBLEM_HH
#define DUMUX_DARCY_SUBPROBLEM_HH
-#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/io/gnuplotinterface.hh>
+#include <dumux/porousmediumflow/problem.hh>
+namespace Dumux {
/*!
* \brief The porous medium flow sub problem
*/
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/properties.hh b/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
index e54cf228..f33c3005 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
@@ -30,6 +30,8 @@
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// Porous medium flow domain
#include <dumux/discretization/cctpfa.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index fe569434..4a0b9a11 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -29,7 +29,9 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#endif
+#include <dumux/common/timeloop.hh>
#include <dumux/common/properties.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
namespace Dumux {
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index b6c10c33..92c91a98 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -24,11 +24,13 @@
#ifndef DUMUX_DARCY2P2C_SUBPROBLEM_HH
#define DUMUX_DARCY2P2C_SUBPROBLEM_HH
-#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
+namespace Dumux {
/*!
* \brief The porous medium sub problem
*/
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
index d4110fb1..d025a974 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
@@ -29,6 +29,8 @@
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// Porous medium flow domain
#include <dumux/porousmediumflow/2p2c/model.hh>
--
GitLab