From b5623cbd50fd0f5f51a9379cb2f1dca01d470b5e Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 18 Feb 2011 17:24:55 +0000 Subject: [PATCH] Add an assertion. git-svn-id: https://svn.dealii.org/trunk@23395 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/fe_system.cc | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/deal.II/source/fe/fe_system.cc b/deal.II/source/fe/fe_system.cc index 6a05213091..61a0a48992 100644 --- a/deal.II/source/fe/fe_system.cc +++ b/deal.II/source/fe/fe_system.cc @@ -24,6 +24,7 @@ #include + DEAL_II_NAMESPACE_OPEN /* ----------------------- FESystem::InternalData ------------------- */ @@ -235,7 +236,7 @@ FESystem::FESystem (const FiniteElement &fe1, fe4 ,n4)), base_elements(4) { - base_elements[0] = ElementPair(fe1.clone(), n1); + base_elements[0] = ElementPair(fe1.clone(), n1); base_elements[0].first->subscribe (typeid(*this).name()); base_elements[1] = ElementPair(fe2.clone(), n2); base_elements[1].first->subscribe (typeid(*this).name()); @@ -277,7 +278,7 @@ FESystem::FESystem (const FiniteElement &fe1, fe5, n5)), base_elements(5) { - base_elements[0] = ElementPair(fe1.clone(), n1); + base_elements[0] = ElementPair(fe1.clone(), n1); base_elements[0].first->subscribe (typeid(*this).name()); base_elements[1] = ElementPair(fe2.clone(), n2); base_elements[1].first->subscribe (typeid(*this).name()); @@ -718,6 +719,7 @@ FESystem::get_data (const UpdateFlags flags_, typename FiniteElement::InternalDataBase *base_fe_data = dynamic_cast::InternalDataBase *> (base_fe_data_base); + Assert (base_fe_data != 0, ExcInternalError()); data->set_fe_data(base_no, base_fe_data); @@ -2633,7 +2635,7 @@ FESystem::multiply_dof_numbers (const FiniteElementData &fe1, // degree is the maximal degree of the components const unsigned int degree = std::max(std::max (std::max(fe1.tensor_degree(),fe2.tensor_degree()),fe3.tensor_degree()), fe4.tensor_degree()); - + return FiniteElementData ( dpo, fe1.n_components() * N1 + fe2.n_components() * N2 + fe3.n_components() * N3 + @@ -2684,7 +2686,7 @@ FESystem::multiply_dof_numbers (const FiniteElementData &fe1, // degree is the maximal degree of the components const unsigned int degree = std::max(std::max(std::max (std::max(fe1.tensor_degree(),fe2.tensor_degree()),fe3.tensor_degree()), fe4.tensor_degree()), fe5.tensor_degree()); - + return FiniteElementData ( dpo, fe1.n_components() * N1 + fe2.n_components() * N2 + fe3.n_components() * N3 + @@ -2770,7 +2772,7 @@ FESystem::compute_restriction_is_additive_flags (const FiniteEleme const FiniteElement &fe3, const unsigned int N3, const FiniteElement &fe4, - const unsigned int N4) + const unsigned int N4) { std::vector*> fe_list; std::vector multiplicities; @@ -2786,7 +2788,7 @@ FESystem::compute_restriction_is_additive_flags (const FiniteEleme fe_list.push_back (&fe4); multiplicities.push_back (N4); - + return compute_restriction_is_additive_flags (fe_list, multiplicities); } @@ -2802,7 +2804,7 @@ FESystem::compute_restriction_is_additive_flags (const FiniteEleme const FiniteElement &fe4, const unsigned int N4, const FiniteElement &fe5, - const unsigned int N5) + const unsigned int N5) { std::vector*> fe_list; std::vector multiplicities; @@ -2818,7 +2820,7 @@ FESystem::compute_restriction_is_additive_flags (const FiniteEleme fe_list.push_back (&fe4); multiplicities.push_back (N4); - + fe_list.push_back (&fe5); multiplicities.push_back (N5); return compute_restriction_is_additive_flags (fe_list, multiplicities); @@ -3045,7 +3047,7 @@ FESystem::compute_nonzero_components (const FiniteElement::compute_nonzero_components (const FiniteElement