]> https://gitweb.dealii.org/ - dealii.git/commitdiff
hide trilinos 16 deprecation warnings 18643/head
authorTimo Heister <timo.heister@gmail.com>
Tue, 8 Jul 2025 21:17:36 +0000 (17:17 -0400)
committerTimo Heister <timo.heister@gmail.com>
Tue, 8 Jul 2025 22:29:01 +0000 (18:29 -0400)
Trilinos 16 deprecates various packages (epetra, ML, AztecOO) and
including any of the headers prints a warning. Let's hide it for now.

23 files changed:
include/deal.II/base/config.h.in
include/deal.II/base/index_set.h
include/deal.II/base/trilinos_utilities.h
include/deal.II/lac/read_write_vector.h
include/deal.II/lac/read_write_vector.templates.h
include/deal.II/lac/trilinos_epetra_communication_pattern.h
include/deal.II/lac/trilinos_epetra_vector.h
include/deal.II/lac/trilinos_index_access.h
include/deal.II/lac/trilinos_precondition.h
include/deal.II/lac/trilinos_solver.h
include/deal.II/lac/trilinos_sparse_matrix.h
include/deal.II/lac/trilinos_sparsity_pattern.h
include/deal.II/lac/trilinos_vector.h
source/base/index_set.cc
source/base/init_finalize.cc
source/base/trilinos_utilities.cc
source/lac/trilinos_epetra_communication_pattern.cc
source/lac/trilinos_precondition.cc
source/lac/trilinos_precondition_ml.cc
source/lac/trilinos_solver.cc
source/lac/trilinos_sparse_matrix.cc
source/lac/trilinos_sparsity_pattern.cc
source/lac/trilinos_vector.cc

index 79f3cc8b2e71d10cadf85a3ff63a5743b6e75342..6ace58067e4f12d9451e76886cd9c16d3b398f9e 100644 (file)
@@ -604,6 +604,7 @@ _Pragma("GCC diagnostic ignored \"-Wunknown-warning\"")           /*!*/ \
 _Pragma("GCC diagnostic ignored \"-Wextra\"")                     /*!*/ \
 _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"")        \
 _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"")              \
+_Pragma("GCC diagnostic ignored \"-Wcpp\"")                             \
 _Pragma("GCC diagnostic ignored \"-Wdeprecated-copy\"")                 \
 _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")         \
 _Pragma("GCC diagnostic ignored \"-Wdeprecated-volatile\"")             \
index 83c07a9d839293f7d72d5d65cfb7f7951fe0898c..8d814f3ed87dbe01ec111d730064c35a97c75760 100644 (file)
 
 
 #ifdef DEAL_II_WITH_TRILINOS
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Map.h>
 #  ifdef DEAL_II_TRILINOS_WITH_TPETRA
 #    include <Tpetra_Map.hpp>
 #  endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 #endif
 
 #ifdef DEAL_II_WITH_PETSC
index 4330ee6b012a89186f76c0b0210eec3489bf4f55..fa52516a526f98dde6716c24f0aca1290a520502 100644 (file)
@@ -20,6 +20,8 @@
 #include <deal.II/base/exceptions.h>
 
 #ifdef DEAL_II_WITH_TRILINOS
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Comm.h>
 #  include <Epetra_Map.h>
 #  include <Teuchos_Comm.hpp>
@@ -34,6 +36,7 @@
 #  ifdef DEAL_II_TRILINOS_WITH_TPETRA
 #    include <Teuchos_RCPDecl.hpp>
 #  endif // DEAL_II_TRILINOS_WITH_TPETRA
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 
index 16e74943b9896808b8a9428e1b2e2d0cde34ed3c..b9dce08d893672c0a71ca2f82ef5560c76ced616 100644 (file)
@@ -39,7 +39,9 @@
 #  include <deal.II/lac/trilinos_tpetra_block_vector.h>
 #  include <deal.II/lac/trilinos_tpetra_vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_MultiVector.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #endif
 
index beab1a7a79708382a80270d934610965ee658467..f604abaf24e03732d8222d4a65f1a46bbbc00ecc 100644 (file)
@@ -34,7 +34,9 @@
 #  include <deal.II/lac/trilinos_epetra_communication_pattern.h>
 #  include <deal.II/lac/trilinos_vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Import.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 #include <boost/io/ios_state.hpp>
