From: Guido Kanschat Date: Fri, 31 Mar 2006 08:16:30 +0000 (+0000) Subject: do not use components; need more tests X-Git-Tag: v8.0.0~11932 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67c962525c9d30d621145072a67ada38709b03f0;p=dealii.git do not use components; need more tests git-svn-id: https://svn.dealii.org/trunk@12791 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index ca7ff7755c..68a2751c7f 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -506,7 +506,7 @@ compute_face_row_length_matrix( { const unsigned int jblock = nfe.first_block_of_base(base) + mult; for (unsigned int i=0;i1) ? fe.dofs_per_cell - (DH::dimension-1) * fe.dofs_per_face - : fe.dofs_per_cell - GeometryInfo::faces_per_cell * fe.dofs_per_face; + : fe.dofs_per_cell - GeometryInfo::faces_per_cell * fe.dofs_per_face; while (i < fe.first_quad_index) row_lengths[cell_indices[i++]] += increment; @@ -815,8 +816,8 @@ DoFTools::compute_row_length_vector( const Table<2,Coupling>& couplings, const Table<2,Coupling>& flux_couplings) { - Assert (row_lengths.size() == dofs.n_dofs(), - ExcDimensionMismatch(row_lengths.size(), dofs.n_dofs())); + Assert (row_lengths.size() == dofs.get_fe().n_blocks(), + ExcDimensionMismatch(row_lengths.size(), dofs.get_fe().n_blocks())); // Function starts here by // resetting the counters. @@ -863,20 +864,6 @@ DoFTools::compute_row_length_vector( { const FiniteElement& fe = cell->get_fe(); const unsigned int fe_index = cell->active_fe_index(); - - Assert (couplings.n_rows()==fe.n_components(), - ExcDimensionMismatch(couplings.n_rows(), fe.n_components())); - Assert (couplings.n_cols()==fe.n_components(), - ExcDimensionMismatch(couplings.n_cols(), fe.n_components())); - if (flux_couplings.n_rows() != 0) - Assert (flux_couplings.n_rows()==fe.n_components(), - ExcDimensionMismatch(flux_couplings.n_rows(), - fe.n_components())); - if (flux_couplings.n_rows() != 0) - Assert (flux_couplings.n_cols()==fe.n_components(), - ExcDimensionMismatch(flux_couplings.n_cols(), - fe.n_components())); - cell_couplings.reinit(fe.dofs_per_cell, fe.n_blocks()); cell_indices.resize(fe.dofs_per_cell); cell->get_dof_indices(cell_indices); @@ -4033,11 +4020,11 @@ DoFTools::compute_row_length_vector( std::vector >&, const Table<2,Coupling>& couplings, const Table<2,Coupling>& flux_couplings); -template void -DoFTools::compute_row_length_vector( - const hp::DoFHandler&, - std::vector >&, - const Table<2,Coupling>& couplings, const Table<2,Coupling>& flux_couplings); +// template void +// DoFTools::compute_row_length_vector( +// const hp::DoFHandler&, +// std::vector >&, +// const Table<2,Coupling>& couplings, const Table<2,Coupling>& flux_couplings); template void DoFTools::make_sparsity_pattern,SparsityPattern>