From 078f1717bef3f2f3e570083dd3b929afa42c1dee Mon Sep 17 00:00:00 2001 From: heltai Date: Wed, 21 Aug 2013 14:28:40 +0000 Subject: [PATCH] Fixed two tiny bugs in tria to deal with flat manifolds. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@30372 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-1/CMakeLists.txt | 2 +- deal.II/source/grid/tria.cc | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/deal.II/examples/step-1/CMakeLists.txt b/deal.II/examples/step-1/CMakeLists.txt index 428fc65ec9..72d4c9aa0d 100644 --- a/deal.II/examples/step-1/CMakeLists.txt +++ b/deal.II/examples/step-1/CMakeLists.txt @@ -3,7 +3,7 @@ ## # Set the name of the project and target: -SET(TARGET "step-1") +SET(TARGET "mytest") # Declare all source files the target consists of: SET(TARGET_SRC diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc index 9fc1ae83ed..1aa9eda828 100644 --- a/deal.II/source/grid/tria.cc +++ b/deal.II/source/grid/tria.cc @@ -93,7 +93,7 @@ namespace { sp.resize(2); wp.resize(2); sp[0] = obj->vertex(0); wp[0] = .5; - sp[1] = obj->vertex(1); wp[0] = .5; + sp[1] = obj->vertex(1); wp[1] = .5; break; case 2: sp.resize(8); @@ -4108,11 +4108,11 @@ namespace internal // connection between the new // points on this face and on the // opposite face - std::vector > sp(2); + std::vector > ps(2); std::vector ws(2, .5); - sp[0] = cell->face(boundary_face) + ps[0] = cell->face(boundary_face) ->child(0)->vertex(1); - sp[1] = cell->face(GeometryInfo + ps[1] = cell->face(GeometryInfo ::opposite_face[boundary_face]) ->child(0)->vertex(1); @@ -9751,9 +9751,6 @@ template const Manifold & Triangulation::get_manifold (const types::manifold_id m_number) const { - Assert(m_number < numbers::invalid_manifold_id, - ExcIndexRange(m_number,0,numbers::invalid_manifold_id)); - //look, if there is a boundary stored at //boundary_id number. typename std::map, Triangulation > >::const_iterator it -- 2.39.5