]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
fix some more errors
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 5 Mar 2013 19:04:19 +0000 (19:04 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 5 Mar 2013 19:04:19 +0000 (19:04 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28741 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/lac/constraint_matrix.cc
deal.II/source/lac/petsc_matrix_base.cc
deal.II/source/lac/petsc_parallel_sparse_matrix.cc
deal.II/source/lac/petsc_vector_base.cc

index e4c69da6fbddb5883c0dc7dc8f39e929a45cdb9a..cf95c9fb66d4e2b6f3b111c0bfda093da7b6d1a5 100644 (file)
@@ -2268,7 +2268,7 @@ ConstraintMatrix::memory_consumption () const
       VectorType       &condensed_vector) const; \
   template void ConstraintMatrix:: \
   distribute_local_to_global<VectorType > (const Vector<double>            &, \
-                                           const std::vector<sdt::size_t>  &, \
+                                           const std::vector<ConstraintMatrix::size_type>  &, \
                                            VectorType                      &, \
                                            const FullMatrix<double>        &) const; \
   template void ConstraintMatrix::distribute<VectorType >(const VectorType &condensed,\
index 0ddd19db0ccdd518bd9bd982e3682330916acde7..bdf4de2ee40b00274dc17af7bb5f5afce103ed6f 100644 (file)
@@ -270,7 +270,7 @@ namespace PETScWrappers
 
 
 
-  size_type
+  MatrixBase::size_type
   MatrixBase::m () const
   {
 #ifdef PETSC_USE_64BIT_INDICES
@@ -287,7 +287,7 @@ namespace PETScWrappers
 
 
 
-  size_type 
+  MatrixBase::size_type 
   MatrixBase::n () const
   {
 #ifdef PETSC_USE_64BIT_INDICES
@@ -304,7 +304,7 @@ namespace PETScWrappers
 
 
 
-  size_type 
+  MatrixBase::size_type 
   MatrixBase::local_size () const
   {
 #ifdef PETSC_USE_64BIT_INDICES
@@ -321,7 +321,7 @@ namespace PETScWrappers
 
 
 
-  std::pair<size_type, size_type>
+  std::pair<MatrixBase::size_type, MatrixBase::size_type>
   MatrixBase::local_range () const
   {
 #ifdef PETSC_USE_64BIT_INDICES
@@ -339,7 +339,7 @@ namespace PETScWrappers
 
 
 
-  size_type 
+  MatrixBase::size_type 
   MatrixBase::n_nonzero_elements () const
   {
     MatInfo mat_info;
@@ -352,7 +352,7 @@ namespace PETScWrappers
 
 
 
-  size_type 
+  MatrixBase::size_type 
   MatrixBase::
   row_length (const size_type row) const
   {
index a1fa31752a6332e81576c7e7349fac7e8177ca7d..80970408177d638627ce5313094da2f4896f2530 100644 (file)
@@ -618,7 +618,7 @@ namespace PETScWrappers
     template
     SparseMatrix::SparseMatrix (const MPI_Comm &,
                                 const SparsityPattern &,
-                                const std::vector<size_type &,
+                                const std::vector<size_type> &,
                                 const std::vector<size_type> &,
                                 const unsigned int,
                                 const bool);
index ef58923090ab830c8ccaa8a54ca7b9af57277f38..e0de106e1be2e190154a3bbfd2c3caa9d31fcd64 100644 (file)
@@ -263,7 +263,7 @@ namespace PETScWrappers
 
 
 
-  size_type 
+  VectorBase::size_type 
   VectorBase::size () const
   {
 #ifdef PETSC_USE_64BIT_INDICES
@@ -280,7 +280,7 @@ namespace PETScWrappers
 
 
 
-  size_type 
+  VectorBase::size_type 
   VectorBase::local_size () const
   {
 #ifdef PETSC_USE_64BIT_INDICES
@@ -297,7 +297,7 @@ namespace PETScWrappers
 
 
 
-  std::pair<size_type, size_type>
+  std::pair<VectorBase::size_type, VectorBase::size_type>
   VectorBase::local_range () const
   {
 #ifdef PETSC_USE_64BIT_INDICES

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.