index e2549d4ed6ca4038593fde2d7008405fa21eb864..c45a47baeccde4cbc0403727b38b361e78f2139b 100644 (file)
@@ -22,7 +22,9 @@
 
 #  include <deal.II/base/communication_pattern_base.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Import.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <memory>
 
index 56d79202b0ac119f8d82681bdbd854b846a6b58b..7538280adcc3fc5023ced5b020ec228fd1c17717 100644 (file)
@@ -28,7 +28,9 @@
 #  include <deal.II/lac/vector_operation.h>
 #  include <deal.II/lac/vector_type_traits.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_FEVector.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <memory>
 
index 1f6015439c78acc1e4446df0f919ad1c2e31287e..20c9b8c6f493fdafe65d5eb2c4fa3fb575462017 100644 (file)
 
 #  include <deal.II/base/types.h>
 
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_BlockMap.h>
 #  include <Epetra_CrsGraph.h>
 #  include <Epetra_CrsMatrix.h>
 #  include <Epetra_MultiVector.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 
index 07a1faed34a3b505dd401e505bc51a816e728895..47c28e50d88ceb6bbe09c9271a0be8e228af0a4f 100644 (file)
 #  include <deal.II/lac/la_parallel_vector.h>
 #  include <deal.II/lac/trilinos_vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Map.h>
 #  include <Epetra_MpiComm.h>
 #  include <Epetra_MultiVector.h>
 #  include <Epetra_RowMatrix.h>
 #  include <Epetra_Vector.h>
 #  include <Teuchos_ParameterList.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <memory>
 
index cc2d794b509352d5a8baeedfb9f5133caf273766..ad1edc1e5405a8295bafbc1454a9d148dbd39309 100644 (file)
@@ -27,6 +27,8 @@
 #  include <deal.II/lac/solver_control.h>
 #  include <deal.II/lac/vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+
 // for AztecOO solvers
 #  include <Amesos.h>
 #  include <AztecOO.h>
@@ -44,6 +46,9 @@
 #    include <BelosSolverManager.hpp>
 #  endif
 
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
+
 #  include <memory>
 
 
index a068c709f8b86e3a85df2433ce818d26a0e0f2ef..50be96adce46d577835c71a53d82078369c4300e 100644 (file)
@@ -33,6 +33,7 @@
 #    include <deal.II/lac/vector_memory.h>
 #    include <deal.II/lac/vector_operation.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #    include <Epetra_Comm.h>
 #    include <Epetra_CrsGraph.h>
 #    include <Epetra_Export.h>
@@ -41,6 +42,7 @@
 #    include <Epetra_MpiComm.h>
 #    include <Epetra_MultiVector.h>
 #    include <Epetra_Operator.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #    include <cmath>
 #    include <iterator>
index 648dd8a2749f2500be1431ee72f0aed5b8558f53..9120a092d212a30146cf4d7d488b3fe9733252b7 100644 (file)
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/sparsity_pattern_base.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_FECrsGraph.h>
 #  include <Epetra_Map.h>
 #  include <Epetra_MpiComm.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <cmath>
 #  include <memory>
index 69fb3bd655f1d6427127f3247e674a4bdfaffd46..d26c0bb45d7773c86a8a1c7ffd63daffbf6de1b0 100644 (file)
 #  include <deal.II/lac/vector_operation.h>
 #  include <deal.II/lac/vector_type_traits.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_ConfigDefs.h>
 #  include <Epetra_FEVector.h>
 #  include <Epetra_LocalMap.h>
 #  include <Epetra_Map.h>
 #  include <Epetra_MpiComm.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <memory>
 #  include <utility>
index ebe95647de30fa9b7c45be1870e01df7276a254a..ec0c536b395914f13ac713608bba4268d4092dea 100644 (file)
@@ -24,6 +24,7 @@
 #include <vector>
 
 #ifdef DEAL_II_WITH_TRILINOS
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #  endif
@@ -32,6 +33,7 @@
 #  ifdef DEAL_II_TRILINOS_WITH_TPETRA
 #    include <Tpetra_Map.hpp>
 #  endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 DEAL_II_NAMESPACE_OPEN
