]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Some more cleanup
authorMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 28 Dec 2012 23:16:56 +0000 (23:16 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 28 Dec 2012 23:16:56 +0000 (23:16 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_deprecated@27867 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/lac/block_matrix_array.h
deal.II/include/deal.II/lac/precondition_block.h
deal.II/include/deal.II/lac/precondition_block.templates.h
deal.II/source/grid/tria_accessor.cc

index c9eeb5b8d90d290b62dfe3ce88f8759a9598d331..73ae0d19a0dcf98ec3d6b2e6ba8f58d5793e44fc 100644 (file)
@@ -144,12 +144,9 @@ public:
    * function to call for an object
    * created by the default
    * constructor.
-   *
-   * @deprecated the last argument
-   * is ignored.
    */
   void initialize (const unsigned int n_block_rows,
-                   const unsigned int n_block_cols) DEAL_II_DEPRECATED;
+                   const unsigned int n_block_cols);
 
   /**
    * Constructor fixing the
index 57d46f15fa43641e4b98fb2231f3b03da5aea49c..d3d7feb3edf4bbf9ffb4f9920617ea4bd3123923 100644 (file)
@@ -1087,7 +1087,7 @@ Accessor (const PreconditionBlockJacobi<MATRIX, inverse_type> *matrix,
 
   // This is the end accessor, which
   // does not hava a valid block.
-  if (a_block == matrix->n_blocks())
+  if (a_block == matrix->size())
     return;
 
   const unsigned int r = row % bs;
@@ -1095,8 +1095,8 @@ Accessor (const PreconditionBlockJacobi<MATRIX, inverse_type> *matrix,
   b_iterator = matrix->inverse(a_block).begin(r);
   b_end = matrix->inverse(a_block).end();
 
-  Assert (a_block < matrix->n_blocks(),
-          ExcIndexRange(a_block, 0, matrix->n_blocks()));
+  Assert (a_block < matrix->size(),
+          ExcIndexRange(a_block, 0, matrix->size()));
 }
 
 
@@ -1105,7 +1105,7 @@ inline
 unsigned int
 PreconditionBlockJacobi<MATRIX, inverse_type>::const_iterator::Accessor::row() const
 {
-  Assert (a_block < matrix->n_blocks(),
+  Assert (a_block < matrix->size(),
           ExcIteratorPastEnd());
 
   return bs * a_block + b_iterator->row();
@@ -1117,7 +1117,7 @@ inline
 unsigned int
 PreconditionBlockJacobi<MATRIX, inverse_type>::const_iterator::Accessor::column() const
 {
-  Assert (a_block < matrix->n_blocks(),
+  Assert (a_block < matrix->size(),
           ExcIteratorPastEnd());
 
   return bs * a_block + b_iterator->column();
@@ -1129,7 +1129,7 @@ inline
 inverse_type
 PreconditionBlockJacobi<MATRIX, inverse_type>::const_iterator::Accessor::value() const
 {
-  Assert (a_block < matrix->n_blocks(),
+  Assert (a_block < matrix->size(),
           ExcIteratorPastEnd());
 
   return b_iterator->value();
@@ -1158,7 +1158,7 @@ PreconditionBlockJacobi<MATRIX, inverse_type>::const_iterator::operator++ ()
     {
       ++accessor.a_block;
 
-      if (accessor.a_block < accessor.matrix->n_blocks())
+      if (accessor.a_block < accessor.matrix->size())
         {
           accessor.b_iterator = accessor.matrix->inverse(accessor.a_block).begin();
           accessor.b_end = accessor.matrix->inverse(accessor.a_block).end();
@@ -1192,7 +1192,7 @@ bool
 PreconditionBlockJacobi<MATRIX, inverse_type>::const_iterator::
 operator == (const const_iterator &other) const
 {
-  if (accessor.a_block == accessor.matrix->n_blocks() &&
+  if (accessor.a_block == accessor.matrix->size() &&
       accessor.a_block == other.accessor.a_block)
     return true;
 
@@ -1240,7 +1240,7 @@ inline
 typename PreconditionBlockJacobi<MATRIX, inverse_type>::const_iterator
 PreconditionBlockJacobi<MATRIX, inverse_type>::end () const
 {
-  return const_iterator(this, this->n_blocks() * this->block_size());
+  return const_iterator(this, this->size() * this->block_size());
 }
 
 
index 1379139aefa363796241e448af4eb96729df5ba1..41fc24ad955b791abc6a3db75c9c282effae7145 100644 (file)
@@ -625,7 +625,7 @@ void PreconditionBlockJacobi<MATRIX,inverse_type>
 
         begin_diag_block+=this->blocksize;
       }
-  dst.scale(this->relaxation);
+  dst *= this->relaxation;
 }
 
 
index 64de72813fbe5a3f9f5f68f67743b220e0fdc524..0661e0369605779a4351f5700f60d04dd7bac827 100644 (file)
@@ -1348,7 +1348,7 @@ CellAccessor<dim, spacedim>::set_subdomain_id (const types::subdomain_id new_sub
 
 
 template <int dim, int spacedim>
-types::subdomain_id_t CellAccessor<dim, spacedim>::level_subdomain_id () const
+types::subdomain_id CellAccessor<dim, spacedim>::level_subdomain_id () const
 {
   Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed());
   return this->tria->levels[this->present_level]->level_subdomain_ids[this->present_index];
@@ -1358,7 +1358,7 @@ types::subdomain_id_t CellAccessor<dim, spacedim>::level_subdomain_id () const
 
 template <int dim, int spacedim>
 void
-CellAccessor<dim, spacedim>::set_level_subdomain_id (const types::subdomain_id_t new_level_subdomain_id) const
+CellAccessor<dim, spacedim>::set_level_subdomain_id (const types::subdomain_id new_level_subdomain_id) const
 {
   Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed());
   this->tria->levels[this->present_level]->level_subdomain_ids[this->present_index]

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.