mmult and Tmmult cannot be used with Trilinos sparse_matrix and 64bit indices.

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

diff --git a/deal.II/source/lac/trilinos_sparse_matrix.cc b/deal.II/source/lac/trilinos_sparse_matrix.cc
index dddb391a86683dec5c13d7e9450fb091d6abd180..84234935054057cc9398c1617939eee18e8bff9d 100644 (file)
--- a/deal.II/source/lac/trilinos_sparse_matrix.cc
+++ b/deal.II/source/lac/trilinos_sparse_matrix.cc
@@ -1040,6 +1040,9 @@ namespace TrilinosWrappers
                         const VectorBase   &V,
                         const bool          transpose_left)
     {
+#ifdef DEAL_II_USE_LARGE_INDEX_TYPE
+      Assert(false,ExcNotImplemented())
+#endif
       const bool use_vector = (V.size() == inputright.m() ? true : false);
       if (transpose_left == false)
         {
@@ -1254,6 +1257,9 @@ namespace TrilinosWrappers
                        const SparseMatrix &B,
                        const VectorBase   &V) const
   {
+#ifdef DEAL_II_USE_LARGE_INDEX_TYPE
+    Assert(false,ExcNotImplemented())
+#endif
     internals::perform_mmult (*this, B, C, V, false);
   }
 
@@ -1264,6 +1270,9 @@ namespace TrilinosWrappers
                         const SparseMatrix &B,
                         const VectorBase   &V) const
   {
+#ifdef DEAL_II_USE_LARGE_INDEX_TYPE
+    Assert(false,ExcNotImplemented())
+#endif
     internals::perform_mmult (*this, B, C, V, true);
   }
 

diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
index 95de7822ea88e0a15414578d85bbf2d1c90eaff2..0c454fdfc98726780c9d56a942059578d2935a87 100644 (file)
--- a/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
+++ b/tests/mpi/trilinos_sparse_matrix_mmult_01.cc
@@ -142,7 +142,7 @@ void test ()
   if ((n_procs == 1) || (my_id == 1))
     Assert(AtA.el(1, 1) == 2, ExcMessage("Wrong element in AtA!"));
 
-  deallog << "OK" << endl;
+  deallog << "OK" << std::endl;
 }
 
 

diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=1.output b/tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.with_64bit_indices=off.mpirun=1.output
similarity index 100%
rename from tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=1.output
rename to tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.with_64bit_indices=off.mpirun=1.output

diff --git a/tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=2.output b/tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.with_64bit_indices=off.mpirun=2.output
similarity index 100%
rename from tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=2.output
rename to tests/mpi/trilinos_sparse_matrix_mmult_01.with_trilinos=true.with_64bit_indices=off.mpirun=2.output