]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Various fixes for icc.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 3 Jun 2004 04:39:19 +0000 (04:39 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 3 Jun 2004 04:39:19 +0000 (04:39 +0000)
git-svn-id: https://svn.dealii.org/trunk@9369 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/block_sparse_matrix.templates.h
deal.II/lac/include/lac/block_vector.h
deal.II/lac/include/lac/block_vector.templates.h
deal.II/lac/include/lac/block_vector_base.h

index 7d0873d326897447650227a3419f23baa2e07e02..f602d1aff7839ff7d5f3ac9e2e71c27b123ca289 100644 (file)
@@ -88,7 +88,7 @@ BlockSparseMatrix<number>::operator = (const double d)
   
   for (unsigned int r=0; r<this->n_block_rows(); ++r)
     for (unsigned int c=0; c<this->n_block_cols(); ++c)
-      block(r,c) = d;
+      this->block(r,c) = d;
 
   return *this;
 }
@@ -110,7 +110,7 @@ reinit (const BlockSparsityPattern &sparsity)
        this->sub_objects[r][c] = 0;
        delete p;
       }
-  sub_objects.reinit (0,0);
+  this->sub_objects.reinit (0,0);
 
                                   // then associate new sparsity
                                   // pattern and resize
index 6c38c645e6ca96e3016ac7d413a8daf3150f4a1e..1b6646dd4be1766a6c1b66354a6ceb8e8a0aecee 100644 (file)
@@ -390,7 +390,7 @@ BlockVector<Number>::BlockVector (const std::vector<unsigned int> &n,
     {
       InputIterator end = start;
       std::advance (end, static_cast<signed int>(n[b]));
-      std::copy (start, end, block(b).begin());
+      std::copy (start, end, this->block(b).begin());
       start = end;
     };
   Assert (start == end, ExcIteratorRangeDoesNotMatchVectorSize());
@@ -434,8 +434,8 @@ BlockVector<Number>::operator = (const BlockVector<Number2> &v)
 template <typename Number>
 void BlockVector<Number>::scale (const value_type factor)
 {
-  for (unsigned int i=0;i<num_blocks;++i)
-    components[i].scale(factor);
+  for (unsigned int i=0; i<this->n_blocks();++i)
+    this->components[i].scale(factor);
 }
 
 
index 5013e26b4b060d2536a98572df191114067067f4..f371605a29fc83cc6998bde0808a3cd3c68b2376 100644 (file)
@@ -42,8 +42,8 @@ BlockVector<Number>::BlockVector (const BlockVector<Number>& v)
                 :
                 BlockVectorBase<Vector<Number> > ()
 {
-  components.resize (v.num_blocks);
-  block_indices = v.block_indices;
+  this->components.resize (v.num_blocks);
+  this->block_indices = v.block_indices;
   num_blocks = v.num_blocks;
   
   for (unsigned int i=0; i<num_blocks; ++i)
@@ -77,13 +77,13 @@ template <typename Number>
 void BlockVector<Number>::reinit (const std::vector<unsigned int> &n,
                                  const bool                       fast)
 {
-  block_indices.reinit (n);
-  num_blocks = n.size();
-  if (components.size() != num_blocks)
-    components.resize(num_blocks);
+  this->block_indices.reinit (n);
+  this->num_blocks = n.size();
+  if (this->components.size() != num_blocks)
+    this->components.resize(num_blocks);
   
-  for (unsigned int i=0; i<num_blocks; ++i)
-    components[i].reinit(n[i], fast);
+  for (unsigned int i=0; i<this->num_blocks; ++i)
+    this->components[i].reinit(n[i], fast);
 }
 
 
@@ -92,13 +92,13 @@ template <typename Number2>
 void BlockVector<Number>::reinit (const BlockVector<Number2>& v,
                                   const bool fast)
 {
-  block_indices = v.get_block_indices();
-  num_blocks = v.n_blocks();
-  if (components.size() != num_blocks)
-    components.resize(num_blocks);
+  this->block_indices = v.get_block_indices();
+  this->num_blocks = v.n_blocks();
+  if (this->components.size() != num_blocks)
+    this->components.resize(num_blocks);
   
-  for (unsigned int i=0;i<num_blocks;++i)
-    block(i).reinit(v.block(i), fast);
+  for (unsigned int i=0;i<this->num_blocks;++i)
+    this->block(i).reinit(v.block(i), fast);
 }
 
 
index 6eca3e5d283b0cdd9601eb5247a92b75ce0fefef..570ca3c392ae0d227751ccb0b4e8fdec2c0a2482 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <vector>
 #include <iterator>
+#include <cmath>
 
 
 

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.