From: wolf Date: Wed, 14 Jun 2006 01:57:30 +0000 (+0000) Subject: Move functions into the right file X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eadba9150bf38dd3656a6dd5c88e8bb85da915f;p=dealii-svn.git Move functions into the right file git-svn-id: https://svn.dealii.org/trunk@13237 0785d39b-7218-0410-832d-ea1e28bc413d --- 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 d32bc708ac..53a392dd30 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 @@ -28,38 +28,6 @@ namespace internal return MemoryConsumption::memory_consumption (cell_dof_indices_cache); } -#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 } } diff --git a/deal.II/deal.II/source/dofs/dof_levels.cc b/deal.II/deal.II/source/dofs/dof_levels.cc index 55cc1d76e3..9564d00d39 100644 --- a/deal.II/deal.II/source/dofs/dof_levels.cc +++ b/deal.II/deal.II/source/dofs/dof_levels.cc @@ -2,15 +2,46 @@ #include #include -#include -#include -#include +#include 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 }