From: heltai Date: Sun, 17 Nov 2013 00:16:53 +0000 (+0000) Subject: Merged CellData() constructor with trunk version X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca74bf5ae079c2bdf27f8a943e08288b42dc4b1a;p=dealii-svn.git Merged CellData() constructor with trunk version git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@31685 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/grid/tria.h b/deal.II/include/deal.II/grid/tria.h index a15b9b0e26..aad2764a57 100644 --- a/deal.II/include/deal.II/grid/tria.h +++ b/deal.II/include/deal.II/grid/tria.h @@ -100,11 +100,6 @@ template class MGDoFHandler; template struct CellData { - /** Default constructor. Set - members to meaningful default - values. */ - CellData(); - /** * Indices of the vertices of * this cell. @@ -3334,6 +3329,10 @@ CellData::CellData () vertices[i] = numbers::invalid_unsigned_int; material_id = 0; + // Set the face to be interior + boundary_id = numbers::internal_face_boundary_id; + // And the manifold to be invalid + manifold_id = numbers::invalid_manifold_id; } diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc index e964f71b9a..4d944f8ee8 100644 --- a/deal.II/source/grid/tria.cc +++ b/deal.II/source/grid/tria.cc @@ -131,14 +131,14 @@ namespace { } -template -CellData::CellData() -{ - // Set the face to be interior - boundary_id = numbers::internal_face_boundary_id; - // And the manifold to be invalid - manifold_id = numbers::invalid_manifold_id; -} +// template +// CellData::CellData() +// { +// // Set the face to be interior +// boundary_id = numbers::internal_face_boundary_id; +// // And the manifold to be invalid +// manifold_id = numbers::invalid_manifold_id; +// } bool