From 86c252d89db7e4ff2ff37021ac84b22a0f1aef09 Mon Sep 17 00:00:00 2001
From: turcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 30 Apr 2013 14:36:42 +0000
Subject: [PATCH] Fix a mpi test.

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29407 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/source/lac/trilinos_sparse_matrix.cc | 14 ++++++++++++++
 tests/mpi/matrix_free_04.cc                  |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/deal.II/source/lac/trilinos_sparse_matrix.cc b/deal.II/source/lac/trilinos_sparse_matrix.cc
index 26455a4aa1..1b9d294507 100644
--- a/deal.II/source/lac/trilinos_sparse_matrix.cc
+++ b/deal.II/source/lac/trilinos_sparse_matrix.cc
@@ -1133,10 +1133,17 @@ namespace TrilinosWrappers
               inputleft.trilinos_sparsity_pattern().ExtractMyRowView(i, num_entries,
                                                                      indices);
               Assert (num_entries >= 0, ExcInternalError());
+#ifndef DEAL_II_USE_LARGE_INDEX_TYPE
               const size_type GID = inputleft.row_partitioner().GID(i);
               for (TrilinosWrappers::types::int_type j=0; j<num_entries; ++j)
                 sparsity_transposed.add (inputleft.col_partitioner().GID(indices[j]),
                                          GID);
+#else
+              const size_type GID = inputleft.row_partitioner().GID64(i);
+              for (TrilinosWrappers::types::int_type j=0; j<num_entries; ++j)
+                sparsity_transposed.add (inputleft.col_partitioner().GID64(indices[j]),
+                                         GID);
+#endif
             }
 
           sparsity_transposed.compress();
@@ -1148,10 +1155,17 @@ namespace TrilinosWrappers
               inputleft.trilinos_matrix().ExtractMyRowView(i, num_entries,
                                                            values, indices);
               Assert (num_entries >= 0, ExcInternalError());
+#ifndef DEAL_II_USE_LARGE_INDEX_TYPE
               const size_type GID = inputleft.row_partitioner().GID(i);
               for (TrilinosWrappers::types::int_type j=0; j<num_entries; ++j)
                 transposed_mat.set (inputleft.col_partitioner().GID(indices[j]),
                                     GID, values[j]);
+#else
+              const size_type GID = inputleft.row_partitioner().GID64(i);
+              for (TrilinosWrappers::types::int_type j=0; j<num_entries; ++j)
+                transposed_mat.set (inputleft.col_partitioner().GID64(indices[j]),
+                                    GID, values[j]);
+#endif
             }
           transposed_mat.compress();
           ML_Operator_WrapEpetraCrsMatrix
diff --git a/tests/mpi/matrix_free_04.cc b/tests/mpi/matrix_free_04.cc
index ec1a7012ae..f5e20b6aa9 100644
--- a/tests/mpi/matrix_free_04.cc
+++ b/tests/mpi/matrix_free_04.cc
@@ -208,7 +208,7 @@ void test ()
     const unsigned int   n_q_points    = quadrature_formula.size();
 
     FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     typename DoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active(),
-- 
2.39.5