index d9bde45743ea6422b23c63fecbd129ec6d99a3b7..081fdaaf6deac3f46b03dc0f5c7b7f2643e136da 100644 (file)
@@ -28,7 +28,9 @@
 #    include <deal.II/lac/trilinos_parallel_block_vector.h>
 #    include <deal.II/lac/trilinos_vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #    include <Epetra_MpiComm.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #  endif
 #endif
 
index 2cec4843fbe2cab83da53406f8158c72e1d337d5..a64a0536e585a909167f3790127eed4ba0cabd70 100644 (file)
 #include <deal.II/base/trilinos_utilities.h>
 
 #ifdef DEAL_II_WITH_TRILINOS
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #    include <Teuchos_DefaultComm.hpp>
 #  endif
 #  include <Epetra_SerialComm.h>
 #  include <Teuchos_RCP.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #endif
 
 DEAL_II_NAMESPACE_OPEN
index 71a927808561d900d720dd1ca1836809b14d2e63..5d1afa2409600a50050e0dc40e05124896aefde2 100644 (file)
@@ -18,7 +18,9 @@
 
 #  include <deal.II/base/index_set.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Map.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <memory>
 
index a62048736c0332869da2d519e3a43e714d544110..f40156fa45cb745f64d50c3f0456c77371a793a3 100644 (file)
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 #  include <deal.II/lac/vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_MultiVector.h>
 #  include <Ifpack.h>
 #  include <Ifpack_Chebyshev.h>
 #  include <Teuchos_ParameterList.hpp>
 #  include <Teuchos_RCP.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 
index 3b4195c42c7c3f9a6ae53734726518bb843d81fb..c5e863599c49697ac6a416b01d1d27f0fa9afa2c 100644 (file)
@@ -21,6 +21,8 @@
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 #  include <deal.II/lac/vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+
 #  include <Epetra_MultiVector.h>
 #  include <Ifpack.h>
 #  include <Ifpack_Chebyshev.h>
@@ -29,6 +31,8 @@
 #  include <ml_MultiLevelPreconditioner.h>
 #  include <ml_include.h>
 
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 DEAL_II_NAMESPACE_OPEN
 
 namespace TrilinosWrappers
index d1b570513583f068f80f0116e2f9b4e14b8b1b29..c6cd7a2bb5120d2b9e450ff25cb0be99a9aa2a33 100644 (file)
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 #  include <deal.II/lac/trilinos_vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+
 #  include <AztecOO_StatusTest.h>
 #  include <AztecOO_StatusTestCombo.h>
 #  include <AztecOO_StatusTestMaxIters.h>
 #  include <AztecOO_StatusTestResNorm.h>
 #  include <AztecOO_StatusType.h>
 
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 #  include <cmath>
 #  include <limits>
 #  include <memory>
index ff8490bdcd043be26ed3abb1262cce46f9dd3203..78c2616336b3255f4a44612f1ebb51d40cbe8a33 100644 (file)
@@ -29,6 +29,7 @@
 
 #  include <boost/container/small_vector.hpp>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  ifdef DEAL_II_TRILINOS_WITH_EPETRAEXT
 #    include <EpetraExt_MatrixMatrix.h>
 #  endif
@@ -36,6 +37,7 @@
 #  include <Teuchos_RCP.hpp>
 #  include <ml_epetra_utils.h>
 #  include <ml_struct.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <memory>
 
index 0b3f262eb3ed39b1542d73c8cae51d10f1ca0414..d0ccc47fad39db5a53716d502fe8682b1ff800f8 100644 (file)
@@ -23,7 +23,9 @@
 #  include <deal.II/lac/dynamic_sparsity_pattern.h>
 #  include <deal.II/lac/sparsity_pattern.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Export.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <limits>
 
index b64bb9cb5ffcaabfd6173e46f1128e112a70029d..e4d5a20ced6d395a652a3ed283c319df4e653f34 100644 (file)
 
 #  include <boost/io/ios_state.hpp>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Export.h>
 #  include <Epetra_Import.h>
 #  include <Epetra_Vector.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <cmath>
 #  include <memory>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.