]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fixed two tiny bugs in tria to deal with flat manifolds.
authorheltai <heltai@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 21 Aug 2013 14:28:40 +0000 (14:28 +0000)
committerheltai <heltai@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 21 Aug 2013 14:28:40 +0000 (14:28 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@30372 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/examples/step-1/CMakeLists.txt
deal.II/source/grid/tria.cc

index 428fc65ec9362bdcbc1e52023d30a6646215b385..72d4c9aa0d6a6be29540c98006dfabf7d0015cd9 100644 (file)
@@ -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
index 9fc1ae83edc1cf78dfcc783a14445b8a4bc6934c..1aa9eda8285d55be68d7b995596be1243c4f6333 100644 (file)
@@ -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<Point<spacedim> > sp(2);
+                       std::vector<Point<spacedim> > ps(2);
                        std::vector<double> ws(2, .5);
-                       sp[0] = cell->face(boundary_face)
+                       ps[0] = cell->face(boundary_face)
                                ->child(0)->vertex(1);
-                       sp[1] = cell->face(GeometryInfo<dim>
+                       ps[1] = cell->face(GeometryInfo<dim>
                                           ::opposite_face[boundary_face])
                                ->child(0)->vertex(1);
                        
@@ -9751,9 +9751,6 @@ template <int dim, int spacedim>
 const Manifold<spacedim> &
 Triangulation<dim, spacedim>::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<types::manifold_id, SmartPointer<const Manifold<spacedim>, Triangulation<dim, spacedim> > >::const_iterator it

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.