From: young <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 14 Mar 2013 09:10:53 +0000 (+0000)
Subject: Remove most instances of PETSC_USE_64BIT_INDICES. PetscInt is always right.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d86f2e33bb7614a5b4679a694fe164bd4bc3b827;p=dealii-svn.git

Remove most instances of PETSC_USE_64BIT_INDICES. PetscInt is always right.

git-svn-id: https://svn.dealii.org/trunk@28899 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/source/lac/petsc_matrix_base.cc b/deal.II/source/lac/petsc_matrix_base.cc
index 12820212a3..036addb339 100644
--- a/deal.II/source/lac/petsc_matrix_base.cc
+++ b/deal.II/source/lac/petsc_matrix_base.cc
@@ -217,12 +217,8 @@ namespace PETScWrappers
   MatrixBase::el (const unsigned int i,
                   const unsigned int j) const
   {
-#ifdef PETSC_USE_64BIT_INDICES
-    PetscInt
-#else
-    int
-#endif
-    petsc_i = i, petsc_j = j;
+    PetscInt petsc_i = i, petsc_j = j;
+
     PetscScalar value;
 
     const int ierr
@@ -274,12 +270,8 @@ namespace PETScWrappers
   unsigned int
   MatrixBase::m () const
   {
-#ifdef PETSC_USE_64BIT_INDICES
-    PetscInt
-#else
-    int
-#endif
-    n_rows, n_cols;
+    PetscInt n_rows, n_cols;
+
     int ierr = MatGetSize (matrix, &n_rows, &n_cols);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
@@ -291,12 +283,8 @@ namespace PETScWrappers
   unsigned int
   MatrixBase::n () const
   {
-#ifdef PETSC_USE_64BIT_INDICES
-    PetscInt
-#else
-    int
-#endif
-    n_rows, n_cols;
+    PetscInt n_rows, n_cols;
+
     int ierr = MatGetSize (matrix, &n_rows, &n_cols);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
@@ -308,12 +296,8 @@ namespace PETScWrappers
   unsigned int
   MatrixBase::local_size () const
   {
-#ifdef PETSC_USE_64BIT_INDICES
-    PetscInt
-#else
-    int
-#endif
-    n_rows, n_cols;
+    PetscInt n_rows, n_cols;
+
     int ierr = MatGetLocalSize (matrix, &n_rows, &n_cols);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
@@ -325,12 +309,8 @@ namespace PETScWrappers
   std::pair<unsigned int, unsigned int>
   MatrixBase::local_range () const
   {
-#ifdef PETSC_USE_64BIT_INDICES
-    PetscInt
-#else
-    int
-#endif
-    begin, end;
+    PetscInt begin, end;
+
     const int ierr = MatGetOwnershipRange (static_cast<const Mat &>(matrix),
                                            &begin, &end);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
diff --git a/deal.II/source/lac/petsc_parallel_sparse_matrix.cc b/deal.II/source/lac/petsc_parallel_sparse_matrix.cc
index 2120531cbd..a734506e54 100644
--- a/deal.II/source/lac/petsc_parallel_sparse_matrix.cc
+++ b/deal.II/source/lac/petsc_parallel_sparse_matrix.cc
@@ -263,13 +263,8 @@ namespace PETScWrappers
       // signed integers. so we have to
       // convert, unless we want to play dirty
       // tricks with conversions of pointers
-#ifdef PETSC_USE_64BIT_INDICES
       const std::vector<PetscInt> int_row_lengths (row_lengths.begin(),
                                                    row_lengths.end());
-#else
-      const std::vector<signed int> int_row_lengths (row_lengths.begin(),
-                                                     row_lengths.end());
-#endif
 
 //TODO: There must be a significantly better way to provide information about the off-diagonal blocks of the matrix. this way, petsc keeps allocating tiny chunks of memory, and gets completely hung up over this
 
@@ -356,11 +351,8 @@ namespace PETScWrappers
 
       // then count the elements in- and
       // out-of-window for the rows we own
-#ifdef PETSC_USE_64BIT_INDICES
       std::vector<PetscInt>
-#else
-      std::vector<int>
-#endif
+
       row_lengths_in_window (local_row_end - local_row_start),
                             row_lengths_out_of_window (local_row_end - local_row_start);
       for (unsigned int row = local_row_start; row<local_row_end; ++row)
@@ -439,12 +431,8 @@ namespace PETScWrappers
           // have to somehow clumsily work around
           // the whole thing:
 #if DEAL_II_PETSC_VERSION_LT(2,2,1)
-
-#ifdef PETSC_USE_64BIT_INDICES
           std::vector<PetscInt>
-#else
-          std::vector<int>
-#endif
+
           row_entries;
           std::vector<PetscScalar> row_values;
           for (unsigned int i=0; i<sparsity_pattern.n_rows(); ++i)
@@ -461,7 +449,6 @@ namespace PETScWrappers
             }
 
           compress ();
-
 #else
 
           // first set up the column number
@@ -470,11 +457,8 @@ namespace PETScWrappers
           // dummy entry at the end to make
           // sure petsc doesn't read past the
           // end
-#ifdef PETSC_USE_64BIT_INDICES
           std::vector<PetscInt>
-#else
-          std::vector<int>
-#endif
+
           rowstart_in_window (local_row_end - local_row_start + 1, 0),
                              colnums_in_window;
           {
@@ -492,12 +476,7 @@ namespace PETScWrappers
           // now copy over the information
           // from the sparsity pattern.
           {
-#ifdef PETSC_USE_64BIT_INDICES
-            PetscInt
-#else
-            int
-#endif
-            * ptr = & colnums_in_window[0];
+            PetscInt* ptr = & colnums_in_window[0];
 
             for (unsigned int i=local_row_start; i<local_row_end; ++i)
               {
@@ -546,12 +525,7 @@ namespace PETScWrappers
 
             for (unsigned int i=local_row_start; i<local_row_end; ++i)
               {
-#ifdef PETSC_USE_64BIT_INDICES
-                PetscInt
-#else
-                int
-#endif
-                petsc_i = i;
+                PetscInt petsc_i = i;
                 MatSetValues (matrix, 1, &petsc_i,
                               sparsity_pattern.row_length(i),
                               &colnums_in_window[rowstart_in_window[i-local_row_start]],
diff --git a/deal.II/source/lac/petsc_parallel_vector.cc b/deal.II/source/lac/petsc_parallel_vector.cc
index cf3bd0c4e7..9d36ee6304 100644
--- a/deal.II/source/lac/petsc_parallel_vector.cc
+++ b/deal.II/source/lac/petsc_parallel_vector.cc
@@ -269,13 +269,7 @@ namespace PETScWrappers
 
 #if DEBUG
       // test ghost allocation in debug mode
-
-#ifdef PETSC_USE_64BIT_INDICES
-      PetscInt
-#else
-      int
-#endif
-      begin, end;
+      PetscInt begin, end;
 
       ierr = VecGetOwnershipRange (vector, &begin, &end);
 
diff --git a/deal.II/source/lac/petsc_solver.cc b/deal.II/source/lac/petsc_solver.cc
index 67d38bf5ef..3b58933f75 100644
--- a/deal.II/source/lac/petsc_solver.cc
+++ b/deal.II/source/lac/petsc_solver.cc
@@ -160,11 +160,7 @@ namespace PETScWrappers
 
   int
   SolverBase::convergence_test (KSP                 /*ksp*/,
-#ifdef PETSC_USE_64BIT_INDICES
                                 const PetscInt      iteration,
-#else
-                                const int           iteration,
-#endif
                                 const PetscReal     residual_norm,
                                 KSPConvergedReason *reason,
                                 void               *solver_control_x)
@@ -853,11 +849,7 @@ namespace PETScWrappers
   }
 
   int SparseDirectMUMPS::convergence_test (KSP            /*ksp*/,
-#ifdef PETSC_USE_64BIT_INDICES
                                            const PetscInt       iteration,
-#else
-                                           const int            iteration,
-#endif
                                            const PetscReal      residual_norm,
                                            KSPConvergedReason   *reason,
                                            void                 *solver_control_x)
diff --git a/deal.II/source/lac/petsc_vector_base.cc b/deal.II/source/lac/petsc_vector_base.cc
index 439a6bfcab..8de2a942bb 100644
--- a/deal.II/source/lac/petsc_vector_base.cc
+++ b/deal.II/source/lac/petsc_vector_base.cc
@@ -68,11 +68,7 @@ namespace PETScWrappers
           // an index set
           if (vector.ghosted)
             {
-#ifdef PETSC_USE_64BIT_INDICES
               PetscInt begin, end;
-#else
-              int begin, end;
-#endif
               ierr = VecGetOwnershipRange (vector.vector, &begin, &end);
               AssertThrow (ierr == 0, ExcPETScError(ierr));
 
@@ -119,12 +115,7 @@ namespace PETScWrappers
           // first verify that the requested
           // element is actually locally
           // available
-
-#ifdef PETSC_USE_64BIT_INDICES
           PetscInt begin, end;
-#else
-          int begin, end;
-#endif
 
           ierr = VecGetOwnershipRange (vector.vector, &begin, &end);
           AssertThrow (ierr == 0, ExcPETScError(ierr));
@@ -266,12 +257,7 @@ namespace PETScWrappers
   unsigned int
   VectorBase::size () const
   {
-#ifdef PETSC_USE_64BIT_INDICES
-    PetscInt
-#else
-    int
-#endif
-    sz;
+    PetscInt sz;
     const int ierr = VecGetSize (vector, &sz);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
@@ -283,12 +269,7 @@ namespace PETScWrappers
   unsigned int
   VectorBase::local_size () const
   {
-#ifdef PETSC_USE_64BIT_INDICES
-    PetscInt
-#else
-    int
-#endif
-    sz;
+    PetscInt sz;
     const int ierr = VecGetLocalSize (vector, &sz);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
@@ -300,12 +281,7 @@ namespace PETScWrappers
   std::pair<unsigned int, unsigned int>
   VectorBase::local_range () const
   {
-#ifdef PETSC_USE_64BIT_INDICES
-    PetscInt
-#else
-    int
-#endif
-    begin, end;
+    PetscInt begin, end;
     const int ierr = VecGetOwnershipRange (static_cast<const Vec &>(vector),
                                            &begin, &end);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
diff --git a/deal.II/source/lac/slepc_solver.cc b/deal.II/source/lac/slepc_solver.cc
index 7e2682ad2d..af34b63a14 100644
--- a/deal.II/source/lac/slepc_solver.cc
+++ b/deal.II/source/lac/slepc_solver.cc
@@ -167,11 +167,7 @@ namespace SLEPcWrappers
 
     // get number of converged eigenstates
     ierr = EPSGetConverged (solver_data->eps,
-#ifdef PETSC_USE_64BIT_INDICES
                             reinterpret_cast<PetscInt *>(n_converged)
-#else
-                            reinterpret_cast<int *>(n_converged)
-#endif
                            );
     AssertThrow (ierr == 0, ExcSLEPcError(ierr));