From 85cb29a584c1d710aa69f5aab93072dd5cd86874 Mon Sep 17 00:00:00 2001 From: bangerth Date: Wed, 13 Nov 2013 16:40:04 +0000 Subject: [PATCH] Provide default constructor for CellData to fix testsuite failures with Intel ICC 14. git-svn-id: https://svn.dealii.org/trunk@31641 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/news/changes.h | 7 +++++++ deal.II/include/deal.II/grid/tria.h | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index bdda6304c9..b5997b9a33 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -211,6 +211,13 @@ inconvenience this causes.

Specific improvements

    +
  1. 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. +
    + (Wolfgang Bangerth, 2013/11/13) +
  2. +
  3. New: There is now a framework for coloring graphs, with functions in namespace GraphColoring.
    diff --git a/deal.II/include/deal.II/grid/tria.h b/deal.II/include/deal.II/grid/tria.h index b478da2009..b6153f7abe 100644 --- a/deal.II/include/deal.II/grid/tria.h +++ b/deal.II/include/deal.II/grid/tria.h @@ -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 +inline +CellData::CellData () +{ + for (unsigned int i=0; i::vertices_per_cell; ++i) + vertices[i] = numbers::invalid_unsigned_int; + + material_id = 0; +} + + + namespace internal { namespace Triangulation -- 2.39.5