]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Use Table of vector of vectors where possible.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 21 Oct 2002 14:32:44 +0000 (14:32 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 21 Oct 2002 14:32:44 +0000 (14:32 +0000)
git-svn-id: https://svn.dealii.org/trunk@6695 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/block_sparse_matrix.h
deal.II/lac/include/lac/block_sparse_matrix.templates.h
deal.II/lac/include/lac/block_sparsity_pattern.h
deal.II/lac/include/lac/sparse_vanka.templates.h
deal.II/lac/source/block_sparsity_pattern.cc

index c76366bcad88492607689ce64c947c4dc87dc4e0..7c631f9036f8e45c3cefdf087f7525b4363dc839 100644 (file)
@@ -15,6 +15,7 @@
 
 
 #include <base/config.h>
+#include <base/table.h>
 #include <lac/sparse_matrix.h>
 #include <lac/block_sparsity_pattern.h>
 #include <cmath>
@@ -546,7 +547,7 @@ class BlockSparseMatrix : public Subscriptor
                                     /**
                                      * Array of sub-matrices.
                                      */
-    std::vector<std::vector<SmartPointer<SparseMatrix<number> > > > sub_objects;
+    Table<2,SmartPointer<SparseMatrix<number> > > sub_objects;
 };
 
 
index 403ef71ea98698c0e169ddc8984c688dbc8ee8d9..306110ffca4463c7c11e2c9a45bb4174998ddeaa 100644 (file)
@@ -107,8 +107,7 @@ reinit (const BlockSparsityPattern &sparsity)
   sparsity_pattern = &sparsity;
   rows = sparsity.n_block_rows();
   columns = sparsity.n_block_cols();
-  sub_objects = std::vector<std::vector<SmartPointer<SparseMatrix<number> > > >
-               (rows, std::vector<SmartPointer<SparseMatrix<number> > > (columns, 0));
+  sub_objects.reinit (rows, columns);
 
                                   // and reinitialize the blocks
   for (unsigned int r=0; r<rows; ++r)
index 4e794dd8b9fee16a2888c6d51a1a590e404b51ae..29c684c7f2ed1874df14c35339654f8a4cefe052 100644 (file)
@@ -16,6 +16,7 @@
 
 #include <base/config.h>
 #include <base/exceptions.h>
+#include <base/table.h>
 #include <base/subscriptor.h>
 #include <base/smartpointer.h>
 #include <lac/sparsity_pattern.h>
@@ -357,7 +358,7 @@ class BlockSparsityPatternBase : public Subscriptor
                                     /**
                                      * Array of sparsity patterns.
                                      */
-    std::vector<std::vector<SmartPointer<SparsityPatternBase> > > sub_objects;
+    Table<2,SmartPointer<SparsityPatternBase> > sub_objects;
 
                                     /**
                                      * Object storing and managing
index 3522c6bd3133e0a5bfe8a00bce4ab5efaf19a15c..83cf5e01af2506cd755eec4aa656e3619f73eea2 100644 (file)
@@ -487,8 +487,7 @@ SparseBlockVanka<number>::compute_dof_masks (const SparseMatrix<number> &M,
                                         // Lagrange dofs of each
                                         // block access the different
                                         // dofs
-       std::vector<std::vector<unsigned int> >
-         access_count (n_blocks, std::vector<unsigned int>(M.m(), 0));
+       Table<2,unsigned int> access_count (n_blocks, M.m());
        
                                         // set-up the map that will
                                         // be used to store the
index 3550bea921808e258ac054ae85093e963bb53398..404940c31b182acc39cc31272a80d37a2591b99d 100644 (file)
@@ -79,7 +79,7 @@ BlockSparsityPatternBase<SparsityPatternBase>::reinit (const unsigned int r,
                                   // set new sizes
   rows = r;
   columns = c;
-  sub_objects.resize (rows, std::vector<SmartPointer<SparsityPatternBase> > (columns));
+  sub_objects.reinit (rows, columns);
 
                                   // allocate new objects
   for (unsigned int i=0; i<rows; ++i)

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.