From 49c1e69bac45ba1157f518b8e142623e81eb5cb6 Mon Sep 17 00:00:00 2001 From: kanschat Date: Thu, 4 Oct 2007 00:19:32 +0000 Subject: [PATCH] number of blocks in FESystem should be just the number of base elements times their multiplicity git-svn-id: https://svn.dealii.org/trunk@15263 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/fe_system.cc | 6 +++--- deal.II/deal.II/source/fe/fe_tools.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index ac3339edc1..4c01c2037d 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -1750,7 +1750,7 @@ FESystem::multiply_dof_numbers (const FiniteElementData &fe_data, fe_data.n_components() * N, fe_data.tensor_degree(), fe_data.conforming_space, - fe_data.n_blocks() * N); + N); } @@ -2414,7 +2414,7 @@ FESystem::multiply_dof_numbers (const FiniteElementData &fe1, degree, typename FiniteElementData::Conformity(fe1.conforming_space & fe2.conforming_space), - fe1.n_blocks() * N1 + fe2.n_blocks() * N2); + N1 + N2); } @@ -2453,7 +2453,7 @@ FESystem::multiply_dof_numbers (const FiniteElementData &fe1, typename FiniteElementData::Conformity(fe1.conforming_space & fe2.conforming_space & fe3.conforming_space), - fe1.n_blocks() * N1 + fe2.n_blocks() * N2 + fe3.n_blocks() * N3); + N1 + N2 + N3); } diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index 7408578ba6..668b0b1ed4 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -328,7 +328,7 @@ void FETools::compute_block_renumbering ( k += element.base_element(b).n_dofs_per_cell(); } Assert (i == element.n_blocks(), ExcInternalError()); - +//TODO:[GK] This does not work for a single RT for (unsigned int i=0;i -- 2.39.5