From 4a990000a5b74d139f83f682c52b9812c5ce1cee Mon Sep 17 00:00:00 2001 From: hartmann Date: Wed, 14 Jun 2006 09:05:39 +0000 Subject: [PATCH] Add some missing #if. git-svn-id: https://svn.dealii.org/trunk@13239 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_faces.cc | 10 ++++++++++ deal.II/deal.II/source/dofs/hp_dof_faces.cc | 12 ++++++++++++ deal.II/deal.II/source/grid/tria_faces.cc | 12 ++++++++++++ 3 files changed, 34 insertions(+) diff --git a/deal.II/deal.II/source/dofs/dof_faces.cc b/deal.II/deal.II/source/dofs/dof_faces.cc index 40497b06da..cf2031c349 100644 --- a/deal.II/deal.II/source/dofs/dof_faces.cc +++ b/deal.II/deal.II/source/dofs/dof_faces.cc @@ -22,12 +22,17 @@ namespace internal namespace DoFHandler { +#if deal_II_dimension == 1 + unsigned int DoFFaces<1>::memory_consumption () const { return 0; } +#endif + +#if deal_II_dimension == 2 unsigned int DoFFaces<2>::memory_consumption () const @@ -35,6 +40,9 @@ namespace internal return MemoryConsumption::memory_consumption (lines); } +#endif + +#if deal_II_dimension == 3 unsigned int DoFFaces<3>::memory_consumption () const @@ -42,6 +50,8 @@ namespace internal return (MemoryConsumption::memory_consumption (quads) + MemoryConsumption::memory_consumption (lines) ); } + +#endif } } diff --git a/deal.II/deal.II/source/dofs/hp_dof_faces.cc b/deal.II/deal.II/source/dofs/hp_dof_faces.cc index b360130bfb..d4aaf05d11 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_faces.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_faces.cc @@ -20,25 +20,37 @@ namespace internal { namespace hp { + +#if deal_II_dimension == 1 + unsigned int DoFFaces<1>::memory_consumption () const { return 0; } +#endif +#if deal_II_dimension == 2 + unsigned int DoFFaces<2>::memory_consumption () const { return MemoryConsumption::memory_consumption (lines); } +#endif +#if deal_II_dimension == 3 + unsigned int DoFFaces<3>::memory_consumption () const { return (MemoryConsumption::memory_consumption (quads) + MemoryConsumption::memory_consumption (quads) ); } + +#endif + } } diff --git a/deal.II/deal.II/source/grid/tria_faces.cc b/deal.II/deal.II/source/grid/tria_faces.cc index 3ff66a6404..c9292bd062 100644 --- a/deal.II/deal.II/source/grid/tria_faces.cc +++ b/deal.II/deal.II/source/grid/tria_faces.cc @@ -19,12 +19,18 @@ namespace internal { namespace Triangulation { + +#if deal_II_dimension == 1 + unsigned int TriaFaces<1>::memory_consumption () const { return 0; } +#endif + +#if deal_II_dimension == 2 unsigned int TriaFaces<2>::memory_consumption () const @@ -32,6 +38,9 @@ namespace internal return MemoryConsumption::memory_consumption (lines); } +#endif + +#if deal_II_dimension == 3 unsigned int TriaFaces<3>::memory_consumption () const @@ -39,5 +48,8 @@ namespace internal return (MemoryConsumption::memory_consumption (quads) + MemoryConsumption::memory_consumption (lines) ); } + +#endif + } } -- 2.39.5