From 9b06d6e17c1ef6d6a3e5b0506de305da740279c7 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 14 Feb 2017 14:37:24 +0100 Subject: [PATCH] Don't allow 64bit-indices in PreconditionAMGMueLu --- include/deal.II/lac/trilinos_precondition.h | 10 ++++++++-- source/lac/trilinos_precondition_muelu.cc | 10 ++++++++++ ...=on.with_trilinos=on.with_64bit_indices=off.output} | 0 ...=on.with_trilinos=on.with_64bit_indices=off.output} | 0 4 files changed, 18 insertions(+), 2 deletions(-) rename tests/lac/{linear_operator_10.with_cxx11=on.with_trilinos=on.output => linear_operator_10.with_cxx11=on.with_trilinos=on.with_64bit_indices=off.output} (100%) rename tests/lac/{linear_operator_10a.with_cxx11=on.with_trilinos=on.output => linear_operator_10a.with_cxx11=on.with_trilinos=on.with_64bit_indices=off.output} (100%) diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 734512ee1d..94d6b3f97f 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -1618,9 +1618,10 @@ namespace TrilinosWrappers * except for the higher_order_elements parameter which does not exist in * PreconditionerAMGMueLu. * - * This class requires Trilinos 11.14 or higher. + * @note This class requires Trilinos 11.14 or higher. At the moment 64bit-indices + * are not supported. * - * This interface should not be considered as stable. + * @warning This interface should not be considered as stable. * * @ingroup TrilinosWrappers * @ingroup Preconditioners @@ -1762,6 +1763,11 @@ namespace TrilinosWrappers const char *coarse_type; }; + /** + * Constructor. + */ + PreconditionAMGMueLu(); + /** * Destructor. */ diff --git a/source/lac/trilinos_precondition_muelu.cc b/source/lac/trilinos_precondition_muelu.cc index 149783fb9f..834bf228ac 100644 --- a/source/lac/trilinos_precondition_muelu.cc +++ b/source/lac/trilinos_precondition_muelu.cc @@ -100,6 +100,16 @@ namespace TrilinosWrappers {} + + PreconditionAMGMueLu::PreconditionAMGMueLu() + { +#ifdef DEAL_II_WITH_64BIT_INDICES + AssertThrow (false, ExcMessage("PreconditionAMGMueLu does not support 64bit-indices!")); +#endif + } + + + PreconditionAMGMueLu::~PreconditionAMGMueLu() { preconditioner.reset(); diff --git a/tests/lac/linear_operator_10.with_cxx11=on.with_trilinos=on.output b/tests/lac/linear_operator_10.with_cxx11=on.with_trilinos=on.with_64bit_indices=off.output similarity index 100% rename from tests/lac/linear_operator_10.with_cxx11=on.with_trilinos=on.output rename to tests/lac/linear_operator_10.with_cxx11=on.with_trilinos=on.with_64bit_indices=off.output diff --git a/tests/lac/linear_operator_10a.with_cxx11=on.with_trilinos=on.output b/tests/lac/linear_operator_10a.with_cxx11=on.with_trilinos=on.with_64bit_indices=off.output similarity index 100% rename from tests/lac/linear_operator_10a.with_cxx11=on.with_trilinos=on.output rename to tests/lac/linear_operator_10a.with_cxx11=on.with_trilinos=on.with_64bit_indices=off.output -- 2.39.5