From: Bruno Turcksin Date: Mon, 4 Mar 2013 16:58:09 +0000 (+0000) Subject: Merge from mainline. X-Git-Tag: v8.0.0~316^2~144 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37cdfed4c59ec1fdc272092abbb28e8c4e3846d5;p=dealii.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28732 0785d39b-7218-0410-832d-ea1e28bc413d --- 37cdfed4c59ec1fdc272092abbb28e8c4e3846d5 diff --cc deal.II/include/deal.II/lac/relaxation_block.templates.h index 83fa7e42ca,d326a6aac0..e4763ef234 --- a/deal.II/include/deal.II/lac/relaxation_block.templates.h +++ b/deal.II/include/deal.II/lac/relaxation_block.templates.h @@@ -215,9 -215,15 +215,15 @@@ RelaxationBlock::d } // Apply inverse diagonal this->inverse_vmult(block, x_cell, b_cell); + #ifdef DEBUG + for (unsigned int i=0;iblock_list.begin(block); - for (unsigned int row_cell=0; row_cellcolumn()) = prev(row->column()) + additional_data->relaxation * x_cell(row_cell); } } diff --cc deal.II/include/deal.II/meshworker/simple.h index 89d62e159c,27aa1fe81a..963b7a1409 --- a/deal.II/include/deal.II/meshworker/simple.h +++ b/deal.II/include/deal.II/meshworker/simple.h @@@ -402,12 -354,11 +354,11 @@@ namespace MeshWorke */ void assemble(MATRIX &G, const FullMatrix &M, - const std::vector &i1, - const std::vector &i2); + const std::vector &i1, + const std::vector &i2); /** - * Assemble a single matrix - * into a global matrix. + * Assemble a single matrix into a global matrix. */ void assemble(MATRIX &G, const FullMatrix &M, @@@ -422,12 -372,11 +372,11 @@@ void assemble_up(MATRIX &G, const FullMatrix &M, - const std::vector &i1, - const std::vector &i2, + const std::vector &i1, + const std::vector &i2, const unsigned int level = numbers::invalid_unsigned_int); /** - * Assemble a single matrix - * into a global matrix. + * Assemble a single matrix into a global matrix. */ void assemble_down(MATRIX &G,