Don't forget to use explicit specialization syntax.

git-svn-id: https://svn.dealii.org/trunk@4801 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/source/fe/fe_dgq_1d.cc b/deal.II/deal.II/source/fe/fe_dgq_1d.cc
index 1c54afdc0f8178447af1f333cb56d4d0d091dad1..67fe871c8af2bf3ef5c959d3095a52d33651f88a 100644 (file)
--- a/deal.II/deal.II/source/fe/fe_dgq_1d.cc
+++ b/deal.II/deal.II/source/fe/fe_dgq_1d.cc
@@ -128,6 +128,7 @@ namespace FE_DGQ_1d
 
 
 
+template <>
 const double * const FE_DGQ<1>::Matrices::embedding[] =
 {      
       FE_DGQ_1d::dgq0_into_dgq0_refined,
@@ -138,6 +139,8 @@ const double * const FE_DGQ<1>::Matrices::embedding[] =
 };
 
 
+
+template <>
 const unsigned int FE_DGQ<1>::Matrices::n_embedding_matrices
   = sizeof(FE_DGQ<1>::Matrices::embedding) /
     sizeof(FE_DGQ<1>::Matrices::embedding[0]);
@@ -145,6 +148,7 @@ const unsigned int FE_DGQ<1>::Matrices::n_embedding_matrices
 
 
 
+template <>
 const double * const FE_DGQ<1>::Matrices::projection_matrices[] =
 {
       FE_DGQ_1d::dgq0_refined_onto_dgq0,
@@ -158,6 +162,8 @@ const double * const FE_DGQ<1>::Matrices::projection_matrices[] =
 };
 
 
+
+template <>
 const unsigned int FE_DGQ<1>::Matrices::n_projection_matrices
   = sizeof(FE_DGQ<1>::Matrices::projection_matrices) /
     sizeof(FE_DGQ<1>::Matrices::projection_matrices[0]);

diff --git a/deal.II/deal.II/source/fe/fe_dgq_3d.cc b/deal.II/deal.II/source/fe/fe_dgq_3d.cc
index 07ae49c5cb0828972b1bb57b9226294cc5892c49..31b33fc6624bab2416ecea639a2636a1749b04ec 100644 (file)
--- a/deal.II/deal.II/source/fe/fe_dgq_3d.cc
+++ b/deal.II/deal.II/source/fe/fe_dgq_3d.cc
@@ -387,6 +387,7 @@ static const double dgq4_refined_onto_dgq4[] =
 };
 
 
+template <>
 const double * const FE_DGQ<3>::Matrices::embedding[] =
 {
       FE_DGQ_3d::dgq0_into_dgq0_refined,
@@ -396,12 +397,15 @@ const double * const FE_DGQ<3>::Matrices::embedding[] =
 };
 
 
+
+template <>
 const unsigned int FE_DGQ<3>::Matrices::n_embedding_matrices
   = sizeof(FE_DGQ<3>::Matrices::embedding) /
     sizeof(FE_DGQ<3>::Matrices::embedding[0]);
 
 
 
+template <>
 const double * const FE_DGQ<3>::Matrices::projection_matrices[] =
 {
       FE_DGQ_3d::dgq0_refined_onto_dgq0,
@@ -411,6 +415,9 @@ const double * const FE_DGQ<3>::Matrices::projection_matrices[] =
       FE_DGQ_3d::dgq4_refined_onto_dgq4
 };
 
+
+
+template <>
 const unsigned int FE_DGQ<3>::Matrices::n_projection_matrices
   = sizeof(FE_DGQ<3>::Matrices::projection_matrices) /
     sizeof(FE_DGQ<3>::Matrices::projection_matrices[0]);

diff --git a/deal.II/deal.II/source/fe/fe_q_1d.cc b/deal.II/deal.II/source/fe/fe_q_1d.cc
index 3d8cbaa3b08f345729c49997d92b04a66e0217bb..a0015411311f5e0a4d3ee9a08b81698129948a6c 100644 (file)
--- a/deal.II/deal.II/source/fe/fe_q_1d.cc
+++ b/deal.II/deal.II/source/fe/fe_q_1d.cc
@@ -90,6 +90,7 @@ namespace FE_Q_1d
 // embedding matrices
 
 
+template <>
 const double * const
 FE_Q<1>::Matrices::embedding[][GeometryInfo<1>::children_per_cell] =
 {
@@ -99,6 +100,9 @@ FE_Q<1>::Matrices::embedding[][GeometryInfo<1>::children_per_cell] =
   {FE_Q_1d::q4_into_q4_refined_0, FE_Q_1d::q4_into_q4_refined_1},
 };
 
+
+
+template <>
 const unsigned int
 FE_Q<1>::Matrices::n_embedding_matrices
   = sizeof(FE_Q<1>::Matrices::embedding) /
@@ -107,9 +111,12 @@ FE_Q<1>::Matrices::n_embedding_matrices
 
 
 // No constraints in 1d
+template <>
 const unsigned int 
 FE_Q<1>::Matrices::n_constraint_matrices = 0;
 
+
+template <>
 const double * const
 FE_Q<1>::Matrices::constraint_matrices[] = { 0 };
 

diff --git a/deal.II/deal.II/source/fe/fe_q_3d.cc b/deal.II/deal.II/source/fe/fe_q_3d.cc
index bf96e3a55e5313834988280b453769caf2184ca2..ab62f92c3b3b85aef16e0c10c5589584822dbccb 100644 (file)
--- a/deal.II/deal.II/source/fe/fe_q_3d.cc
+++ b/deal.II/deal.II/source/fe/fe_q_3d.cc
@@ -369,6 +369,7 @@ namespace FE_Q_3d
 
 // embedding matrices
 
+template <>
 const double * const 
 FE_Q<3>::Matrices::embedding[][GeometryInfo<3>::children_per_cell] =
 {
@@ -383,6 +384,7 @@ FE_Q<3>::Matrices::embedding[][GeometryInfo<3>::children_per_cell] =
 };
 
 
+template <>
 const unsigned int
 FE_Q<3>::Matrices::n_embedding_matrices
   = sizeof(FE_Q<3>::Matrices::embedding) /
@@ -429,6 +431,9 @@ namespace FE_Q_3d
   };
 };
 
+
+
+template <>
 const double * const 
 FE_Q<3>::Matrices::constraint_matrices[] =
 {
@@ -436,6 +441,9 @@ FE_Q<3>::Matrices::constraint_matrices[] =
   FE_Q_3d::constraint_q2
 };
 
+
+
+template <>
 const unsigned int 
 FE_Q<3>::Matrices::n_constraint_matrices
   = sizeof(FE_Q<3>::Matrices::constraint_matrices) /

diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc
index 30ac922a5e4a099a678eec7644eef3e758919ba2..582866a1162f36757f48378c982f68630a9b23ae 100644 (file)
--- a/deal.II/deal.II/source/fe/mapping_q.cc
+++ b/deal.II/deal.II/source/fe/mapping_q.cc
@@ -520,8 +520,8 @@ MappingQ<3>::set_laplace_on_hex_vector(std::vector<std::vector<double> > &lohvs)
                                   // at the outer rim should be
                                   // one. check this
   for (unsigned int unit_point=0; unit_point<n_inner; ++unit_point)
-    Assert(fabs(std::accumulate(lohvs[unit_point].begin(),
-                               lohvs[unit_point].end(),0.) - 1)<1e-13,
+    Assert(std::fabs(std::accumulate(lohvs[unit_point].begin(),
+                                    lohvs[unit_point].end(),0.) - 1)<1e-13,
           ExcInternalError());
   
                                   // TEST output