]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from mainline.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 9 Feb 2013 05:33:25 +0000 (05:33 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 9 Feb 2013 05:33:25 +0000 (05:33 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28295 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/lac/chunk_sparse_matrix.h
deal.II/include/deal.II/lac/chunk_sparsity_pattern.h
deal.II/source/fe/fe_values.cc
deal.II/source/lac/chunk_sparsity_pattern.cc
deal.II/source/numerics/solution_transfer.cc

Simple merge
index cacc1a5abacbc58de80612433beb01e9ff7e963d,1179da45fa8e58643a31151193975c7447b7a203..aac418b41e9e68f33cf2a1907256917c56b74ca5
@@@ -1428,10 -1427,10 +1427,10 @@@ number ChunkSparseMatrix<number>::el (c
  
  template <typename number>
  inline
 -number ChunkSparseMatrix<number>::diag_element (const unsigned int i) const
 +number ChunkSparseMatrix<number>::diag_element (const types::global_dof_index i) const
  {
    Assert (cols != 0, ExcNotInitialized());
-   Assert (cols->optimize_diagonal(),  ExcNotQuadratic());
+   Assert (m() == n(),  ExcNotQuadratic());
    Assert (i<m(), ExcInvalidIndex1(i));
  
    // Use that the first element in each row
  
  template <typename number>
  inline
 -number &ChunkSparseMatrix<number>::diag_element (const unsigned int i)
 +number &ChunkSparseMatrix<number>::diag_element (const types::global_dof_index i)
  {
    Assert (cols != 0, ExcNotInitialized());
-   Assert (cols->optimize_diagonal(),  ExcNotQuadratic());
+   Assert (m() == n(),  ExcNotQuadratic());
    Assert (i<m(), ExcInvalidIndex1(i));
  
    // Use that the first element in each row
index 55d89cf4f9c83c77a8e8a3c2cb69bb73da0276fc,8f7dc5965ba9a304d91badbeb93d1a24fc937916..b22022c4db94ff98d461e125be2255ef1e8d3b02
@@@ -126,18 -126,21 +126,21 @@@ public
     * @arg n number of columns
     * @arg max_per_row maximum
     * number of nonzero entries per row
-    *
-    * @arg optimize_diagonal store
-    * diagonal entries first in row;
-    * see optimize_diagonal(). This
-    * takes effect for quadratic
-    * matrices only.
     */
 -  ChunkSparsityPattern (const unsigned int m,
 -                        const unsigned int n,
 +  ChunkSparsityPattern (const types::global_dof_index m,
 +                        const types::global_dof_index n,
                          const unsigned int max_chunks_per_row,
+                         const unsigned int chunk_size);
+   /**
+    * @deprecated This constructor is deprecated. Use the version
+    * without the last argument
+    */
+   ChunkSparsityPattern (const unsigned int m,
+                         const unsigned int n,
+                         const unsigned int max_chunks_per_row,
                          const unsigned int chunk_size,
-                         const bool optimize_diagonal = true);
+                         const bool optimize_diagonal) DEAL_II_DEPRECATED;
  
    /**
     * Initialize a rectangular
     * number of nonzero entries for
     * each row.  This vector must
     * have one entry for each row.
-    *
-    * @arg optimize_diagonal store
-    * diagonal entries first in row;
-    * see optimize_diagonal(). This
-    * takes effect for quadratic
-    * matrices only.
     */
 -  ChunkSparsityPattern (const unsigned int               m,
 -                        const unsigned int               n,
 +  ChunkSparsityPattern (const types::global_dof_index m,
 +                        const types::global_dof_index n,
                          const std::vector<unsigned int> &row_lengths,
+                         const unsigned int chunk_size);
+   /**
+    * @deprecated This constructor is deprecated. Use the version
+    * without the last argument
+    */
+   ChunkSparsityPattern (const unsigned int               m,
+                         const unsigned int               n,
+                         const std::vector<unsigned int> &row_lengths,
                          const unsigned int chunk_size,
-                         const bool optimize_diagonal = true);
+                         const bool optimize_diagonal) DEAL_II_DEPRECATED;
  
    /**
     * Initialize a quadratic matrix
     * number of nonzero entries for
     * each row.  This vector must
     * have one entry for each row.
-    *
-    * @arg optimize_diagonal store
-    * diagonal entries first in row;
-    * see optimize_diagonal().
     */
 -  ChunkSparsityPattern (const unsigned int               m,
 +  ChunkSparsityPattern (const types::global_dof_index    m,
+                         const std::vector<unsigned int> &row_lengths,
+                         const unsigned int               chunk_size);
+   /**
+    * @deprecated This constructor is deprecated. Use the version
+    * without the last argument
+    */
+   ChunkSparsityPattern (const unsigned int               m,
                          const std::vector<unsigned int> &row_lengths,
                          const unsigned int               chunk_size,
-                         const bool optimize_diagonal = true);
+                         const bool optimize_diagonal) DEAL_II_DEPRECATED;
  
    /**
     * Destructor.
     * operations to the other
     * <tt>reinit</tt> function.
     */
 -  void reinit (const unsigned int m,
 -               const unsigned int n,
 +  void reinit (const types::global_dof_index m,
 +               const types::global_dof_index n,
                 const unsigned int max_per_row,
+                const unsigned int chunk_size);
+   /**
+    * @deprecated This function is deprecated. Use the function
+    * without the last argument
+    */
+   void reinit (const unsigned int m,
+                const unsigned int n,
+                const unsigned int max_per_row,
                 const unsigned int chunk_size,
-                const bool optimize_diagonal = true);
+                const bool optimize_diagonal) DEAL_II_DEPRECATED;
  
    /**
     * Reallocate memory for a matrix
     * optimized access in relaxation
     * methods of SparseMatrix.
     */
 -  void reinit (const unsigned int               m,
 -               const unsigned int               n,
 +  void reinit (const types::global_dof_index m,
 +               const types::global_dof_index n,
                 const std::vector<unsigned int> &row_lengths,
+                const unsigned int chunk_size);
+   /**
+    * @deprecated This function is deprecated. Use the function
+    * without the last argument
+    */
+   void reinit (const unsigned int               m,
+                const unsigned int               n,
+                const std::vector<unsigned int> &row_lengths,
                 const unsigned int chunk_size,
-                const bool optimize_diagonal = true);
+                const bool optimize_diagonal) DEAL_II_DEPRECATED;
  
    /**
     * Same as above, but with a
     * VectorSlice argument instead.
     */
 -  void reinit (const unsigned int               m,
 -               const unsigned int               n,
 +  void reinit (const types::global_dof_index m,
 +               const types::global_dof_index n,
                 const VectorSlice<const std::vector<unsigned int> > &row_lengths,
+                const unsigned int chunk_size);
+   /**
+    * @deprecated This function is deprecated. Use the function
+    * without the last argument
+    */
+   void reinit (const unsigned int               m,
+                const unsigned int               n,
+                const VectorSlice<const std::vector<unsigned int> > &row_lengths,
                 const unsigned int chunk_size,
-                const bool optimize_diagonal = true);
+                const bool optimize_diagonal) DEAL_II_DEPRECATED;
  
    /**
     * This function compresses the sparsity
     * pairs.
     */
    template <typename ForwardIterator>
 -  void copy_from (const unsigned int    n_rows,
 -                  const unsigned int    n_cols,
 +  void copy_from (const types::global_dof_index n_rows,
 +                  const types::global_dof_index n_cols,
                    const ForwardIterator begin,
                    const ForwardIterator end,
+                   const unsigned int chunk_size);
+    /**
+     * @deprecated This function is deprecated. Use the function
+     * without the last argument
+     */
+   template <typename ForwardIterator>
+   void copy_from (const unsigned int    n_rows,
+                   const unsigned int    n_cols,
+                   const ForwardIterator begin,
+                   const ForwardIterator end,
                    const unsigned int chunk_size,
-                   const bool optimize_diagonal = true);
+                   const bool optimize_diagonal) DEAL_II_DEPRECATED;
  
    /**
     * Copy data from an object of type
Simple merge
index b7d1484d3e5c0f0bb391114c843a4fb20923db6e,2983d2b74728c7850e8b574bb1ed1b7e1abe013c..f81514b49bd4e181d7b95b2050c11a4a6cd6b7d5
@@@ -2,7 -2,7 +2,7 @@@
  //    $Id$
  //    Version: $Name$
  //
--//    Copyright (C) 2008, 2011, 2012 by the deal.II authors
++//    Copyright (C) 2008, 2011, 2012, 2013 by the deal.II authors
  //
  //    This file is subject to QPL and may not be  distributed
  //    without copyright and license information. Please refer
@@@ -42,11 -42,11 +42,11 @@@ ChunkSparsityPattern::ChunkSparsityPatt
  
  
  
 -ChunkSparsityPattern::ChunkSparsityPattern (const unsigned int m,
 -                                            const unsigned int n,
 +ChunkSparsityPattern::ChunkSparsityPattern (const types::global_dof_index m,
 +                                            const types::global_dof_index n,
                                              const unsigned int max_per_row,
                                              const unsigned int chunk_size,
-                                             const bool optimize_diag)
+                                             const bool)
  {
    Assert (chunk_size > 0, ExcInvalidNumber (chunk_size));
  
@@@ -112,11 -148,21 +148,21 @@@ ChunkSparsityPattern::operator = (cons
  
  
  void
 -ChunkSparsityPattern::reinit (const unsigned int m,
 -                              const unsigned int n,
 +ChunkSparsityPattern::reinit (const types::global_dof_index m,
 +                              const types::global_dof_index n,
                                const unsigned int max_per_row,
                                const unsigned int chunk_size,
-                               const bool optimize_diag)
+                               const bool)
+ {
+   reinit (m, n, max_per_row, chunk_size);
+ }
+ void
+ ChunkSparsityPattern::reinit (const unsigned int m,
+                               const unsigned int n,
+                               const unsigned int max_per_row,
+                               const unsigned int chunk_size)
  {
    Assert (chunk_size > 0, ExcInvalidNumber (chunk_size));
  
  
  void
  ChunkSparsityPattern::reinit (
 -  const unsigned int m,
 -  const unsigned int n,
 +  const types::global_dof_index m,
 +  const types::global_dof_index n,
    const VectorSlice<const std::vector<unsigned int> > &row_lengths,
    const unsigned int chunk_size,
-   const bool optimize_diag)
+   const bool)
+ {
+   reinit (m, n, row_lengths, chunk_size);
+ }
+ void
+ ChunkSparsityPattern::reinit (
+     const unsigned int m,
+     const unsigned int n,
+     const VectorSlice<const std::vector<unsigned int> > &row_lengths,
+     const unsigned int chunk_size)
  {
    Assert (row_lengths.size() == m, ExcInvalidNumber (m));
    Assert (chunk_size > 0, ExcInvalidNumber (chunk_size));
@@@ -253,11 -326,22 +326,22 @@@ void ChunkSparsityPattern::copy_from (c
  
  void
  ChunkSparsityPattern::reinit (
 -  const unsigned int m,
 -  const unsigned int n,
 +  const types::global_dof_index m,
 +  const types::global_dof_index n,
    const std::vector<unsigned int> &row_lengths,
    const unsigned int chunk_size,
-   const bool optimize_diag)
+   const bool)
+ {
+   reinit (m, n, row_lengths, chunk_size);
+ }
+ void
+ ChunkSparsityPattern::reinit (
+   const unsigned int m,
+   const unsigned int n,
+   const std::vector<unsigned int> &row_lengths,
+   const unsigned int chunk_size)
  {
    Assert (chunk_size > 0, ExcInvalidNumber (chunk_size));
  

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.