Merge branch 'fix/gridmanager-subgrid-spgrid' into 'master'

[gridmanager][bugfix] Move subgrid code to correct header

See merge request !1583

dumux/io/grid/gridmanager_sp.hh

@@ -34,8 +34,6 @@
 #include <dumux/io/grid/gridmanager_base.hh>
 #endif
 
-#include <dumux/common/boundaryflag.hh>
-
 namespace Dumux {
 
 #if HAVE_DUNE_SPGRID
@@ -99,25 +97,6 @@ public:
     }
 };
 
-//! dune-subgrid doesn't have this implemented
-template<int dim, class HostGrid>
-class BoundaryFlag<Dune::SubGrid<dim, HostGrid>>
-{
-public:
-    BoundaryFlag() : flag_(-1) {}
-
-    template<class Intersection>
-    BoundaryFlag(const Intersection& i) : flag_(-1) {}
-
-    using value_type = int;
-
-    value_type get() const
-    { DUNE_THROW(Dune::NotImplemented, "Sub-grid doesn't implement boundary segment indices!"); }
-
-private:
-    int flag_;
-};
-
 #endif // HAVE_DUNE_SPGRID
 
 } // end namespace Dumux

dumux/io/grid/subgridmanager.hh

@@ -33,6 +33,7 @@
 #include <dune/grid/io/file/dgfparser/dgfwriter.hh>
 
 #include <dumux/common/parameters.hh>
+#include <dumux/common/boundaryflag.hh>
 
 namespace Dumux {
 
@@ -99,6 +100,25 @@ public:
     }
 };
 
+//! dune-subgrid doesn't have this implemented
+template<int dim, class HostGrid>
+class BoundaryFlag<Dune::SubGrid<dim, HostGrid>>
+{
+public:
+    BoundaryFlag() : flag_(-1) {}
+
+    template<class Intersection>
+    BoundaryFlag(const Intersection& i) : flag_(-1) {}
+
+    using value_type = int;
+
+    value_type get() const
+    { DUNE_THROW(Dune::NotImplemented, "Sub-grid doesn't implement boundary segment indices!"); }
+
+private:
+    int flag_;
+};
+
 } // end namespace Dumux
 
 #endif // HAVE_DUNE_SUBGRID