From: Wolfgang Bangerth Date: Tue, 19 Dec 2000 14:52:24 +0000 (+0000) Subject: Define some functions only for the dimension we are presently in. This X-Git-Tag: v8.0.0~19867 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fa2e068278c6b651d843e6e577dcf7038cced5f;p=dealii.git Define some functions only for the dimension we are presently in. This avoid trouble when linking with static libs. git-svn-id: https://svn.dealii.org/trunk@3576 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index fc21e14a58..5ad1391713 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -3476,72 +3476,55 @@ unsigned int Triangulation::n_active_quads (const unsigned int level) const #if deal_II_dimension < 3 -template <> -unsigned int Triangulation<1>::n_hexs () const { +template +unsigned int Triangulation::n_hexs () const +{ Assert (false, ExcFunctionNotUseful()); return 0; }; -template <> -unsigned int Triangulation<1>::n_hexs (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); - return 0; -}; - -template <> -unsigned int Triangulation<1>::n_active_hexs () const { +template +unsigned int Triangulation::n_hexs (const unsigned int) const +{ Assert (false, ExcFunctionNotUseful()); return 0; }; -template <> -unsigned int Triangulation<1>::n_active_hexs (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); - return 0; -}; - -template <> -unsigned int Triangulation<2>::n_hexs () const { +template +unsigned int Triangulation::n_active_hexs () const +{ Assert (false, ExcFunctionNotUseful()); return 0; }; -template <> -unsigned int Triangulation<2>::n_hexs (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); - return 0; -}; - -template <> -unsigned int Triangulation<2>::n_active_hexs () const { +template +unsigned int Triangulation::n_active_hexs (const unsigned int) const +{ Assert (false, ExcFunctionNotUseful()); return 0; }; -template <> -unsigned int Triangulation<2>::n_active_hexs (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); - return 0; -}; - -#endif +#else template -unsigned int Triangulation::n_hexs () const { +unsigned int Triangulation::n_hexs () const +{ return number_cache.n_hexes; }; + template -unsigned int Triangulation::n_hexs (const unsigned int level) const { +unsigned int Triangulation::n_hexs (const unsigned int level) const +{ Assert (level < number_cache.n_hexes_level.size(), ExcIndexRange (level, 0, number_cache.n_hexes_level.size())); @@ -3549,14 +3532,18 @@ unsigned int Triangulation::n_hexs (const unsigned int level) const { }; + template -unsigned int Triangulation::n_active_hexs () const { +unsigned int Triangulation::n_active_hexs () const +{ return number_cache.n_active_hexes; }; + template -unsigned int Triangulation::n_active_hexs (const unsigned int level) const { +unsigned int Triangulation::n_active_hexs (const unsigned int level) const +{ Assert (level < number_cache.n_hexes_level.size(), ExcIndexRange (level, 0, number_cache.n_hexes_level.size())); @@ -3564,8 +3551,12 @@ unsigned int Triangulation::n_active_hexs (const unsigned int level) const }; +#endif + + template -unsigned int Triangulation::n_levels () const { +unsigned int Triangulation::n_levels () const +{ if (levels.size() == 0) return 0; // check whether there are