]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from mainline.
authorturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 4 Mar 2013 16:58:09 +0000 (16:58 +0000)
committerturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 4 Mar 2013 16:58:09 +0000 (16:58 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28732 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/include/deal.II/fe/fe_tools.h
deal.II/include/deal.II/grid/tria.h
deal.II/include/deal.II/lac/full_matrix.templates.h
deal.II/include/deal.II/lac/relaxation_block.templates.h
deal.II/include/deal.II/meshworker/simple.h
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/fe/fe_tools.cc

Simple merge
Simple merge
index 83fa7e42ca7f1f9eff2737e324ffc4c9bcda07d8,d326a6aac09262293ecf643ffaae835bc1f4115e..e4763ef2345a7f7efcec375c738a8bdeb2cf602c
@@@ -215,9 -215,15 +215,15 @@@ RelaxationBlock<MATRIX,inverse_type>::d
              }
            // Apply inverse diagonal
            this->inverse_vmult(block, x_cell, b_cell);
+ #ifdef DEBUG
+         for (unsigned int i=0;i<x_cell.size();++i)
+           {
+             Assert(numbers::is_finite(x_cell(i)), ExcNumberNotFinite());
+           }
+ #endif
            // Store in result vector
            row=additional_data->block_list.begin(block);
 -          for (unsigned int row_cell=0; row_cell<bs; ++row_cell, ++row)
 +          for (size_type row_cell=0; row_cell<bs; ++row_cell, ++row)
              dst(row->column()) = prev(row->column()) + additional_data->relaxation * x_cell(row_cell);
          }
      }
index 89d62e159ce56522daca5d5c1c08797df1250106,27aa1fe81abcb35f29367758a1f1f07108a42114..963b7a14097bf9b2b603687ca163fda365cf855e
@@@ -402,12 -354,11 +354,11 @@@ namespace MeshWorke
         */
        void assemble(MATRIX &G,
                      const FullMatrix<double> &M,
 -                    const std::vector<unsigned int> &i1,
 -                    const std::vector<unsigned int> &i2);
 +                    const std::vector<types::global_dof_index> &i1,
 +                    const std::vector<types::global_dof_index> &i2);
  
        /**
-        * Assemble a single matrix
-        * into a global matrix.
+        * Assemble a single matrix into a global matrix.
         */
        void assemble(MATRIX &G,
                      const FullMatrix<double> &M,
  
        void assemble_up(MATRIX &G,
                         const FullMatrix<double> &M,
 -                       const std::vector<unsigned int> &i1,
 -                       const std::vector<unsigned int> &i2,
 +                       const std::vector<types::global_dof_index> &i1,
 +                       const std::vector<types::global_dof_index> &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,
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.