From: heltai Date: Sun, 24 Nov 2013 16:58:55 +0000 (+0000) Subject: Added some include files. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1181ef10f01e5dd6d567d7da61e9b79e300d8f38;p=dealii-svn.git 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 4638b1d31a..36b118cceb 100644 --- a/deal.II/include/deal.II/grid/manifold.h +++ b/deal.II/include/deal.II/grid/manifold.h @@ -23,7 +23,6 @@ #include #include #include -#include 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 77354b8bab..b0e5a447d4 100644 --- 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 #include #include +#include +#include #include #include @@ -1980,8 +1982,9 @@ TriaAccessor::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 *> */ /* (&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 0a94641d9c..e979820df3 100644 --- a/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/source/grid/tria_accessor.cc @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include diff --git a/deal.II/source/grid/tria_boundary.cc b/deal.II/source/grid/tria_boundary.cc index 65b3bafe7b..f4efafdf5b 100644 --- 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::quad_iterato return Point(); } +template +Point +Boundary:: +get_new_point (const std::vector > &, + const std::vector &) const +{ + Assert (false, ExcPureFunctionCalled()); + return Point(); +} template