From bdd82a4b7c7253fce57d47bc351575b34f49f853 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Wed, 6 Nov 2013 18:01:36 +0000 Subject: [PATCH] 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 --- deal.II/source/lac/trilinos_sparse_matrix.cc | 9 +++++++++ tests/mpi/trilinos_sparse_matrix_mmult_01.cc | 2 +- ...trilinos=true.with_64bit_indices=off.mpirun=1.output} | 0 ...trilinos=true.with_64bit_indices=off.mpirun=2.output} | 0 4 files changed, 10 insertions(+), 1 deletion(-) rename tests/mpi/{trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=1.output => trilinos_sparse_matrix_mmult_01.with_trilinos=true.with_64bit_indices=off.mpirun=1.output} (100%) rename tests/mpi/{trilinos_sparse_matrix_mmult_01.with_trilinos=true.mpirun=2.output => trilinos_sparse_matrix_mmult_01.with_trilinos=true.with_64bit_indices=off.mpirun=2.output} (100%) diff --git a/deal.II/source/lac/trilinos_sparse_matrix.cc b/deal.II/source/lac/trilinos_sparse_matrix.cc index dddb391a86..8423493505 100644 --- 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 95de7822ea..0c454fdfc9 100644 --- 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 -- 2.39.5