From 935e1b728d1d0f99cc127817f69ff839a4c5b843 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sun, 27 Aug 2017 18:41:42 -0400 Subject: [PATCH] remove unused static variables in FE_DGP* Unused static variables that confuse MSVC, so get rid of them. --- include/deal.II/fe/fe_dgp.h | 55 ----------------- include/deal.II/fe/fe_dgp_nonparametric.h | 75 ----------------------- 2 files changed, 130 deletions(-) diff --git a/include/deal.II/fe/fe_dgp.h b/include/deal.II/fe/fe_dgp.h index 4015fe293c..277a0999dc 100644 --- a/include/deal.II/fe/fe_dgp.h +++ b/include/deal.II/fe/fe_dgp.h @@ -446,25 +446,6 @@ public: virtual std::size_t memory_consumption () const; - /** - * Declare a nested class which will hold static definitions of various - * matrices such as constraint and embedding matrices. The definition of the - * various static fields are in the files fe_dgp_[123]d.cc in the - * source directory. - */ - struct Matrices - { - /** - * As @p embedding but for projection matrices. - */ - static const double *const projection_matrices[][GeometryInfo::max_children_per_cell]; - - /** - * As @p n_embedding_matrices but for projection matrices. - */ - static const unsigned int n_projection_matrices; - }; - /** * Return a list of constant modes of the element. For this element, the * first entry is true, all other are false. @@ -488,42 +469,6 @@ private: }; /* @} */ -#ifndef DOXYGEN - - -// declaration of explicit specializations of member variables -template <> -const double *const FE_DGP<1>::Matrices::projection_matrices[][GeometryInfo<1>::max_children_per_cell]; - -template <> -const unsigned int FE_DGP<1>::Matrices::n_projection_matrices; - -template <> -const double *const FE_DGP<2>::Matrices::projection_matrices[][GeometryInfo<2>::max_children_per_cell]; - -template <> -const unsigned int FE_DGP<2>::Matrices::n_projection_matrices; - -template <> -const double *const FE_DGP<3>::Matrices::projection_matrices[][GeometryInfo<3>::max_children_per_cell]; - -template <> -const unsigned int FE_DGP<3>::Matrices::n_projection_matrices; - -//codimension 1 -template <> -const double *const FE_DGP<1,2>::Matrices::projection_matrices[][GeometryInfo<1>::max_children_per_cell]; - -template <> -const unsigned int FE_DGP<1,2>::Matrices::n_projection_matrices; - -template <> -const double *const FE_DGP<2,3>::Matrices::projection_matrices[][GeometryInfo<2>::max_children_per_cell]; - -template <> -const unsigned int FE_DGP<2,3>::Matrices::n_projection_matrices; - -#endif // DOXYGEN DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/fe/fe_dgp_nonparametric.h b/include/deal.II/fe/fe_dgp_nonparametric.h index d0ca8b12d2..3017d3cc16 100644 --- a/include/deal.II/fe/fe_dgp_nonparametric.h +++ b/include/deal.II/fe/fe_dgp_nonparametric.h @@ -501,40 +501,6 @@ public: */ virtual std::size_t memory_consumption () const; - -private: - /** - * Declare a nested class which will hold static definitions of various - * matrices such as constraint and embedding matrices. The definition of the - * various static fields are in the files fe_dgp_[123]d.cc in the - * source directory. - */ - struct Matrices - { - /** - * Pointers to the embedding matrices, one for each polynomial degree - * starting from constant elements - */ - static const double *const embedding[][GeometryInfo::max_children_per_cell]; - - /** - * Number of elements (first index) the above field has. Equals the - * highest polynomial degree plus one for which the embedding matrices - * have been computed. - */ - static const unsigned int n_embedding_matrices; - - /** - * As @p embedding but for projection matrices. - */ - static const double *const projection_matrices[][GeometryInfo::max_children_per_cell]; - - /** - * As @p n_embedding_matrices but for projection matrices. - */ - static const unsigned int n_projection_matrices; - }; - protected: /** @@ -607,47 +573,6 @@ private: /*@}*/ -#ifndef DOXYGEN - -// declaration of explicit specializations of member variables -template <> -const double *const FE_DGPNonparametric<1,1>::Matrices::embedding[][GeometryInfo<1>::max_children_per_cell]; - -template <> -const unsigned int FE_DGPNonparametric<1,1>::Matrices::n_embedding_matrices; - -template <> -const double *const FE_DGPNonparametric<1,1>::Matrices::projection_matrices[][GeometryInfo<1>::max_children_per_cell]; - -template <> -const unsigned int FE_DGPNonparametric<1,1>::Matrices::n_projection_matrices; - -template <> -const double *const FE_DGPNonparametric<2,2>::Matrices::embedding[][GeometryInfo<2>::max_children_per_cell]; - -template <> -const unsigned int FE_DGPNonparametric<2,2>::Matrices::n_embedding_matrices; - -template <> -const double *const FE_DGPNonparametric<2,2>::Matrices::projection_matrices[][GeometryInfo<2>::max_children_per_cell]; - -template <> -const unsigned int FE_DGPNonparametric<2,2>::Matrices::n_projection_matrices; - -template <> -const double *const FE_DGPNonparametric<3,3>::Matrices::embedding[][GeometryInfo<3>::max_children_per_cell]; - -template <> -const unsigned int FE_DGPNonparametric<3,3>::Matrices::n_embedding_matrices; - -template <> -const double *const FE_DGPNonparametric<3,3>::Matrices::projection_matrices[][GeometryInfo<3>::max_children_per_cell]; - -template <> -const unsigned int FE_DGPNonparametric<3,3>::Matrices::n_projection_matrices; - -#endif // DOXYGEN - DEAL_II_NAMESPACE_CLOSE #endif -- 2.39.5