Added some include files.

git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@31785 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/grid/manifold.h b/deal.II/include/deal.II/grid/manifold.h
index 4638b1d31a4968da1d35bdbc802b71270a1069c6..36b118ccebb3856a25d59bc218da44ea10cbcf30 100644 (file)
--- a/deal.II/include/deal.II/grid/manifold.h
+++ b/deal.II/include/deal.II/grid/manifold.h
@@ -23,7 +23,6 @@
 #include <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>
 #include <deal.II/base/point.h>
-#include <deal.II/grid/tria.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/grid/tria_accessor.templates.h b/deal.II/include/deal.II/grid/tria_accessor.templates.h
index 77354b8bab1b3a048f278b06089524671f55da3f..b0e5a447d4cd9b650edc80c15a53df1eeef30faf 100644 (file)
--- a/deal.II/include/deal.II/grid/tria_accessor.templates.h
+++ b/deal.II/include/deal.II/grid/tria_accessor.templates.h
@@ -27,6 +27,8 @@
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.templates.h>
+#include <deal.II/grid/manifold.h>
+#include <deal.II/grid/tria_boundary.h>
 #include <deal.II/distributed/tria.h>
 
 #include <cmath>
@@ -1980,8 +1982,9 @@ TriaAccessor<structdim, dim, spacedim>::get_manifold () const
     // otherwise we will run into troubles...
     if( (structdim < dim) ||
        (dim < spacedim) )
-      return this->tria->get_manifold
-       (numbers::invalid_manifold_id);
+      return get_boundary();    
+//       return this->tria->get_manifold
+//     (numbers::invalid_manifold_id);
 /*     *dynamic_cast<const Manifold<spacedim> *> */
 /*     (&this->tria->get_boundary(mi)); */
     else

diff --git a/deal.II/source/grid/tria_accessor.cc b/deal.II/source/grid/tria_accessor.cc
index 0a94641d9c532f156f1d344cedc5e4e64ba43022..e979820df3205210fdc852f636fa28c45616d470 100644 (file)
--- a/deal.II/source/grid/tria_accessor.cc
+++ b/deal.II/source/grid/tria_accessor.cc
@@ -22,6 +22,8 @@
 #include <deal.II/grid/tria_iterator.templates.h>
 #include <deal.II/base/geometry_info.h>
 #include <deal.II/grid/grid_tools.h>
+#include <deal.II/grid/manifold.h>
+#include <deal.II/grid/tria_boundary.h>
 #include <deal.II/fe/mapping_q1.h>
 
 #include <cmath>

diff --git a/deal.II/source/grid/tria_boundary.cc b/deal.II/source/grid/tria_boundary.cc
index 65b3bafe7bb4e26c1320f961a9332e7f73e08ae8..f4efafdf5b1028755cda4e35453c61b85aab6382 100644 (file)
--- a/deal.II/source/grid/tria_boundary.cc
+++ b/deal.II/source/grid/tria_boundary.cc
@@ -44,6 +44,15 @@ get_new_point_on_quad (const typename Triangulation<dim, spacedim>::quad_iterato
   return Point<spacedim>();
 }
 
+template <int dim, int spacedim>
+Point<spacedim>
+Boundary<dim, spacedim>::
+get_new_point (const std::vector<Point<spacedim> > &,
+              const std::vector<double> &) const
+{
+  Assert (false, ExcPureFunctionCalled());
+  return Point<spacedim>();
+}
 
 
 template <int dim, int spacedim>