]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Provide default constructor for CellData to fix testsuite failures with Intel ICC 14.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 13 Nov 2013 16:40:04 +0000 (16:40 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 13 Nov 2013 16:40:04 +0000 (16:40 +0000)
git-svn-id: https://svn.dealii.org/trunk@31641 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/news/changes.h
deal.II/include/deal.II/grid/tria.h

index bdda6304c9266b8c8bc70f0b318fd22f11b75a9e..b5997b9a333ebc095760e113f6fb0f6380d3c895 100644 (file)
@@ -211,6 +211,13 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
+  <li> Fixed: The CellData class now has a default constructor that
+  sets the material and boundary indicators to zero. This fixes certain
+  internal errors with the Intel ICC compiler.
+  <br>
+  (Wolfgang Bangerth, 2013/11/13)
+  </li>
+
   <li> New: There is now a framework for coloring graphs, with functions
   in namespace GraphColoring.
   <br>
index b478da200952aa36a33704af2ba3d699cfe518ed..b6153f7abee7b7e9496f82f8520ccb38e01dfb7e 100644 (file)
@@ -120,6 +120,12 @@ struct CellData
     types::boundary_id boundary_id;
     types::material_id material_id;
   };
+
+  /**
+   * Default constructor. Sets the vertex indices to invalid values and the boundary or material
+   * id the default value (zero).
+   */
+  CellData ();
 };
 
 
@@ -3641,6 +3647,19 @@ private:
 
 #ifndef DOXYGEN
 
+
+template <int structdim>
+inline
+CellData<structdim>::CellData ()
+{
+  for (unsigned int i=0; i<GeometryInfo<structdim>::vertices_per_cell; ++i)
+    vertices[i] = numbers::invalid_unsigned_int;
+
+  material_id = 0;
+}
+
+
+
 namespace internal
 {
   namespace Triangulation

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.