From 5860cb28a1a4dad24460fc2bf75c524c7fc32b30 Mon Sep 17 00:00:00 2001
From: Mathis Kelm <mathis.kelm@iws.uni-stuttgart.de>
Date: Wed, 5 Oct 2022 15:51:05 +0000
Subject: [PATCH] Merge branch 'cleanup/resolve-deprecations-ff' into 'master'

[coupling-ff-pm] resolve deprecation of ff problems

See merge request dumux-repositories/dumux-course!128

(cherry picked from commit dd11d555a4e97c7fa34c1f97802f049981d11f50)

1f919e91 [coupling-ff-pm] resolve deprecation of ff problems
---
 .../exercise-coupling-ff-pm/interface/freeflowsubproblem.hh | 6 +++---
 .../exercise-coupling-ff-pm/models/freeflowsubproblem.hh    | 6 +++---
 .../turbulence/freeflowsubproblem.hh                        | 6 +++---
 .../exercise-coupling-ff-pm/interface/freeflowsubproblem.hh | 6 +++---
 .../exercise-coupling-ff-pm/models/freeflowsubproblem.hh    | 6 +++---
 .../turbulence/freeflowsubproblem.hh                        | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 11407d6f..3478a080 100644
--- a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_STOKES_SUBPROBLEM_HH
 #define DUMUX_STOKES_SUBPROBLEM_HH
 
-#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/freeflow/navierstokes/staggered/problem.hh>
 #include <dumux/freeflow/navierstokes/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/boundarytypes.hh>
@@ -35,9 +35,9 @@ namespace Dumux {
  * \brief The free flow sub problem
  */
 template <class TypeTag>
-class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
+class FreeFlowSubProblem : public NavierStokesStaggeredProblem<TypeTag>
 {
-    using ParentType = NavierStokesProblem<TypeTag>;
+    using ParentType = NavierStokesStaggeredProblem<TypeTag>;
 
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
diff --git a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 71a3393c..5214551d 100644
--- a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -29,7 +29,7 @@
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/numeqvector.hh>
 
-#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/freeflow/navierstokes/staggered/problem.hh>
 #include <dumux/freeflow/navierstokes/boundarytypes.hh>
 
 namespace Dumux {
@@ -40,9 +40,9 @@ namespace Dumux {
  * Horizontal flow from left to right with a parabolic velocity profile.
  */
 template <class TypeTag>
-class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
+class FreeFlowSubProblem : public NavierStokesStaggeredProblem<TypeTag>
 {
-    using ParentType = NavierStokesProblem<TypeTag>;
+    using ParentType = NavierStokesStaggeredProblem<TypeTag>;
 
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index e6ce2d51..9a2e778e 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -31,7 +31,7 @@
 
 // TODO: dumux-course-task 3.A
 // Include headers for turbulence problem (rans) here.
-#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/freeflow/navierstokes/staggered/problem.hh>
 #include <dumux/freeflow/navierstokes/boundarytypes.hh>
 
 namespace Dumux {
@@ -41,9 +41,9 @@ namespace Dumux {
 template <class TypeTag>
 // TODO: dumux-course-task 3.A
 // Adapt the inheritance of the problem class.
-class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
+class FreeFlowSubProblem : public NavierStokesStaggeredProblem<TypeTag>
 {
-    using ParentType = NavierStokesProblem<TypeTag>;
+    using ParentType = NavierStokesStaggeredProblem<TypeTag>;
 
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index dc6ee8c8..453b8572 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -28,7 +28,7 @@
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/numeqvector.hh>
 
-#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/freeflow/navierstokes/staggered/problem.hh>
 #include <dumux/freeflow/navierstokes/boundarytypes.hh>
 
 namespace Dumux {
@@ -36,9 +36,9 @@ namespace Dumux {
  * \brief The free flow sub problem
  */
 template <class TypeTag>
-class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
+class FreeFlowSubProblem : public NavierStokesStaggeredProblem<TypeTag>
 {
-    using ParentType = NavierStokesProblem<TypeTag>;
+    using ParentType = NavierStokesStaggeredProblem<TypeTag>;
 
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index a94c6a05..109473e7 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -29,7 +29,7 @@
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/numeqvector.hh>
 
-#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/freeflow/navierstokes/staggered/problem.hh>
 #include <dumux/freeflow/navierstokes/boundarytypes.hh>
 
 namespace Dumux {
@@ -40,9 +40,9 @@ namespace Dumux {
  * Horizontal flow from left to right with a parabolic velocity profile.
  */
 template <class TypeTag>
-class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
+class FreeFlowSubProblem : public NavierStokesStaggeredProblem<TypeTag>
 {
-    using ParentType = NavierStokesProblem<TypeTag>;
+    using ParentType = NavierStokesStaggeredProblem<TypeTag>;
 
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index b79c8162..6aecc5c2 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -27,7 +27,7 @@
 #include <dumux/freeflow/rans/problem.hh>
 #include <dumux/freeflow/rans/boundarytypes.hh>
 #else
-#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/freeflow/navierstokes/staggered/problem.hh>
 #endif
 
 #include <dumux/common/timeloop.hh>
@@ -48,9 +48,9 @@ class FreeFlowSubProblem : public RANSProblem<TypeTag>
 {
     using ParentType = RANSProblem<TypeTag>;
 #else
-class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
+class FreeFlowSubProblem : public NavierStokesStaggeredProblem<TypeTag>
 {
-    using ParentType = NavierStokesProblem<TypeTag>;
+    using ParentType = NavierStokesStaggeredProblem<TypeTag>;
 #endif
 
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
-- 
GitLab