From 78894858be41ca72c8e48951bad13eaac25de09c Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 4 Dec 2006 16:29:21 +0000 Subject: [PATCH] Do the same as in hp_dof_levels.cc: move all the functions to the .all_dimensions.cc file, since they will always be needed and since they would otherwise create linker errors when linking 2d and 3d together. git-svn-id: https://svn.dealii.org/trunk@14219 0785d39b-7218-0410-832d-ea1e28bc413d --- .../source/dofs/dof_levels.all_dimensions.cc | 28 +++++++++- deal.II/deal.II/source/dofs/dof_levels.cc | 52 ------------------- 2 files changed, 27 insertions(+), 53 deletions(-) delete mode 100644 deal.II/deal.II/source/dofs/dof_levels.cc diff --git a/deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc b/deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc index 1767ec8ba8..6f30abf737 100644 --- a/deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc +++ b/deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc @@ -12,7 +12,6 @@ //--------------------------------------------------------------------------- -#include #include #include @@ -29,6 +28,33 @@ namespace internal return MemoryConsumption::memory_consumption (cell_dof_indices_cache); } + + + unsigned int + DoFLevel<1>::memory_consumption () const + { + return (DoFLevel<0>::memory_consumption () + + MemoryConsumption::memory_consumption (lines)); + } + + + + unsigned int + DoFLevel<2>::memory_consumption () const + { + return (DoFLevel<0>::memory_consumption () + + MemoryConsumption::memory_consumption (quads)); + } + + + + unsigned int + DoFLevel<3>::memory_consumption () const + { + return (DoFLevel<0>::memory_consumption () + + MemoryConsumption::memory_consumption (hexes)); + } + } } diff --git a/deal.II/deal.II/source/dofs/dof_levels.cc b/deal.II/deal.II/source/dofs/dof_levels.cc deleted file mode 100644 index 3e273ccd21..0000000000 --- a/deal.II/deal.II/source/dofs/dof_levels.cc +++ /dev/null @@ -1,52 +0,0 @@ - - -#include -#include -#include - -DEAL_II_NAMESPACE_OPEN - - -namespace internal -{ - namespace DoFHandler - { - -#if deal_II_dimension == 1 - - unsigned int - DoFLevel<1>::memory_consumption () const - { - return (DoFLevel<0>::memory_consumption () + - MemoryConsumption::memory_consumption (lines)); - } - -#endif - -#if deal_II_dimension == 2 - - unsigned int - DoFLevel<2>::memory_consumption () const - { - return (DoFLevel<0>::memory_consumption () + - MemoryConsumption::memory_consumption (quads)); - } - -#endif - -#if deal_II_dimension == 3 - - unsigned int - DoFLevel<3>::memory_consumption () const - { - return (DoFLevel<0>::memory_consumption () + - MemoryConsumption::memory_consumption (hexes)); - } - -#endif - - } - -} - -DEAL_II_NAMESPACE_CLOSE -- 2.39.5