diff --git a/.github/workflows/AT2.yml b/.github/workflows/AT2.yml index 60d5783aaf0c..df2699da2911 100644 --- a/.github/workflows/AT2.yml +++ b/.github/workflows/AT2.yml @@ -41,7 +41,7 @@ jobs: mkdir -p /home/Trilinos/src/Trilinos mkdir -p /home/Trilinos/build - name: Clone trilinos - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 - name: Repo status @@ -99,7 +99,7 @@ jobs: mkdir -p /home/Trilinos/src/Trilinos mkdir -p /home/Trilinos/build - name: Clone trilinos - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 - name: Repo status diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index e2f4a95d5923..2b0db47934e2 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: DoozyX/clang-format-lint-action@11b773b1598aa4ae3b32f023701bca5201c3817d # v0.17 with: source: './packages/muelu ./packages/tempus ./packages/teko ./packages/xpetra' diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c34ce3bb323a..36b81d5546b8 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -58,11 +58,11 @@ jobs: # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 + uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} @@ -85,6 +85,6 @@ jobs: make -j 2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 + uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index a5729061f210..ac8eff6e6b63 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,11 +17,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 with: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4.2.5 + uses: actions/dependency-review-action@e58c696e52cac8e62d61cc21fda89565d71505d7 # v4.3.1 diff --git a/.github/workflows/detect-git-lfs.yml b/.github/workflows/detect-git-lfs.yml index 484ac13824f1..06cd90e99b11 100644 --- a/.github/workflows/detect-git-lfs.yml +++ b/.github/workflows/detect-git-lfs.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 diff --git a/.github/workflows/detect-mpi-comm-world.yml b/.github/workflows/detect-mpi-comm-world.yml index 82ea4178dd5c..10aa15be20e2 100644 --- a/.github/workflows/detect-mpi-comm-world.yml +++ b/.github/workflows/detect-mpi-comm-world.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 1d3f33b14f4a..08b048658f7f 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -31,7 +31,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: persist-credentials: false @@ -66,6 +66,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 + uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: sarif_file: results.sarif diff --git a/.github/workflows/spack.yml b/.github/workflows/spack.yml index a240e42eac09..9791ed876496 100644 --- a/.github/workflows/spack.yml +++ b/.github/workflows/spack.yml @@ -24,7 +24,7 @@ jobs: with: access_token: ${{ github.token }} - name: Clone Trilinos - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 1 - name: Spack build diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d6850024e60..e4fe85ecbd39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,6 +133,9 @@ IF(enabled_deprecated_packages) message("********************************************************************") message("") message(WARNING "Deprecated packages that are enabled: ${enabled_deprecated_packages}") + IF(Trilinos_HIDE_DEPRECATED_CODE) + message(FATAL_ERROR "Trilinos cannot be built with deprecated code hidden if any deprecated packages are enabled!") + ENDIF() ENDIF() message(STATUS "If publishing results using Trilinos, please cite us: https://trilinos.github.io/cite.html") diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 233ba94b5539..e75e9b40a736 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -16,6 +16,11 @@ Framework the user is depending on (e.g. if you depend on ThyraEpetraAdapters, enable that explicitly instead of Thyra and Epetra and allowing TriBITS to enable the adapters). + - Added deprecation warnings to all deprecated packages. The warnings are able + to be disabled via the `Trilinos_SHOW_DEPRECATED_WARNINGS` option (this is + also available as a per-package option). These warnings are intended to + notify users that pacakge capability they are using will be removed in upcoming + releases. ############################################################################### # # diff --git a/packages/PyTrilinos/CMakeLists.txt b/packages/PyTrilinos/CMakeLists.txt index e5d4b8305b6b..6f39f27d75b7 100644 --- a/packages/PyTrilinos/CMakeLists.txt +++ b/packages/PyTrilinos/CMakeLists.txt @@ -54,6 +54,8 @@ ENDIF() # Set the package version number SET(PyTrilinos_VERSION ${Trilinos_VERSION}) +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() + # Define the list of PyTrilinos packages and modules. Packages are # the top-level names only, such as Epetra, AztecOO and NOX. The list # of modules is similar to the packages, except it contains the names diff --git a/packages/PyTrilinos/cmake/PyTrilinos_config.h.in b/packages/PyTrilinos/cmake/PyTrilinos_config.h.in index 114fe916bd59..c4aed8c0e401 100644 --- a/packages/PyTrilinos/cmake/PyTrilinos_config.h.in +++ b/packages/PyTrilinos/cmake/PyTrilinos_config.h.in @@ -165,3 +165,6 @@ #endif #endif + +#cmakedefine PyTrilinos_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/PyTrilinos/src/PyTrilinos_Amesos_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Amesos_Headers.hpp index 8370a4419dbc..6a0d449b65e6 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Amesos_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Amesos_Headers.hpp @@ -82,3 +82,10 @@ #endif #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Anasazi_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Anasazi_Headers.hpp index 06b63e5d899c..b422d296902f 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Anasazi_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Anasazi_Headers.hpp @@ -81,3 +81,10 @@ #endif #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_AztecOO_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_AztecOO_Headers.hpp index ac85e23e3426..b16de5d64f49 100644 --- a/packages/PyTrilinos/src/PyTrilinos_AztecOO_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_AztecOO_Headers.hpp @@ -52,3 +52,10 @@ #include "AztecOO_Version.h" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_DAP.hpp b/packages/PyTrilinos/src/PyTrilinos_DAP.hpp index f3a0905b169a..132d16099215 100644 --- a/packages/PyTrilinos/src/PyTrilinos_DAP.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_DAP.hpp @@ -139,3 +139,10 @@ class DistArrayProtocol } #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Domi_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Domi_Headers.hpp index 7b583270e7bf..b8976189658f 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Domi_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Domi_Headers.hpp @@ -61,3 +61,10 @@ #include "Domi_MDVector.hpp" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Domi_Util.hpp b/packages/PyTrilinos/src/PyTrilinos_Domi_Util.hpp index ba12ab9210c4..eda3c6892a75 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Domi_Util.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Domi_Util.hpp @@ -318,3 +318,10 @@ convertToDistArray(Domi::MDVector< Scalar > & mdVector) } #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_EpetraExt_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_EpetraExt_Headers.hpp index 8cf6703dd08b..2558a80ed62f 100644 --- a/packages/PyTrilinos/src/PyTrilinos_EpetraExt_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_EpetraExt_Headers.hpp @@ -72,3 +72,10 @@ #endif #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_EpetraExt_Util.hpp b/packages/PyTrilinos/src/PyTrilinos_EpetraExt_Util.hpp index 8ae7ddf318c8..594e17e1af82 100644 --- a/packages/PyTrilinos/src/PyTrilinos_EpetraExt_Util.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_EpetraExt_Util.hpp @@ -212,3 +212,10 @@ convertArrayOfIntToPython(const Teuchos::Array & tai); } // Namespace PyTrilinos #endif // PYTRILINOS_EPETRAEXT_UTIL_HPP + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Epetra_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Epetra_Headers.hpp index f85637411ab9..7a92415c3319 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Epetra_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Epetra_Headers.hpp @@ -83,3 +83,10 @@ #include "PyTrilinos_Epetra_Util.hpp" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Epetra_Util.hpp b/packages/PyTrilinos/src/PyTrilinos_Epetra_Util.hpp index 7b504ed7d3cb..6d6bc227b329 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Epetra_Util.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Epetra_Util.hpp @@ -232,3 +232,10 @@ convertToDistArray(const Epetra_MultiVector & emv); } // Namespace PyTrilinos #endif // PYTRILINOS_EPETRA_UTIL_HPP + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_FILEstream.hpp b/packages/PyTrilinos/src/PyTrilinos_FILEstream.hpp index 2a70d8d80649..a8de6cdf2a4e 100644 --- a/packages/PyTrilinos/src/PyTrilinos_FILEstream.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_FILEstream.hpp @@ -73,3 +73,10 @@ class FILEstream : public std::streambuf } // Namespace PyTrilinos #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Galeri_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Galeri_Headers.hpp index f209c662f69e..744732136628 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Galeri_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Galeri_Headers.hpp @@ -56,3 +56,10 @@ #include "Galeri_ReadHB.h" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_IFPACK_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_IFPACK_Headers.hpp index 42fff9f8c9d5..2a20287bf8e7 100644 --- a/packages/PyTrilinos/src/PyTrilinos_IFPACK_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_IFPACK_Headers.hpp @@ -60,3 +60,10 @@ #include "Ifpack_Amesos.h" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Isorropia_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Isorropia_Headers.hpp index 046ab4ebedc4..346acf451d3f 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Isorropia_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Isorropia_Headers.hpp @@ -73,3 +73,10 @@ #endif #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Komplex_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Komplex_Headers.hpp index 136c73a3ac49..bbd5c204e65b 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Komplex_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Komplex_Headers.hpp @@ -55,3 +55,10 @@ #include "Komplex_LinearProblem.h" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_LOCA_Epetra_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_LOCA_Epetra_Headers.hpp index 6bb3a143a6ab..9a04d2da5e31 100644 --- a/packages/PyTrilinos/src/PyTrilinos_LOCA_Epetra_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_LOCA_Epetra_Headers.hpp @@ -52,3 +52,10 @@ #include "LOCA_Epetra_Interface_TimeDependentMatrixFree.H" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_LOCA_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_LOCA_Headers.hpp index fc9e78cabee9..9b8727020e6d 100644 --- a/packages/PyTrilinos/src/PyTrilinos_LOCA_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_LOCA_Headers.hpp @@ -55,3 +55,10 @@ #include "LOCA_SaveEigenData_DefaultStrategy.H" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_LOCA_Hopf_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_LOCA_Hopf_Headers.hpp index 5faccd0da164..529162899cd4 100644 --- a/packages/PyTrilinos/src/PyTrilinos_LOCA_Hopf_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_LOCA_Hopf_Headers.hpp @@ -54,3 +54,10 @@ #include "LOCA_Hopf_MinimallyAugmented_Constraint.H" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_LinearProblem.hpp b/packages/PyTrilinos/src/PyTrilinos_LinearProblem.hpp index 9c7f3611badc..ccf81f7089bb 100644 --- a/packages/PyTrilinos/src/PyTrilinos_LinearProblem.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_LinearProblem.hpp @@ -106,3 +106,10 @@ class LinearProblem : public Epetra_LinearProblem } #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_ML_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_ML_Headers.hpp index cf68946e71b2..a18748cd6c23 100644 --- a/packages/PyTrilinos/src/PyTrilinos_ML_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_ML_Headers.hpp @@ -62,3 +62,10 @@ #undef Copy #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_ML_Util.hpp b/packages/PyTrilinos/src/PyTrilinos_ML_Util.hpp index f9cbf4136aa9..7daa02cd9fb7 100644 --- a/packages/PyTrilinos/src/PyTrilinos_ML_Util.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_ML_Util.hpp @@ -89,3 +89,10 @@ class PyMatrix : public MLAPI::Operator } // Namespace PyTrilinos #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_NOX_Abstract_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_NOX_Abstract_Headers.hpp index c9fd587352d3..855cab1e39e9 100644 --- a/packages/PyTrilinos/src/PyTrilinos_NOX_Abstract_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_NOX_Abstract_Headers.hpp @@ -55,3 +55,10 @@ #include "NOX_Solver_Generic.H" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_NOX_Epetra_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_NOX_Epetra_Headers.hpp index 7c6de3801bec..f73dfc730dd9 100644 --- a/packages/PyTrilinos/src/PyTrilinos_NOX_Epetra_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_NOX_Epetra_Headers.hpp @@ -65,3 +65,10 @@ #include "NOX_Epetra_Interface_Preconditioner.H" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_NOX_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_NOX_Headers.hpp index 0d145b4d3801..bd78ec49f4ec 100644 --- a/packages/PyTrilinos/src/PyTrilinos_NOX_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_NOX_Headers.hpp @@ -50,3 +50,10 @@ // NOX include files #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_NOX_PETSc_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_NOX_PETSc_Headers.hpp index 7b3962400ce6..2e85ab393b1f 100644 --- a/packages/PyTrilinos/src/PyTrilinos_NOX_PETSc_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_NOX_PETSc_Headers.hpp @@ -51,3 +51,10 @@ #include "NOX_Petsc.H" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_NOX_Solver_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_NOX_Solver_Headers.hpp index d34013be91ea..2c051a3cacf3 100644 --- a/packages/PyTrilinos/src/PyTrilinos_NOX_Solver_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_NOX_Solver_Headers.hpp @@ -56,3 +56,10 @@ #include "NOX_Solver_Factory.H" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_NOX_StatusTest_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_NOX_StatusTest_Headers.hpp index 54a4a3d4bdd9..30d87bd709e8 100644 --- a/packages/PyTrilinos/src/PyTrilinos_NOX_StatusTest_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_NOX_StatusTest_Headers.hpp @@ -58,3 +58,10 @@ #include "NOX_StatusTest_FiniteValue.H" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_NumPyImporter.hpp b/packages/PyTrilinos/src/PyTrilinos_NumPyImporter.hpp index 98f00180ca65..e4a33b4a6977 100644 --- a/packages/PyTrilinos/src/PyTrilinos_NumPyImporter.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_NumPyImporter.hpp @@ -86,3 +86,10 @@ class NumPyImporter } // Namespace PyTrilinos #endif // PYTRILINOS_NUMPYIMPORTER_HPP + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_NumPy_Util.hpp b/packages/PyTrilinos/src/PyTrilinos_NumPy_Util.hpp index 3a84605be521..02d70ea39f19 100644 --- a/packages/PyTrilinos/src/PyTrilinos_NumPy_Util.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_NumPy_Util.hpp @@ -62,3 +62,10 @@ int NumPy_TypeCode(); } #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Pliris_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Pliris_Headers.hpp index a55d2b467bce..ae9b2fe3ffeb 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Pliris_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Pliris_Headers.hpp @@ -52,3 +52,10 @@ #include "Pliris.h" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_PythonException.hpp b/packages/PyTrilinos/src/PyTrilinos_PythonException.hpp index 9420db5fa010..61233b278000 100644 --- a/packages/PyTrilinos/src/PyTrilinos_PythonException.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_PythonException.hpp @@ -97,3 +97,10 @@ class PythonException : public std::runtime_error } // Namespace PyTrilinos #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Teuchos_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Teuchos_Headers.hpp index 4a2f70b4d5e8..304cb950eb14 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Teuchos_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Teuchos_Headers.hpp @@ -98,3 +98,10 @@ #include "Teuchos_iostream_helpers.hpp" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Teuchos_Util.hpp b/packages/PyTrilinos/src/PyTrilinos_Teuchos_Util.hpp index 626ef0385275..3e1a2a3f7c5d 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Teuchos_Util.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Teuchos_Util.hpp @@ -400,3 +400,10 @@ parameterListToNewPyDict(const Teuchos::ParameterList & plist, } // Namespace PyTrilinos #endif // PYTRILINOS_TEUCHOS_UTIL_HPP + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Tpetra_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_Tpetra_Headers.hpp index 71cddbe78b86..27ad893878b7 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Tpetra_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Tpetra_Headers.hpp @@ -56,3 +56,10 @@ #include "Tpetra_Vector.hpp" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Tpetra_Util.hpp b/packages/PyTrilinos/src/PyTrilinos_Tpetra_Util.hpp index 0366ec29f945..693351a3b8cc 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Tpetra_Util.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Tpetra_Util.hpp @@ -199,3 +199,10 @@ convertToDistArray(const Tpetra::MultiVector< Scalar, } #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_TriUtils_Headers.hpp b/packages/PyTrilinos/src/PyTrilinos_TriUtils_Headers.hpp index 5efce9646ccd..3a609dc635a0 100644 --- a/packages/PyTrilinos/src/PyTrilinos_TriUtils_Headers.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_TriUtils_Headers.hpp @@ -51,3 +51,10 @@ #include "Trilinos_Util_Version.h" #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/PyTrilinos_Util.hpp b/packages/PyTrilinos/src/PyTrilinos_Util.hpp index dcd7a47b32bb..1395ac337386 100644 --- a/packages/PyTrilinos/src/PyTrilinos_Util.hpp +++ b/packages/PyTrilinos/src/PyTrilinos_Util.hpp @@ -109,3 +109,10 @@ CONST char * getStringItemObjectAttr(PyObject * object, CONST char * name, int i } // Namespace PyTrilinos #endif // PYTRILINOS_UTIL_HPP + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/Python3Compat.hpp b/packages/PyTrilinos/src/Python3Compat.hpp index 021bff441cd8..cc77c04d47b3 100644 --- a/packages/PyTrilinos/src/Python3Compat.hpp +++ b/packages/PyTrilinos/src/Python3Compat.hpp @@ -81,3 +81,10 @@ #endif #endif + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/PyTrilinos/src/numpy_include.hpp b/packages/PyTrilinos/src/numpy_include.hpp index 9fb1ad5eab92..88aead85adbd 100644 --- a/packages/PyTrilinos/src/numpy_include.hpp +++ b/packages/PyTrilinos/src/numpy_include.hpp @@ -74,3 +74,10 @@ #endif #endif // NUMPY_INCLUDE_HPP + +#if defined(PyTrilinos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The PyTrilinos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/CMakeLists.txt b/packages/amesos/CMakeLists.txt index b88392029229..4edc61c95859 100644 --- a/packages/amesos/CMakeLists.txt +++ b/packages/amesos/CMakeLists.txt @@ -9,6 +9,9 @@ TRIBITS_PACKAGE(Amesos) # # B) Set up package-specific options # + +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() + ADVANCED_SET(Amesos_Allow_SuperLUDist_Without_ParMETIS OFF CACHE BOOL "Allow Amesos to use the SuperLUDist TPL without the enable of the ParMETIS TPL") if (NOT Amesos_Allow_SuperLUDist_Without_ParMETIS) diff --git a/packages/amesos/cmake/Amesos_config.h.in b/packages/amesos/cmake/Amesos_config.h.in index 93d574d02ec4..590b92a78c30 100644 --- a/packages/amesos/cmake/Amesos_config.h.in +++ b/packages/amesos/cmake/Amesos_config.h.in @@ -96,3 +96,6 @@ /* Define to 1 if SuperLU's *gssvx and *gsisx routines need a GlobalLU_t argument. */ #cmakedefine HAVE_AMESOS_SUPERLU5_API + +#cmakedefine Amesos_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/amesos/src/Amesos.h b/packages/amesos/src/Amesos.h index c418b6f6a60d..c199894f02b0 100644 --- a/packages/amesos/src/Amesos.h +++ b/packages/amesos/src/Amesos.h @@ -92,3 +92,10 @@ class Amesos { }; // End of class Amesos #endif /* _AMESOS_FACTORY_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_BTF.h b/packages/amesos/src/Amesos_BTF.h index 2674a2f7a058..b55209ea2291 100644 --- a/packages/amesos/src/Amesos_BTF.h +++ b/packages/amesos/src/Amesos_BTF.h @@ -220,3 +220,10 @@ revert to their default values. }; // End of class Amesos_Btf #endif /* _AMESOS_BTF_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_BaseSolver.h b/packages/amesos/src/Amesos_BaseSolver.h index d288371da3eb..26310fe69a52 100644 --- a/packages/amesos/src/Amesos_BaseSolver.h +++ b/packages/amesos/src/Amesos_BaseSolver.h @@ -442,3 +442,10 @@ revert to their default values. }; #endif /* _AMESOS_BASESOLVER_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_CSparse.h b/packages/amesos/src/Amesos_CSparse.h index 5ae1abbed4f9..e05f8f0c30b4 100644 --- a/packages/amesos/src/Amesos_CSparse.h +++ b/packages/amesos/src/Amesos_CSparse.h @@ -214,3 +214,10 @@ class Amesos_CSparse: public Amesos_BaseSolver, #endif #endif // AMESOS_CSPARSE_H + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Component.h b/packages/amesos/src/Amesos_Component.h index ce89877465a1..53c6c4378ec6 100644 --- a/packages/amesos/src/Amesos_Component.h +++ b/packages/amesos/src/Amesos_Component.h @@ -209,3 +209,10 @@ class Amesos_Component { }; #endif /* _AMESOS_COMPONENTBASESOLVER_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_ComponentBaseSolver.h b/packages/amesos/src/Amesos_ComponentBaseSolver.h index fd2044563432..2da07acf9cea 100644 --- a/packages/amesos/src/Amesos_ComponentBaseSolver.h +++ b/packages/amesos/src/Amesos_ComponentBaseSolver.h @@ -243,3 +243,10 @@ class Amesos_ComponentBaseSolver: public virtual Amesos_BaseSolver { }; #endif /* _AMESOS_COMPONENTBASESOLVER_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_ConfigDefs.h b/packages/amesos/src/Amesos_ConfigDefs.h index 0c773cae447e..019243f402a7 100644 --- a/packages/amesos/src/Amesos_ConfigDefs.h +++ b/packages/amesos/src/Amesos_ConfigDefs.h @@ -103,3 +103,10 @@ #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Control.h b/packages/amesos/src/Amesos_Control.h index bdd4007897c2..37897c118da5 100644 --- a/packages/amesos/src/Amesos_Control.h +++ b/packages/amesos/src/Amesos_Control.h @@ -85,3 +85,10 @@ class Amesos_Control }; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Dscpack.h b/packages/amesos/src/Amesos_Dscpack.h index 30fe44d59405..2c5eacda538e 100644 --- a/packages/amesos/src/Amesos_Dscpack.h +++ b/packages/amesos/src/Amesos_Dscpack.h @@ -199,3 +199,10 @@ class Amesos_Dscpack: public Amesos_BaseSolver, }; // class Amesos_Dscpack #endif /* AMESOS_DSCPACK_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Klu.h b/packages/amesos/src/Amesos_Klu.h index 12dae661c6be..55db605f4196 100644 --- a/packages/amesos/src/Amesos_Klu.h +++ b/packages/amesos/src/Amesos_Klu.h @@ -344,3 +344,10 @@ class Amesos_Klu: public Amesos_BaseSolver, }; // class Amesos_Klu #endif /* AMESOS_KLU_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Lapack.h b/packages/amesos/src/Amesos_Lapack.h index aba71ffdbf08..df165192acb9 100644 --- a/packages/amesos/src/Amesos_Lapack.h +++ b/packages/amesos/src/Amesos_Lapack.h @@ -270,3 +270,10 @@ class Amesos_Lapack: public Amesos_BaseSolver, }; // End of class Amesos_Lapack #endif /* AMESOS_LAPACK_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_MC64.h b/packages/amesos/src/Amesos_MC64.h index 46e4c0d4417e..edcf15026a15 100644 --- a/packages/amesos/src/Amesos_MC64.h +++ b/packages/amesos/src/Amesos_MC64.h @@ -125,3 +125,10 @@ class Amesos_MC64 : public Amesos_Scaling, public Amesos_Reordering #endif #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Merikos.h b/packages/amesos/src/Amesos_Merikos.h index 0ff36573a716..03db007bd440 100644 --- a/packages/amesos/src/Amesos_Merikos.h +++ b/packages/amesos/src/Amesos_Merikos.h @@ -410,3 +410,10 @@ int m_per_p_; }; // End of class Amesos_Merikos #endif /* _AMESOS_MERIKOS_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Mumps.h b/packages/amesos/src/Amesos_Mumps.h index bb32d740c1ef..4d1622402d97 100644 --- a/packages/amesos/src/Amesos_Mumps.h +++ b/packages/amesos/src/Amesos_Mumps.h @@ -421,3 +421,10 @@ class Amesos_Mumps: public Amesos_BaseSolver, }; // class Amesos_Mumps #endif /* AMESOS_MUMPS_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_NoCopiable.h b/packages/amesos/src/Amesos_NoCopiable.h index ac4600276346..4b7c5c10aafc 100644 --- a/packages/amesos/src/Amesos_NoCopiable.h +++ b/packages/amesos/src/Amesos_NoCopiable.h @@ -58,3 +58,10 @@ class Amesos_NoCopiable Amesos_NoCopiable& operator=(const Amesos_NoCopiable& rhs); }; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Paraklete.h b/packages/amesos/src/Amesos_Paraklete.h index 13919667eb9d..c46c1dc59daf 100644 --- a/packages/amesos/src/Amesos_Paraklete.h +++ b/packages/amesos/src/Amesos_Paraklete.h @@ -326,3 +326,10 @@ class Amesos_Paraklete: public Amesos_BaseSolver, }; // class Amesos_Paraklete #endif /* AMESOS_PARAKLETE_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Pardiso.h b/packages/amesos/src/Amesos_Pardiso.h index 4f2a65f65be1..e58942fb39c3 100644 --- a/packages/amesos/src/Amesos_Pardiso.h +++ b/packages/amesos/src/Amesos_Pardiso.h @@ -206,3 +206,10 @@ class Amesos_Pardiso: public Amesos_BaseSolver, }; // class Amesos_Pardiso #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Reordering.h b/packages/amesos/src/Amesos_Reordering.h index b895cd5b5488..37e70687c6c6 100644 --- a/packages/amesos/src/Amesos_Reordering.h +++ b/packages/amesos/src/Amesos_Reordering.h @@ -55,3 +55,10 @@ class Amesos_Reordering }; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_SCALAPACK_wrappers.h b/packages/amesos/src/Amesos_SCALAPACK_wrappers.h index 00799bd21b4a..fe6b3fd79db7 100644 --- a/packages/amesos/src/Amesos_SCALAPACK_wrappers.h +++ b/packages/amesos/src/Amesos_SCALAPACK_wrappers.h @@ -107,3 +107,10 @@ extern "C" { #endif #endif /* AMESOS_SCALAPACK_WRAPPERS_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Scalapack.h b/packages/amesos/src/Amesos_Scalapack.h index 14d6f410362e..4f56d6c8c735 100644 --- a/packages/amesos/src/Amesos_Scalapack.h +++ b/packages/amesos/src/Amesos_Scalapack.h @@ -408,3 +408,10 @@ revert to their default values. }; // End of class Amesos_Scalapack #endif /* _AMESOS_SCALAPACK_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Scaling.h b/packages/amesos/src/Amesos_Scaling.h index a5f29a18f95c..7bbc156ee9b4 100644 --- a/packages/amesos/src/Amesos_Scaling.h +++ b/packages/amesos/src/Amesos_Scaling.h @@ -55,3 +55,10 @@ class Amesos_Scaling }; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Status.h b/packages/amesos/src/Amesos_Status.h index 3a9ebee4caaf..c69260346689 100644 --- a/packages/amesos/src/Amesos_Status.h +++ b/packages/amesos/src/Amesos_Status.h @@ -77,3 +77,10 @@ class Amesos_Status }; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Superlu.h b/packages/amesos/src/Amesos_Superlu.h index 1e6e4f8e3b3b..7e067d874ec8 100644 --- a/packages/amesos/src/Amesos_Superlu.h +++ b/packages/amesos/src/Amesos_Superlu.h @@ -238,3 +238,10 @@ class Amesos_Superlu: public Amesos_BaseSolver, }; // End of class Amesos_Superlu #endif /* AMESOS_SUPERLU_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Superludist.h b/packages/amesos/src/Amesos_Superludist.h index 634d9a4300f0..e9f44367090f 100644 --- a/packages/amesos/src/Amesos_Superludist.h +++ b/packages/amesos/src/Amesos_Superludist.h @@ -219,3 +219,10 @@ class Amesos_Superludist: public Amesos_BaseSolver, }; // End of class Amesos_Superludist #endif /* AMESOS_SUPERLUDIST_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Support.h b/packages/amesos/src/Amesos_Support.h index e505ed205c6b..870e4046788a 100644 --- a/packages/amesos/src/Amesos_Support.h +++ b/packages/amesos/src/Amesos_Support.h @@ -75,3 +75,10 @@ class Amesos_StandardIndex #endif } ; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Taucs.h b/packages/amesos/src/Amesos_Taucs.h index 4bb26eff0fc5..2de58a524a32 100644 --- a/packages/amesos/src/Amesos_Taucs.h +++ b/packages/amesos/src/Amesos_Taucs.h @@ -218,3 +218,10 @@ class Amesos_Taucs: public Amesos_BaseSolver, }; // class Amesos_Taucs #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_TestRowMatrix.h b/packages/amesos/src/Amesos_TestRowMatrix.h index 65be488ce760..8c4651ba101d 100644 --- a/packages/amesos/src/Amesos_TestRowMatrix.h +++ b/packages/amesos/src/Amesos_TestRowMatrix.h @@ -370,3 +370,10 @@ class Amesos_TestRowMatrix : public virtual Epetra_RowMatrix { #endif /* IFPACK_ROWMATRIX_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Time.h b/packages/amesos/src/Amesos_Time.h index 5aa95df117f1..28698d0e1788 100644 --- a/packages/amesos/src/Amesos_Time.h +++ b/packages/amesos/src/Amesos_Time.h @@ -142,3 +142,10 @@ class Amesos_Time }; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Umfpack.h b/packages/amesos/src/Amesos_Umfpack.h index d7e00afe6ead..6d01cde3be8d 100644 --- a/packages/amesos/src/Amesos_Umfpack.h +++ b/packages/amesos/src/Amesos_Umfpack.h @@ -264,3 +264,10 @@ class Amesos_Umfpack: public Amesos_BaseSolver, }; // class Amesos_Umfpack #endif /* AMESOS_UMFPACK_H */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/Amesos_Utils.h b/packages/amesos/src/Amesos_Utils.h index 6a3c81339730..eec0944afdbe 100644 --- a/packages/amesos/src/Amesos_Utils.h +++ b/packages/amesos/src/Amesos_Utils.h @@ -99,3 +99,10 @@ class Amesos_Utils }; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/CrsMatrixTranspose.h b/packages/amesos/src/CrsMatrixTranspose.h index 397711f9f350..44268f658156 100644 --- a/packages/amesos/src/CrsMatrixTranspose.h +++ b/packages/amesos/src/CrsMatrixTranspose.h @@ -34,3 +34,10 @@ int CrsMatrixTranspose( Epetra_CrsMatrix *In, Epetra_CrsMatrix *Out ) ; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/src-repository/Epetra_SLU.h b/packages/amesos/src/src-repository/Epetra_SLU.h index 03c87bac22eb..c497effd09ce 100644 --- a/packages/amesos/src/src-repository/Epetra_SLU.h +++ b/packages/amesos/src/src-repository/Epetra_SLU.h @@ -125,3 +125,10 @@ class Epetra_SLU }; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/src-repository/SpoolesOO.h b/packages/amesos/src/src-repository/SpoolesOO.h index 95f72332a262..b7957432e187 100644 --- a/packages/amesos/src/src-repository/SpoolesOO.h +++ b/packages/amesos/src/src-repository/SpoolesOO.h @@ -99,3 +99,10 @@ class SpoolesOO { #endif /* _SPOOLESOO_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/src-repository/Superludist2_OO.h b/packages/amesos/src/src-repository/Superludist2_OO.h index 509fc29c12b0..738222ed3c4b 100644 --- a/packages/amesos/src/src-repository/Superludist2_OO.h +++ b/packages/amesos/src/src-repository/Superludist2_OO.h @@ -300,3 +300,10 @@ class Superludist2_OO { #endif /* _SUPERLUDIST2_OO_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/src/src-repository/SuperludistOO.h b/packages/amesos/src/src-repository/SuperludistOO.h index d2524002af52..5b11b25def47 100644 --- a/packages/amesos/src/src-repository/SuperludistOO.h +++ b/packages/amesos/src/src-repository/SuperludistOO.h @@ -294,3 +294,10 @@ class SuperludistOO { #endif /* _SUPERLUDISTOO_H_ */ + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/CreateTridi.h b/packages/amesos/test/TestOptions/CreateTridi.h index 9ccf185c045a..3a0aae679352 100644 --- a/packages/amesos/test/TestOptions/CreateTridi.h +++ b/packages/amesos/test/TestOptions/CreateTridi.h @@ -43,3 +43,10 @@ int CreateTridi(Epetra_CrsMatrix& A) ; int CreateTridiPlus(Epetra_CrsMatrix& A) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/NewMatNewMap.h b/packages/amesos/test/TestOptions/NewMatNewMap.h index 6916f868fcf7..2ee6cc2a56ff 100644 --- a/packages/amesos/test/TestOptions/NewMatNewMap.h +++ b/packages/amesos/test/TestOptions/NewMatNewMap.h @@ -8,3 +8,10 @@ RCP NewMatNewMap(Epetra_CrsMatrix& In, int RangeMapType, int DomainMapType ) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/PartialFactorization.h b/packages/amesos/test/TestOptions/PartialFactorization.h index 02244416d9b5..b68e12471382 100644 --- a/packages/amesos/test/TestOptions/PartialFactorization.h +++ b/packages/amesos/test/TestOptions/PartialFactorization.h @@ -10,3 +10,10 @@ int PartialFactorization( const char* AmesosClass, Teuchos::ParameterList ParamList, Epetra_CrsMatrix *& Amat, double Rcond ) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/PerformOneSolveAndTest.h b/packages/amesos/test/TestOptions/PerformOneSolveAndTest.h index 2b54b294043e..6fdfe350839e 100644 --- a/packages/amesos/test/TestOptions/PerformOneSolveAndTest.h +++ b/packages/amesos/test/TestOptions/PerformOneSolveAndTest.h @@ -14,3 +14,10 @@ int PerformOneSolveAndTest(const char* AmesosClass, double& relerror, double& relresidual, int ExpectedError = 0) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/TestAllClasses.h b/packages/amesos/test/TestOptions/TestAllClasses.h index 90c4ea83f96f..0c7db9354bb5 100644 --- a/packages/amesos/test/TestOptions/TestAllClasses.h +++ b/packages/amesos/test/TestOptions/TestAllClasses.h @@ -21,3 +21,10 @@ int TestAllClasses( const std::vector AmesosClasses, double &maxrelresidual, int &NumTests) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/TestKlu.h b/packages/amesos/test/TestOptions/TestKlu.h index 8f9b652d5c78..7b0bf7e03fc6 100644 --- a/packages/amesos/test/TestOptions/TestKlu.h +++ b/packages/amesos/test/TestOptions/TestKlu.h @@ -15,3 +15,10 @@ int TestKlu( Epetra_CrsMatrix *& Amat, double &maxrelresidual, int &NumTests ) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/TestOtherClasses.h b/packages/amesos/test/TestOptions/TestOtherClasses.h index 9518debaa883..e91016ec729a 100644 --- a/packages/amesos/test/TestOptions/TestOtherClasses.h +++ b/packages/amesos/test/TestOptions/TestOtherClasses.h @@ -14,3 +14,10 @@ int TestOtherClasses( const char* AmesosClass, double &maxrelresidual, int &NumTests ) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/TestScalapack.h b/packages/amesos/test/TestOptions/TestScalapack.h index 3378d0ba589e..1cf7f3148c05 100644 --- a/packages/amesos/test/TestOptions/TestScalapack.h +++ b/packages/amesos/test/TestOptions/TestScalapack.h @@ -10,3 +10,10 @@ int TestScalapack( Epetra_CrsMatrix *& Amat, double &maxrelresidual, int &NumTests) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/TestOptions/TestSuperludist.h b/packages/amesos/test/TestOptions/TestSuperludist.h index ec8de58af131..e60037725fc4 100644 --- a/packages/amesos/test/TestOptions/TestSuperludist.h +++ b/packages/amesos/test/TestOptions/TestSuperludist.h @@ -11,3 +11,10 @@ int TestSuperludist( Epetra_CrsMatrix *& Amat, const char *filename, int &NumTests) ; + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/Test_Basic/Amesos_TestSolver.h b/packages/amesos/test/Test_Basic/Amesos_TestSolver.h index 2dbf5fed2c4c..e269a0edfec1 100644 --- a/packages/amesos/test/Test_Basic/Amesos_TestSolver.h +++ b/packages/amesos/test/Test_Basic/Amesos_TestSolver.h @@ -46,3 +46,10 @@ int Amesos_TestMrhsSolver( Epetra_Comm &Comm, char *matrix_file, int numsolves, SparseSolverType SparseSolver, bool tranpose, int special, AMESOS_MatrixType MatrixType ); + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/Test_Basic/SparseDirectTimingVars.h b/packages/amesos/test/Test_Basic/SparseDirectTimingVars.h index dc32809e6e4e..8ebecb720236 100644 --- a/packages/amesos/test/Test_Basic/SparseDirectTimingVars.h +++ b/packages/amesos/test/Test_Basic/SparseDirectTimingVars.h @@ -46,3 +46,10 @@ class SparseDirectTimingVars #endif #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/amesos/test/Test_Basic/SparseSolverResult.h b/packages/amesos/test/Test_Basic/SparseSolverResult.h index 12f5a9b2edd9..a845ecb8427f 100644 --- a/packages/amesos/test/Test_Basic/SparseSolverResult.h +++ b/packages/amesos/test/Test_Basic/SparseSolverResult.h @@ -85,3 +85,10 @@ class SparseSolverResult : public Epetra_Object { } ; #endif + +#if defined(Amesos_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Amesos package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/CMakeLists.txt b/packages/aztecoo/CMakeLists.txt index 0987e367a057..593575e86ae5 100644 --- a/packages/aztecoo/CMakeLists.txt +++ b/packages/aztecoo/CMakeLists.txt @@ -16,6 +16,9 @@ TRIBITS_PACKAGE(AztecOO) # # B) Set up package-specific options # + +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() + TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_AZLU HAVE_AZLU "Enables the azlu preconditioner. Requires the y12m TPL." diff --git a/packages/aztecoo/cmake/AztecOO_config.h.in b/packages/aztecoo/cmake/AztecOO_config.h.in index c55b0c64d35d..e097307fcd9a 100644 --- a/packages/aztecoo/cmake/AztecOO_config.h.in +++ b/packages/aztecoo/cmake/AztecOO_config.h.in @@ -144,3 +144,6 @@ /* Define to rpl_malloc if the replacement function should be used. */ #cmakedefine malloc + +#cmakedefine AztecOO_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/aztecoo/src/AZOO_iterate.h b/packages/aztecoo/src/AZOO_iterate.h index 743ce005354b..bbbc09e7c138 100644 --- a/packages/aztecoo/src/AZOO_iterate.h +++ b/packages/aztecoo/src/AZOO_iterate.h @@ -107,3 +107,10 @@ extern "C" void AZOO_iterate(double * xsolve, double * b, AZ_PRECOND *precond, struct AZ_SCALING *scaling); #endif #endif /* _AZOO_ITERATE_H_ */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AZOO_printf.h b/packages/aztecoo/src/AZOO_printf.h index 88ccd4c72bb8..ffe3f7ad0ac5 100644 --- a/packages/aztecoo/src/AZOO_printf.h +++ b/packages/aztecoo/src/AZOO_printf.h @@ -80,3 +80,10 @@ void AZOO_clear_streams(); #endif + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/Aztec2Petra.h b/packages/aztecoo/src/Aztec2Petra.h index a4ed9efe1c76..6ddcccbc8914 100644 --- a/packages/aztecoo/src/Aztec2Petra.h +++ b/packages/aztecoo/src/Aztec2Petra.h @@ -127,3 +127,10 @@ int Aztec2Petra(int * proc_config, int ** global_indices); #endif /* _AZTEC2PETRA_H_ */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO.h b/packages/aztecoo/src/AztecOO.h index 26589e1ce754..151edebac90b 100644 --- a/packages/aztecoo/src/AztecOO.h +++ b/packages/aztecoo/src/AztecOO.h @@ -693,3 +693,10 @@ void AztecOO_StatusTest_wrapper(void * conv_test_obj,void * res_vector_obj, double * rnorm, int * r_avail); #endif /* _AZTECOO_H_ */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_ConditionNumber.h b/packages/aztecoo/src/AztecOO_ConditionNumber.h index 925b077a5d37..0a252fad6027 100644 --- a/packages/aztecoo/src/AztecOO_ConditionNumber.h +++ b/packages/aztecoo/src/AztecOO_ConditionNumber.h @@ -118,3 +118,10 @@ class AztecOOConditionNumber { #endif + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_ConfigDefs.h b/packages/aztecoo/src/AztecOO_ConfigDefs.h index 75cc2d07e567..cfe8268de67d 100644 --- a/packages/aztecoo/src/AztecOO_ConfigDefs.h +++ b/packages/aztecoo/src/AztecOO_ConfigDefs.h @@ -103,3 +103,10 @@ #endif /*__cplusplus */ #endif /*ndef TRILINOS_NO_CONFIG_H*/ #endif /* AZTECOO_CONFIGDEFS_H */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_Operator.h b/packages/aztecoo/src/AztecOO_Operator.h index d845544cb3e4..e534159ee467 100644 --- a/packages/aztecoo/src/AztecOO_Operator.h +++ b/packages/aztecoo/src/AztecOO_Operator.h @@ -176,3 +176,10 @@ class AztecOO_Operator: public virtual Epetra_Operator { #endif /* _AZTECOO_OPERATOR_H_ */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_Scaling.h b/packages/aztecoo/src/AztecOO_Scaling.h index e484ae9e2a21..0c719f095893 100644 --- a/packages/aztecoo/src/AztecOO_Scaling.h +++ b/packages/aztecoo/src/AztecOO_Scaling.h @@ -64,3 +64,10 @@ int AztecOO_scale_epetra(int action, #endif + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_StatusTest.h b/packages/aztecoo/src/AztecOO_StatusTest.h index 4edcdcc08bf1..e252fa4c1749 100644 --- a/packages/aztecoo/src/AztecOO_StatusTest.h +++ b/packages/aztecoo/src/AztecOO_StatusTest.h @@ -149,3 +149,10 @@ class AztecOO_StatusTest { #endif /* AZTECOO_STATUSTEST_H */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_StatusTestCombo.h b/packages/aztecoo/src/AztecOO_StatusTestCombo.h index 4d5ceb3ee1aa..acef2ac0a688 100644 --- a/packages/aztecoo/src/AztecOO_StatusTestCombo.h +++ b/packages/aztecoo/src/AztecOO_StatusTestCombo.h @@ -191,3 +191,10 @@ class AztecOO_StatusTestCombo: public AztecOO_StatusTest { }; #endif /* AZTECOO_STATUSTESTCOMBO_H */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_StatusTestMaxIters.h b/packages/aztecoo/src/AztecOO_StatusTestMaxIters.h index c62c8cbf2c53..fb25bacb2ef5 100644 --- a/packages/aztecoo/src/AztecOO_StatusTestMaxIters.h +++ b/packages/aztecoo/src/AztecOO_StatusTestMaxIters.h @@ -123,3 +123,10 @@ class AztecOO_StatusTestMaxIters: public AztecOO_StatusTest { }; #endif /* AZTECOO_STATUSTESTMAXITERS_H */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_StatusTestResNorm.h b/packages/aztecoo/src/AztecOO_StatusTestResNorm.h index 26da09533988..522cba597e19 100644 --- a/packages/aztecoo/src/AztecOO_StatusTestResNorm.h +++ b/packages/aztecoo/src/AztecOO_StatusTestResNorm.h @@ -329,3 +329,10 @@ class AztecOO_StatusTestResNorm: public AztecOO_StatusTest { }; #endif /* AZTECOO_STATUSTESTRESNORM_H */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_StatusType.h b/packages/aztecoo/src/AztecOO_StatusType.h index 2714d2d5a3e1..0a4b11649b22 100644 --- a/packages/aztecoo/src/AztecOO_StatusType.h +++ b/packages/aztecoo/src/AztecOO_StatusType.h @@ -64,3 +64,10 @@ enum AztecOO_StatusType { Unchecked = 2, /*!< Initial state of status */ }; #endif /* AZTECOO_STATUSTYPE_H */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_Version.h b/packages/aztecoo/src/AztecOO_Version.h index f786b0920729..1192840b98e7 100644 --- a/packages/aztecoo/src/AztecOO_Version.h +++ b/packages/aztecoo/src/AztecOO_Version.h @@ -50,3 +50,10 @@ } #endif /* AZTECOO_VERSION_H */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/AztecOO_string_maps.h b/packages/aztecoo/src/AztecOO_string_maps.h index bf3010f4c0ae..b834e11bc58f 100644 --- a/packages/aztecoo/src/AztecOO_string_maps.h +++ b/packages/aztecoo/src/AztecOO_string_maps.h @@ -57,3 +57,10 @@ void AztecOO_initialize_maps(); #endif + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/Epetra_MsrMatrix.h b/packages/aztecoo/src/Epetra_MsrMatrix.h index 1a5eb1eac9e9..7a44eb291718 100644 --- a/packages/aztecoo/src/Epetra_MsrMatrix.h +++ b/packages/aztecoo/src/Epetra_MsrMatrix.h @@ -416,3 +416,10 @@ class Epetra_MsrMatrix: public Epetra_Object, public Epetra_CompObject, public v Epetra_MsrMatrix(const Epetra_MsrMatrix & Matrix) : Epetra_Object(Matrix), Epetra_CompObject(Matrix) {} }; #endif /* _EPETRA_MSRMATRIX_H_ */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/az_aztec.h b/packages/aztecoo/src/az_aztec.h index 85ab5cdcd2e7..efc554ab3d29 100644 --- a/packages/aztecoo/src/az_aztec.h +++ b/packages/aztecoo/src/az_aztec.h @@ -1643,3 +1643,10 @@ extern void AZ_sym_rescale_vbr(double x[], int data_org[], int options[]); #endif #endif + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/az_aztec_defs.h b/packages/aztecoo/src/az_aztec_defs.h index 01f5047220c5..5243196ee1ab 100644 --- a/packages/aztecoo/src/az_aztec_defs.h +++ b/packages/aztecoo/src/az_aztec_defs.h @@ -745,3 +745,10 @@ #endif #endif + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/az_aztecf.h b/packages/aztecoo/src/az_aztecf.h index c07b72a86bbf..41172cef1e12 100644 --- a/packages/aztecoo/src/az_aztecf.h +++ b/packages/aztecoo/src/az_aztecf.h @@ -447,3 +447,10 @@ parameter (AZ_EXTERNS = 2) parameter (AZ_GLOBAL = 1) parameter (AZ_LOCAL = 2) + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/az_blas_wrappers.h b/packages/aztecoo/src/az_blas_wrappers.h index a151b551a9a3..2e4d9fddbd5d 100644 --- a/packages/aztecoo/src/az_blas_wrappers.h +++ b/packages/aztecoo/src/az_blas_wrappers.h @@ -132,3 +132,10 @@ void PREFIX STRSM_F77(az_fcd, az_fcd, az_fcd, az_fcd, #endif #endif /* _AZ_BLAS_WRAPPERS_H_ */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/az_f77func.h b/packages/aztecoo/src/az_f77func.h index d498fbef2a05..043618897266 100644 --- a/packages/aztecoo/src/az_f77func.h +++ b/packages/aztecoo/src/az_f77func.h @@ -122,3 +122,10 @@ #endif #endif /* _AZ_F77FUNC_H_ */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/az_lapack_wrappers.h b/packages/aztecoo/src/az_lapack_wrappers.h index 072c4a6a5f1d..92de772d0a6e 100644 --- a/packages/aztecoo/src/az_lapack_wrappers.h +++ b/packages/aztecoo/src/az_lapack_wrappers.h @@ -109,3 +109,10 @@ void PREFIX DGETRS_F77(az_fcd, int* n, int* nrhs, double* a, int* lda, int*ipiv, double*x , int* ldx, int* info); void PREFIX SGETRS_F77(az_fcd, int* m, int* n, float* a, int* lda, int*ipiv, float*x , int* ldx, int* info); + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/aztecoo/src/az_y12m_wrappers.h b/packages/aztecoo/src/az_y12m_wrappers.h index b574bf570935..0d49c6eb431b 100644 --- a/packages/aztecoo/src/az_y12m_wrappers.h +++ b/packages/aztecoo/src/az_y12m_wrappers.h @@ -71,3 +71,10 @@ void PREFIX Y12MDF_F77(int *n, double val[], int *nn, double b[], double pivot[] #endif #endif /* _AZ_Y12M_WRAPPERS_H_ */ + +#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The AztecOO package is deprecated" +#endif +#endif + diff --git a/packages/epetra/cmake/Epetra_config.h.in b/packages/epetra/cmake/Epetra_config.h.in index 192e930e7eb7..e59488a22f92 100644 --- a/packages/epetra/cmake/Epetra_config.h.in +++ b/packages/epetra/cmake/Epetra_config.h.in @@ -160,4 +160,6 @@ @EPETRA_DEPRECATED_DECLARATIONS@ +#cmakedefine Epetra_SHOW_DEPRECATED_WARNINGS + #endif diff --git a/packages/epetra/example/petra_nonlinear/basis.h b/packages/epetra/example/petra_nonlinear/basis.h index a0ad09f2b02d..f492c459fd90 100644 --- a/packages/epetra/example/petra_nonlinear/basis.h +++ b/packages/epetra/example/petra_nonlinear/basis.h @@ -59,3 +59,10 @@ class Basis { }; + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_BLAS.h b/packages/epetra/src/Epetra_BLAS.h index 35525afdd060..8c7e8d90f747 100644 --- a/packages/epetra/src/Epetra_BLAS.h +++ b/packages/epetra/src/Epetra_BLAS.h @@ -183,3 +183,10 @@ inline Epetra_BLAS::Epetra_BLAS(const Epetra_BLAS& BLAS){(void)BLAS;} inline Epetra_BLAS::~Epetra_BLAS(){} #endif /* EPETRA_BLAS_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_BLAS_wrappers.h b/packages/epetra/src/Epetra_BLAS_wrappers.h index 078516139fbc..78d2552e582a 100644 --- a/packages/epetra/src/Epetra_BLAS_wrappers.h +++ b/packages/epetra/src/Epetra_BLAS_wrappers.h @@ -299,3 +299,10 @@ void PREFIX SSYRK_F77(Epetra_fcd uplo, Epetra_fcd trans, const int *n, const int #endif #endif /* EPETRA_BLAS_WRAPPERS_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_BasicDirectory.h b/packages/epetra/src/Epetra_BasicDirectory.h index ccefed5a0ded..a785eef20bee 100644 --- a/packages/epetra/src/Epetra_BasicDirectory.h +++ b/packages/epetra/src/Epetra_BasicDirectory.h @@ -230,3 +230,10 @@ template<> inline const long long * Epetra_BasicDirectory::AllMinGIDs() const #endif #endif /* EPETRA_BASICDIRECTORY_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_BasicRowMatrix.h b/packages/epetra/src/Epetra_BasicRowMatrix.h index 9d8e64934b34..4805012c03d4 100644 --- a/packages/epetra/src/Epetra_BasicRowMatrix.h +++ b/packages/epetra/src/Epetra_BasicRowMatrix.h @@ -563,3 +563,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_BasicRowMatrix: public Epetra_CompObject, pub }; #endif /* EPETRA_BASICROWMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_BlockMap.h b/packages/epetra/src/Epetra_BlockMap.h index b01cef7e0f21..ba6eab9f04a4 100644 --- a/packages/epetra/src/Epetra_BlockMap.h +++ b/packages/epetra/src/Epetra_BlockMap.h @@ -933,3 +933,10 @@ template<> inline int Epetra_BlockMap::SizeMyGlobalElement (int n) { #endif #endif /* EPETRA_BLOCKMAP_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_BlockMapData.h b/packages/epetra/src/Epetra_BlockMapData.h index 11c0f456e2b6..5b2fad89024b 100644 --- a/packages/epetra/src/Epetra_BlockMapData.h +++ b/packages/epetra/src/Epetra_BlockMapData.h @@ -128,3 +128,10 @@ class Epetra_BlockMapData : public Epetra_Data { }; #endif /* EPETRA_BLOCKMAPDATA_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_C_wrappers.h b/packages/epetra/src/Epetra_C_wrappers.h index 3d617c17feef..6ec80e670101 100644 --- a/packages/epetra/src/Epetra_C_wrappers.h +++ b/packages/epetra/src/Epetra_C_wrappers.h @@ -370,3 +370,10 @@ extern "C" { #endif #endif /* EPETRA_C_WRAPPERS_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_CombineMode.h b/packages/epetra/src/Epetra_CombineMode.h index c49c5caaa4f1..dda75feef421 100644 --- a/packages/epetra/src/Epetra_CombineMode.h +++ b/packages/epetra/src/Epetra_CombineMode.h @@ -90,3 +90,10 @@ enum Epetra_CombineMode {Add, /*!< Components on the receiving processor }; #endif // EPETRA_COMBINEMODE_H + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Comm.h b/packages/epetra/src/Epetra_Comm.h index 9f482c494c04..64e16cccb469 100644 --- a/packages/epetra/src/Epetra_Comm.h +++ b/packages/epetra/src/Epetra_Comm.h @@ -474,3 +474,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_Comm { //@} }; #endif /* EPETRA_COMM_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_CompObject.h b/packages/epetra/src/Epetra_CompObject.h index 288b426e449b..76f9a8a6d411 100644 --- a/packages/epetra/src/Epetra_CompObject.h +++ b/packages/epetra/src/Epetra_CompObject.h @@ -125,3 +125,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_CompObject { }; #endif /* EPETRA_COMPOBJECT_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_ConfigDefs.h b/packages/epetra/src/Epetra_ConfigDefs.h index 83c976a3330a..7b16b00bf09e 100644 --- a/packages/epetra/src/Epetra_ConfigDefs.h +++ b/packages/epetra/src/Epetra_ConfigDefs.h @@ -330,3 +330,10 @@ const int DefaultTracebackMode = 1; #include "Epetra_DLLExportMacro.h" #endif /* EPETRA_CONFIGDEFS_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_CrsGraph.h b/packages/epetra/src/Epetra_CrsGraph.h index 96ac3cfc1638..9e1bb8825da7 100644 --- a/packages/epetra/src/Epetra_CrsGraph.h +++ b/packages/epetra/src/Epetra_CrsGraph.h @@ -1261,3 +1261,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_CrsGraph: public Epetra_DistObject { int ExtractMyRowCopy(int Row, int LenOfIndices, int& NumIndices, int_type* targIndices) const; }; #endif /* EPETRA_CRSGRAPH_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_CrsGraphData.h b/packages/epetra/src/Epetra_CrsGraphData.h index 38afce45519e..b94304b0e5a3 100644 --- a/packages/epetra/src/Epetra_CrsGraphData.h +++ b/packages/epetra/src/Epetra_CrsGraphData.h @@ -339,3 +339,10 @@ inline Epetra_CrsGraphData::IndexData& Epetra_CrsGraphData::Data() #endif /* EPETRA_CRSGRAPHDATA_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_CrsMatrix.h b/packages/epetra/src/Epetra_CrsMatrix.h index 31256334426b..0f748b4b132c 100644 --- a/packages/epetra/src/Epetra_CrsMatrix.h +++ b/packages/epetra/src/Epetra_CrsMatrix.h @@ -1782,3 +1782,10 @@ or if the number of entries in this row exceed the Length parameter. }; #endif /* EPETRA_CRSMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_CrsSingletonFilter.h b/packages/epetra/src/Epetra_CrsSingletonFilter.h index 71fbd7a81989..1d6819fe1b87 100644 --- a/packages/epetra/src/Epetra_CrsSingletonFilter.h +++ b/packages/epetra/src/Epetra_CrsSingletonFilter.h @@ -313,3 +313,10 @@ class Epetra_CrsSingletonFilter { Epetra_CrsSingletonFilter & operator=(const Epetra_CrsSingletonFilter & Problem); }; #endif /* EPETRA_CRSSINGLETONFILTER_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Data.h b/packages/epetra/src/Epetra_Data.h index 8f1b5009ff30..d7de575c1a02 100644 --- a/packages/epetra/src/Epetra_Data.h +++ b/packages/epetra/src/Epetra_Data.h @@ -106,3 +106,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_Data { }; #endif /* EPETRA_DATA_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_DataAccess.h b/packages/epetra/src/Epetra_DataAccess.h index be7d71a21069..305712ee24a2 100644 --- a/packages/epetra/src/Epetra_DataAccess.h +++ b/packages/epetra/src/Epetra_DataAccess.h @@ -59,3 +59,10 @@ enum Epetra_DataAccess {Copy, /*!< User data will be copied at }; #endif // EPETRA_DATAACCESS_H + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Directory.h b/packages/epetra/src/Epetra_Directory.h index 787bba3c653e..5800ead1bfa8 100644 --- a/packages/epetra/src/Epetra_Directory.h +++ b/packages/epetra/src/Epetra_Directory.h @@ -123,3 +123,10 @@ class Epetra_Directory { }; #endif /* EPETRA_DIRECTORY_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_DistObject.h b/packages/epetra/src/Epetra_DistObject.h index db3830fb64f9..5bc90d507a64 100644 --- a/packages/epetra/src/Epetra_DistObject.h +++ b/packages/epetra/src/Epetra_DistObject.h @@ -281,3 +281,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_DistObject: public Epetra_Object, public virt }; #endif /* EPETRA_DISTOBJECT_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Distributor.h b/packages/epetra/src/Epetra_Distributor.h index 5e530377c2b8..2b9548e42d82 100644 --- a/packages/epetra/src/Epetra_Distributor.h +++ b/packages/epetra/src/Epetra_Distributor.h @@ -204,3 +204,10 @@ class Epetra_Distributor { //@} }; #endif /* EPETRA_DISTRIBUTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Export.h b/packages/epetra/src/Epetra_Export.h index 7a23dce03dbd..95c88f4d2128 100644 --- a/packages/epetra/src/Epetra_Export.h +++ b/packages/epetra/src/Epetra_Export.h @@ -317,3 +317,10 @@ and entries 5 and 6 on PEs 1 and 2. }; #endif /* EPETRA_EXPORT_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_FECrsGraph.h b/packages/epetra/src/Epetra_FECrsGraph.h index 713938ab8d31..b15ebffd33f0 100644 --- a/packages/epetra/src/Epetra_FECrsGraph.h +++ b/packages/epetra/src/Epetra_FECrsGraph.h @@ -239,3 +239,10 @@ template<> inline std::map inline std::vector >& Epetra_FECrsMatrix::nonl #endif /* EPETRA_FECRSMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_FEVbrMatrix.h b/packages/epetra/src/Epetra_FEVbrMatrix.h index d39932cbadbf..ef271da4d2d1 100644 --- a/packages/epetra/src/Epetra_FEVbrMatrix.h +++ b/packages/epetra/src/Epetra_FEVbrMatrix.h @@ -286,3 +286,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_FEVbrMatrix: public Epetra_VbrMatrix { }; #endif /* EPETRA_FEVBRMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_FEVector.h b/packages/epetra/src/Epetra_FEVector.h index 78c065b99509..8807428e3b1f 100644 --- a/packages/epetra/src/Epetra_FEVector.h +++ b/packages/epetra/src/Epetra_FEVector.h @@ -361,3 +361,10 @@ template<> inline std::vector& Epetra_FEVector::nonlocalIDs #endif #endif /* EPETRA_GIDTYPESERIALDENSEVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_GIDTypeVector.h b/packages/epetra/src/Epetra_GIDTypeVector.h index d1f0eb5e6eac..177e605d329c 100644 --- a/packages/epetra/src/Epetra_GIDTypeVector.h +++ b/packages/epetra/src/Epetra_GIDTypeVector.h @@ -81,3 +81,10 @@ class Epetra_GIDTypeVector #endif #endif /* EPETRA_GIDTYPEVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_HashTable.h b/packages/epetra/src/Epetra_HashTable.h index b8774a701988..182d360df721 100644 --- a/packages/epetra/src/Epetra_HashTable.h +++ b/packages/epetra/src/Epetra_HashTable.h @@ -146,3 +146,10 @@ class Epetra_HashTable : public Epetra_Object }; #endif + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Import.h b/packages/epetra/src/Epetra_Import.h index 4b80e5b42c54..f0b95beddf44 100644 --- a/packages/epetra/src/Epetra_Import.h +++ b/packages/epetra/src/Epetra_Import.h @@ -349,3 +349,10 @@ in the above example to do an export operation to y, adding the contributions th }; #endif /* EPETRA_IMPORT_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Import_Util.h b/packages/epetra/src/Epetra_Import_Util.h index 61961788d348..22b624d99991 100644 --- a/packages/epetra/src/Epetra_Import_Util.h +++ b/packages/epetra/src/Epetra_Import_Util.h @@ -193,3 +193,10 @@ int LowCommunicationMakeColMapAndReindex(int N, const int *rowptr, int *colind_L } /* Epetra_Import_Util namespace */ #endif /* EPETRA_IMPORT_UTIL_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_IntMultiVector.h b/packages/epetra/src/Epetra_IntMultiVector.h index cea00f2f1560..43c28b7036f7 100644 --- a/packages/epetra/src/Epetra_IntMultiVector.h +++ b/packages/epetra/src/Epetra_IntMultiVector.h @@ -805,3 +805,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_IntMultiVector: public Epetra_DistObject, pub }; #endif /* EPETRA_INTMULTIVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_IntSerialDenseMatrix.h b/packages/epetra/src/Epetra_IntSerialDenseMatrix.h index 92bccbd4e0ba..65af8b1e5d76 100644 --- a/packages/epetra/src/Epetra_IntSerialDenseMatrix.h +++ b/packages/epetra/src/Epetra_IntSerialDenseMatrix.h @@ -405,3 +405,10 @@ inline const int* Epetra_IntSerialDenseMatrix::operator [] (int ColIndex) const //========================================================================= #endif /* EPETRA_INTSERIALDENSEMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_IntSerialDenseVector.h b/packages/epetra/src/Epetra_IntSerialDenseVector.h index 0c1a07ef7ce1..61d1edb49349 100644 --- a/packages/epetra/src/Epetra_IntSerialDenseVector.h +++ b/packages/epetra/src/Epetra_IntSerialDenseVector.h @@ -299,3 +299,10 @@ inline const int& Epetra_IntSerialDenseVector::operator [] (int Index) const { //========================================================================= #endif /* EPETRA_INTSERIALDENSEVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_IntVector.h b/packages/epetra/src/Epetra_IntVector.h index b2f1d34a31ca..9e1eaa6bf436 100644 --- a/packages/epetra/src/Epetra_IntVector.h +++ b/packages/epetra/src/Epetra_IntVector.h @@ -307,3 +307,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_IntVector : public Epetra_DistObject { }; #endif /* EPETRA_INTVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_InvOperator.h b/packages/epetra/src/Epetra_InvOperator.h index 4b02a78c919e..29b8cea93399 100644 --- a/packages/epetra/src/Epetra_InvOperator.h +++ b/packages/epetra/src/Epetra_InvOperator.h @@ -166,3 +166,10 @@ class Epetra_InvOperator: public virtual Epetra_Operator { #endif /* EPETRA_INVOPERATOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_JadMatrix.h b/packages/epetra/src/Epetra_JadMatrix.h index a0131aec81d5..b6af502dcbe0 100644 --- a/packages/epetra/src/Epetra_JadMatrix.h +++ b/packages/epetra/src/Epetra_JadMatrix.h @@ -227,3 +227,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_JadMatrix: public Epetra_BasicRowMatrix { }; #endif /* EPETRA_JADMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_LAPACK.h b/packages/epetra/src/Epetra_LAPACK.h index bafc2bd57be4..8946bce81b27 100644 --- a/packages/epetra/src/Epetra_LAPACK.h +++ b/packages/epetra/src/Epetra_LAPACK.h @@ -429,3 +429,10 @@ inline Epetra_LAPACK::Epetra_LAPACK(const Epetra_LAPACK& LAPACK){(void)LAPACK;} inline Epetra_LAPACK::~Epetra_LAPACK(){} #endif /* EPETRA_LAPACK_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_LAPACK_wrappers.h b/packages/epetra/src/Epetra_LAPACK_wrappers.h index 3b9de2194815..b6aa00eaaccf 100644 --- a/packages/epetra/src/Epetra_LAPACK_wrappers.h +++ b/packages/epetra/src/Epetra_LAPACK_wrappers.h @@ -493,3 +493,10 @@ extern "C" { #endif #endif /* EPETRA_LAPACK_WRAPPERS_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_LinearProblem.h b/packages/epetra/src/Epetra_LinearProblem.h index 2a2a8a89ecb8..cae087e75064 100644 --- a/packages/epetra/src/Epetra_LinearProblem.h +++ b/packages/epetra/src/Epetra_LinearProblem.h @@ -200,3 +200,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_LinearProblem { }; #endif /* EPETRA_LINEARPROBLEM_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_LinearProblemRedistor.h b/packages/epetra/src/Epetra_LinearProblemRedistor.h index 3f96b1be6174..43327ca9a685 100644 --- a/packages/epetra/src/Epetra_LinearProblemRedistor.h +++ b/packages/epetra/src/Epetra_LinearProblemRedistor.h @@ -246,3 +246,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_LinearProblemRedistor { }; #endif /* EPETRA_LINEARPROBLEMREDISTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_LocalMap.h b/packages/epetra/src/Epetra_LocalMap.h index 1b53aac35180..155a1c8efcf3 100644 --- a/packages/epetra/src/Epetra_LocalMap.h +++ b/packages/epetra/src/Epetra_LocalMap.h @@ -132,3 +132,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_LocalMap : public Epetra_Map { }; #endif /* EPETRA_LOCALMAP_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_LongLongSerialDenseMatrix.h b/packages/epetra/src/Epetra_LongLongSerialDenseMatrix.h index b90b703a732f..cba6bf4b0ce3 100644 --- a/packages/epetra/src/Epetra_LongLongSerialDenseMatrix.h +++ b/packages/epetra/src/Epetra_LongLongSerialDenseMatrix.h @@ -410,3 +410,10 @@ inline const long long* Epetra_LongLongSerialDenseMatrix::operator [] (int ColIn #endif // EPETRA_NO_64BIT_GLOBAL_INDICES #endif /* EPETRA_LONGLONGSERIALDENSEMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_LongLongSerialDenseVector.h b/packages/epetra/src/Epetra_LongLongSerialDenseVector.h index 8bc3c623c525..a41476a900b1 100644 --- a/packages/epetra/src/Epetra_LongLongSerialDenseVector.h +++ b/packages/epetra/src/Epetra_LongLongSerialDenseVector.h @@ -304,3 +304,10 @@ inline const long long& Epetra_LongLongSerialDenseVector::operator [] (int Index #endif // EPETRA_NO_64BIT_GLOBAL_INDICES #endif /* EPETRA_LONGLONGSERIALDENSEVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_LongLongVector.h b/packages/epetra/src/Epetra_LongLongVector.h index 1a99c6bd628b..0cacfec6468c 100644 --- a/packages/epetra/src/Epetra_LongLongVector.h +++ b/packages/epetra/src/Epetra_LongLongVector.h @@ -307,3 +307,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_LongLongVector : public Epetra_DistObject { #endif // EPETRA_NO_64BIT_GLOBAL_INDICES #endif /* EPETRA_LONGLONGVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Map.h b/packages/epetra/src/Epetra_Map.h index fdc4d6ce8ad3..59092758ee1f 100644 --- a/packages/epetra/src/Epetra_Map.h +++ b/packages/epetra/src/Epetra_Map.h @@ -356,3 +356,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_Map : public Epetra_BlockMap { }; #endif /* EPETRA_MAP_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_MapColoring.h b/packages/epetra/src/Epetra_MapColoring.h index 3a7a1bb42c84..d51fe9d9b233 100644 --- a/packages/epetra/src/Epetra_MapColoring.h +++ b/packages/epetra/src/Epetra_MapColoring.h @@ -323,3 +323,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_MapColoring: public Epetra_DistObject { }; #endif /* EPETRA_MAPCOLORING_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_MpiComm.h b/packages/epetra/src/Epetra_MpiComm.h index 6a14cb5d6797..7862724b2a19 100644 --- a/packages/epetra/src/Epetra_MpiComm.h +++ b/packages/epetra/src/Epetra_MpiComm.h @@ -539,3 +539,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_MpiComm: public Epetra_Object, public virtual }; #endif /* EPETRA_MPICOMM_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_MpiCommData.h b/packages/epetra/src/Epetra_MpiCommData.h index 5f4d9d93d54a..ee9c3b71c6c6 100644 --- a/packages/epetra/src/Epetra_MpiCommData.h +++ b/packages/epetra/src/Epetra_MpiCommData.h @@ -85,3 +85,10 @@ class Epetra_MpiCommData : public Epetra_Data { }; #endif /* EPETRA_MPICOMMDATA_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_MpiDistributor.h b/packages/epetra/src/Epetra_MpiDistributor.h index 59e5339d52f5..2597be4d5c2e 100644 --- a/packages/epetra/src/Epetra_MpiDistributor.h +++ b/packages/epetra/src/Epetra_MpiDistributor.h @@ -388,3 +388,10 @@ class Epetra_MpiDistributor: public Epetra_Object, public virtual Epetra_Distrib int lastRoundBytesRecv_; }; #endif /* EPETRA_MPIDISTRIBUTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_MultiVector.h b/packages/epetra/src/Epetra_MultiVector.h index cfe3a3fda2f9..efa1e13ef5d8 100644 --- a/packages/epetra/src/Epetra_MultiVector.h +++ b/packages/epetra/src/Epetra_MultiVector.h @@ -1074,3 +1074,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_MultiVector: public Epetra_DistObject, public }; #endif /* EPETRA_MULTIVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Object.h b/packages/epetra/src/Epetra_Object.h index a9d06a732142..d427f224c618 100644 --- a/packages/epetra/src/Epetra_Object.h +++ b/packages/epetra/src/Epetra_Object.h @@ -212,3 +212,10 @@ inline std::ostream& operator<<(std::ostream& os, const Epetra_Object& obj) } #endif /* EPETRA_OBJECT_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_OffsetIndex.h b/packages/epetra/src/Epetra_OffsetIndex.h index 3ca7ca4797de..053614451534 100644 --- a/packages/epetra/src/Epetra_OffsetIndex.h +++ b/packages/epetra/src/Epetra_OffsetIndex.h @@ -121,3 +121,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_OffsetIndex: public Epetra_Object { }; #endif /* EPETRA_OFFSETINDEX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Operator.h b/packages/epetra/src/Epetra_Operator.h index 1d195814e518..44c538f22109 100644 --- a/packages/epetra/src/Epetra_Operator.h +++ b/packages/epetra/src/Epetra_Operator.h @@ -145,3 +145,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_Operator { }; #endif /* EPETRA_OPERATOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_OskiError.h b/packages/epetra/src/Epetra_OskiError.h index eee1cca52575..0d253f8c4ad6 100644 --- a/packages/epetra/src/Epetra_OskiError.h +++ b/packages/epetra/src/Epetra_OskiError.h @@ -78,3 +78,10 @@ class Epetra_OskiError { }; #endif /* EPETRA_OSKIERROR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_OskiMatrix.h b/packages/epetra/src/Epetra_OskiMatrix.h index 48882981a415..8e8310b8e11f 100644 --- a/packages/epetra/src/Epetra_OskiMatrix.h +++ b/packages/epetra/src/Epetra_OskiMatrix.h @@ -799,3 +799,10 @@ available hints are grouped by section, and only one hint from each section can bool Copy_Created_; }; #endif /* EPETRA_OSKIMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_OskiMultiVector.h b/packages/epetra/src/Epetra_OskiMultiVector.h index fd5be33bd55a..ec32f49a66c7 100644 --- a/packages/epetra/src/Epetra_OskiMultiVector.h +++ b/packages/epetra/src/Epetra_OskiMultiVector.h @@ -110,3 +110,10 @@ class Epetra_OskiMultiVector: public Epetra_MultiVector{ bool Copy_Created_; }; #endif /* EPETRA_OSKIMULTIVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_OskiPermutation.h b/packages/epetra/src/Epetra_OskiPermutation.h index 9b387ae14d92..e0c6b0004e41 100644 --- a/packages/epetra/src/Epetra_OskiPermutation.h +++ b/packages/epetra/src/Epetra_OskiPermutation.h @@ -115,3 +115,10 @@ class Epetra_OskiPermutation{ }; #endif /* EPETRA_OSKIPERMUTATION_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_OskiUtils.h b/packages/epetra/src/Epetra_OskiUtils.h index 053482ac744e..2553b40a35dd 100644 --- a/packages/epetra/src/Epetra_OskiUtils.h +++ b/packages/epetra/src/Epetra_OskiUtils.h @@ -87,3 +87,10 @@ class Epetra_OskiUtils { }; #endif /* EPETRA_OSKIUTILS_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_OskiVector.h b/packages/epetra/src/Epetra_OskiVector.h index 27486a1ae553..c9ce5cd510e0 100644 --- a/packages/epetra/src/Epetra_OskiVector.h +++ b/packages/epetra/src/Epetra_OskiVector.h @@ -105,3 +105,10 @@ class Epetra_OskiVector: public Epetra_OskiMultiVector { }; #endif /* EPETRA_OSKIVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_RowMatrix.h b/packages/epetra/src/Epetra_RowMatrix.h index 8e3b1ac98213..988c16f9829c 100644 --- a/packages/epetra/src/Epetra_RowMatrix.h +++ b/packages/epetra/src/Epetra_RowMatrix.h @@ -280,3 +280,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_RowMatrix: public virtual Epetra_Operator, pu }; #endif /* EPETRA_ROWMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_RowMatrixTransposer.h b/packages/epetra/src/Epetra_RowMatrixTransposer.h index 7ddd7f4c3d9f..7c27ef08ac5c 100644 --- a/packages/epetra/src/Epetra_RowMatrixTransposer.h +++ b/packages/epetra/src/Epetra_RowMatrixTransposer.h @@ -164,3 +164,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_RowMatrixTransposer { }; #endif /* EPETRA_ROWMATRIXTRANSPOSER_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialComm.h b/packages/epetra/src/Epetra_SerialComm.h index 43f38d505bec..17ede0eb813d 100644 --- a/packages/epetra/src/Epetra_SerialComm.h +++ b/packages/epetra/src/Epetra_SerialComm.h @@ -498,3 +498,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_SerialComm: public Epetra_Object, public virt }; #endif /* EPETRA_SERIALCOMM_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialCommData.h b/packages/epetra/src/Epetra_SerialCommData.h index baa8bd858d69..9933f4e23dec 100644 --- a/packages/epetra/src/Epetra_SerialCommData.h +++ b/packages/epetra/src/Epetra_SerialCommData.h @@ -75,3 +75,10 @@ class Epetra_SerialCommData : public Epetra_Data { }; #endif /* EPETRA_SERIALCOMMDATA_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialDenseMatrix.h b/packages/epetra/src/Epetra_SerialDenseMatrix.h index 226c9a168cf3..b5c254fa1168 100644 --- a/packages/epetra/src/Epetra_SerialDenseMatrix.h +++ b/packages/epetra/src/Epetra_SerialDenseMatrix.h @@ -540,3 +540,10 @@ inline const double* Epetra_SerialDenseMatrix::operator [] (int ColIndex) const //========================================================================= #endif /* EPETRA_SERIALDENSEMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialDenseOperator.h b/packages/epetra/src/Epetra_SerialDenseOperator.h index 67499185a035..7c44af6d23b1 100644 --- a/packages/epetra/src/Epetra_SerialDenseOperator.h +++ b/packages/epetra/src/Epetra_SerialDenseOperator.h @@ -138,3 +138,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_SerialDenseOperator { }; #endif /* _EPETRA_OPERATOR_H_ */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialDenseSVD.h b/packages/epetra/src/Epetra_SerialDenseSVD.h index b155032b1076..a1e3f368b775 100644 --- a/packages/epetra/src/Epetra_SerialDenseSVD.h +++ b/packages/epetra/src/Epetra_SerialDenseSVD.h @@ -524,3 +524,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_SerialDenseSVD : public virtual Epetra_Serial }; #endif /* _EPETRA_SERIALDENSESVD_H_ */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialDenseSolver.h b/packages/epetra/src/Epetra_SerialDenseSolver.h index bc229418c441..ee1393aa3be0 100644 --- a/packages/epetra/src/Epetra_SerialDenseSolver.h +++ b/packages/epetra/src/Epetra_SerialDenseSolver.h @@ -433,3 +433,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_SerialDenseSolver : }; #endif /* EPETRA_SERIALDENSESOLVER_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialDenseVector.h b/packages/epetra/src/Epetra_SerialDenseVector.h index 4230182ea241..7be49497367e 100644 --- a/packages/epetra/src/Epetra_SerialDenseVector.h +++ b/packages/epetra/src/Epetra_SerialDenseVector.h @@ -321,3 +321,10 @@ inline const double& Epetra_SerialDenseVector::operator [] (int Index) const { //========================================================================= #endif /* EPETRA_SERIALDENSEVECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialDistributor.h b/packages/epetra/src/Epetra_SerialDistributor.h index b97ecc38ae70..c03eaa067f23 100644 --- a/packages/epetra/src/Epetra_SerialDistributor.h +++ b/packages/epetra/src/Epetra_SerialDistributor.h @@ -157,3 +157,10 @@ class Epetra_SerialDistributor: public Epetra_Object, public virtual Epetra_Dist int nsends_; }; #endif /* EPETRA_SERIALDISTRIBUTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialSpdDenseSolver.h b/packages/epetra/src/Epetra_SerialSpdDenseSolver.h index ca2d9b754ede..ff6dd2ab1099 100644 --- a/packages/epetra/src/Epetra_SerialSpdDenseSolver.h +++ b/packages/epetra/src/Epetra_SerialSpdDenseSolver.h @@ -275,3 +275,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_SerialSpdDenseSolver : public Epetra_SerialDe }; #endif /* EPETRA_SERIALSPDDENSESOLVER_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SerialSymDenseMatrix.h b/packages/epetra/src/Epetra_SerialSymDenseMatrix.h index efbd2bffd163..2c17915a20de 100644 --- a/packages/epetra/src/Epetra_SerialSymDenseMatrix.h +++ b/packages/epetra/src/Epetra_SerialSymDenseMatrix.h @@ -280,3 +280,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_SerialSymDenseMatrix : public Epetra_SerialDe }; #endif /* EPETRA_SERIALSYMDENSEMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_SrcDistObject.h b/packages/epetra/src/Epetra_SrcDistObject.h index 935030abbb4b..984c3773769b 100644 --- a/packages/epetra/src/Epetra_SrcDistObject.h +++ b/packages/epetra/src/Epetra_SrcDistObject.h @@ -77,3 +77,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_SrcDistObject { }; #endif /* EPETRA_SRCDISTOBJECT_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Time.h b/packages/epetra/src/Epetra_Time.h index de49cbb68110..8faf5bfb44c8 100644 --- a/packages/epetra/src/Epetra_Time.h +++ b/packages/epetra/src/Epetra_Time.h @@ -130,3 +130,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_Time: public Epetra_Object { }; #endif /* EPETRA_TIME_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Util.h b/packages/epetra/src/Epetra_Util.h index c5201ef490bf..3fdb46e83f20 100644 --- a/packages/epetra/src/Epetra_Util.h +++ b/packages/epetra/src/Epetra_Util.h @@ -477,3 +477,10 @@ int EPETRA_LIB_DLL_EXPORT Epetra_Util_ExtractHbData( #endif /* EPETRA_UTIL_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_VbrMatrix.h b/packages/epetra/src/Epetra_VbrMatrix.h index 935aa2022c87..3455d432db5e 100644 --- a/packages/epetra/src/Epetra_VbrMatrix.h +++ b/packages/epetra/src/Epetra_VbrMatrix.h @@ -1478,3 +1478,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_VbrMatrix : public Epetra_DistObject, }; #endif /* EPETRA_VBRMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_VbrRowMatrix.h b/packages/epetra/src/Epetra_VbrRowMatrix.h index 15404642ccb0..7bb8212cdd69 100644 --- a/packages/epetra/src/Epetra_VbrRowMatrix.h +++ b/packages/epetra/src/Epetra_VbrRowMatrix.h @@ -246,3 +246,10 @@ class Epetra_VbrRowMatrix: public Epetra_BasicRowMatrix { }; #endif /* EPETRA_VBRROWMATRIX_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Vector.h b/packages/epetra/src/Epetra_Vector.h index bedbe5de62e7..63a67e041f79 100644 --- a/packages/epetra/src/Epetra_Vector.h +++ b/packages/epetra/src/Epetra_Vector.h @@ -471,3 +471,10 @@ class EPETRA_LIB_DLL_EXPORT Epetra_Vector : public Epetra_MultiVector { }; #endif /* EPETRA_VECTOR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/src/Epetra_Version.h b/packages/epetra/src/Epetra_Version.h index 5725f0b87db3..a9dd007ff219 100644 --- a/packages/epetra/src/Epetra_Version.h +++ b/packages/epetra/src/Epetra_Version.h @@ -47,3 +47,10 @@ std::string Epetra_Version() { return("Epetra in Trilinos " TRILINOS_VERSION_STRING); } + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/BlockMap/checkmap.h b/packages/epetra/test/BlockMap/checkmap.h index 3a7655a1ed62..a4f1855d2f8c 100644 --- a/packages/epetra/test/BlockMap/checkmap.h +++ b/packages/epetra/test/BlockMap/checkmap.h @@ -50,3 +50,10 @@ int checkmap(Epetra_BlockMap & Map, int NumGlobalElements, int NumMyElements, int IndexBase, Epetra_Comm & Comm, bool DistributedGlobal, bool IsOneToOne); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/BlockMap_LL/checkmap.h b/packages/epetra/test/BlockMap_LL/checkmap.h index 733f9367d722..84d705e1c6a8 100644 --- a/packages/epetra/test/BlockMap_LL/checkmap.h +++ b/packages/epetra/test/BlockMap_LL/checkmap.h @@ -50,3 +50,10 @@ int checkmap(Epetra_BlockMap & Map, long long NumGlobalElements, int NumMyElemen long long IndexBase, Epetra_Comm & Comm, bool DistributedGlobal, bool IsOneToOne); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/FECrsGraph/ExecuteTestProblems.h b/packages/epetra/test/FECrsGraph/ExecuteTestProblems.h index 818baf4ffbb4..528e45747e87 100644 --- a/packages/epetra/test/FECrsGraph/ExecuteTestProblems.h +++ b/packages/epetra/test/FECrsGraph/ExecuteTestProblems.h @@ -56,3 +56,10 @@ int rectangular(const Epetra_Comm& Comm, bool verbose); int Young1(const Epetra_Comm& Comm, bool verbose); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/FECrsGraph_LL/ExecuteTestProblems.h b/packages/epetra/test/FECrsGraph_LL/ExecuteTestProblems.h index 818baf4ffbb4..528e45747e87 100644 --- a/packages/epetra/test/FECrsGraph_LL/ExecuteTestProblems.h +++ b/packages/epetra/test/FECrsGraph_LL/ExecuteTestProblems.h @@ -56,3 +56,10 @@ int rectangular(const Epetra_Comm& Comm, bool verbose); int Young1(const Epetra_Comm& Comm, bool verbose); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/FECrsMatrix/ExecuteTestProblems.h b/packages/epetra/test/FECrsMatrix/ExecuteTestProblems.h index e1c7c09dd208..b177103943e2 100644 --- a/packages/epetra/test/FECrsMatrix/ExecuteTestProblems.h +++ b/packages/epetra/test/FECrsMatrix/ExecuteTestProblems.h @@ -57,3 +57,10 @@ int submatrix_formats(const Epetra_Comm& Comm, bool verbose); int rectangular(const Epetra_Comm& Comm, bool verbose); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/FECrsMatrix_LL/ExecuteTestProblems.h b/packages/epetra/test/FECrsMatrix_LL/ExecuteTestProblems.h index e1c7c09dd208..b177103943e2 100644 --- a/packages/epetra/test/FECrsMatrix_LL/ExecuteTestProblems.h +++ b/packages/epetra/test/FECrsMatrix_LL/ExecuteTestProblems.h @@ -57,3 +57,10 @@ int submatrix_formats(const Epetra_Comm& Comm, bool verbose); int rectangular(const Epetra_Comm& Comm, bool verbose); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/FEVbrMatrix/ExecuteTestProblems.h b/packages/epetra/test/FEVbrMatrix/ExecuteTestProblems.h index 02527914e0ca..54ad1c85b034 100644 --- a/packages/epetra/test/FEVbrMatrix/ExecuteTestProblems.h +++ b/packages/epetra/test/FEVbrMatrix/ExecuteTestProblems.h @@ -50,3 +50,10 @@ int quad2(const Epetra_Map& map, bool verbose); int MultiVectorTests(const Epetra_Map & Map, int NumVectors, bool verbose); int four_quads(const Epetra_Comm& Comm, bool preconstruct_graph, bool verbose); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/FEVector/ExecuteTestProblems.h b/packages/epetra/test/FEVector/ExecuteTestProblems.h index b4ea91a53f76..2f7c93e6e618 100644 --- a/packages/epetra/test/FEVector/ExecuteTestProblems.h +++ b/packages/epetra/test/FEVector/ExecuteTestProblems.h @@ -63,3 +63,10 @@ int fevec5(Epetra_Comm& Comm, bool verbose); int fevec6(Epetra_Comm& Comm, bool verbose); int fevec7(Epetra_Comm& Comm, bool verbose); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/IntMultiVector/ExecuteTestProblems.h b/packages/epetra/test/IntMultiVector/ExecuteTestProblems.h index f7e279d99ade..c1aee85e5358 100644 --- a/packages/epetra/test/IntMultiVector/ExecuteTestProblems.h +++ b/packages/epetra/test/IntMultiVector/ExecuteTestProblems.h @@ -48,3 +48,10 @@ #include "../epetra_test_err.h" int IntMultiVectorTests(const Epetra_BlockMap & Map, int NumVectors, bool verbose); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/Map/checkmap.h b/packages/epetra/test/Map/checkmap.h index 577f8d5f8167..1cdc509d8c89 100644 --- a/packages/epetra/test/Map/checkmap.h +++ b/packages/epetra/test/Map/checkmap.h @@ -48,3 +48,10 @@ int checkmap(Epetra_Map & Map, int NumGlobalElements, int NumMyElements, int * MyGlobalElements, int IndexBase, Epetra_Comm & Comm, bool DistributedGlobal); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/Map_LL/checkmap.h b/packages/epetra/test/Map_LL/checkmap.h index d87534ec53e3..d1d7c23e1a3e 100644 --- a/packages/epetra/test/Map_LL/checkmap.h +++ b/packages/epetra/test/Map_LL/checkmap.h @@ -48,3 +48,10 @@ int checkmap(Epetra_Map & Map, long long NumGlobalElements, int NumMyElements, long long * MyGlobalElements, long long IndexBase, Epetra_Comm & Comm, bool DistributedGlobal); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/MultiVector/BuildTestProblems.h b/packages/epetra/test/MultiVector/BuildTestProblems.h index ffe183a431fc..5cdaaebc2099 100644 --- a/packages/epetra/test/MultiVector/BuildTestProblems.h +++ b/packages/epetra/test/MultiVector/BuildTestProblems.h @@ -71,3 +71,10 @@ int BuildMultiVectorTests (Epetra_MultiVector & C, double* const maxval_A, double* const meanval_A ); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/MultiVector/ExecuteTestProblems.h b/packages/epetra/test/MultiVector/ExecuteTestProblems.h index 5f3464ac2031..ffd902071002 100644 --- a/packages/epetra/test/MultiVector/ExecuteTestProblems.h +++ b/packages/epetra/test/MultiVector/ExecuteTestProblems.h @@ -55,3 +55,10 @@ int MultiVectorTests(const Epetra_BlockMap & Map, int NumVectors, bool verbose); int BadResidual(bool verbose, double * Residual, int NumVectors); int BadResidual1(bool verbose, double * Residual, int NumVectors); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/Vector/BuildTestProblems.h b/packages/epetra/test/Vector/BuildTestProblems.h index f2bc7f6ad875..fe75cac6e29e 100644 --- a/packages/epetra/test/Vector/BuildTestProblems.h +++ b/packages/epetra/test/Vector/BuildTestProblems.h @@ -71,3 +71,10 @@ int BuildVectorTests (Epetra_Vector & C, double* const maxval_A, double* const meanval_A ); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/Vector/ExecuteTestProblems.h b/packages/epetra/test/Vector/ExecuteTestProblems.h index b8e931cbd849..2405217b5991 100644 --- a/packages/epetra/test/Vector/ExecuteTestProblems.h +++ b/packages/epetra/test/Vector/ExecuteTestProblems.h @@ -54,3 +54,10 @@ int MatrixTests(const Epetra_BlockMap & map, const Epetra_LocalMap & LocalMap, int VectorTests(const Epetra_BlockMap & Map, bool verbose); int BadResidual(bool verbose, double * Residual); + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/epetra_test_err.h b/packages/epetra/test/epetra_test_err.h index 1c71aee0f0b0..658aa2b30fa8 100644 --- a/packages/epetra/test/epetra_test_err.h +++ b/packages/epetra/test/epetra_test_err.h @@ -64,3 +64,10 @@ using namespace std; } #endif /* EPETRA_TEST_ERR_H */ + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/src/Epetra_matrix_data.h b/packages/epetra/test/src/Epetra_matrix_data.h index 77984eb406ea..7dac2b1a6c61 100644 --- a/packages/epetra/test/src/Epetra_matrix_data.h +++ b/packages/epetra/test/src/Epetra_matrix_data.h @@ -104,3 +104,10 @@ class EPETRA_LIB_DLL_EXPORT matrix_data { #endif + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetra/test/src/Epetra_test_functions.h b/packages/epetra/test/src/Epetra_test_functions.h index 9de7d0c423ad..56bf3ce4211a 100644 --- a/packages/epetra/test/src/Epetra_test_functions.h +++ b/packages/epetra/test/src/Epetra_test_functions.h @@ -72,3 +72,10 @@ EPETRA_LIB_DLL_EXPORT bool compare_matrices(const Epetra_CrsMatrix& A, const Epe #endif + +#if defined(Epetra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Epetra package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/cmake/EpetraExt_config.h.in b/packages/epetraext/cmake/EpetraExt_config.h.in index 0204649a3916..ea1da727668a 100644 --- a/packages/epetraext/cmake/EpetraExt_config.h.in +++ b/packages/epetraext/cmake/EpetraExt_config.h.in @@ -79,3 +79,6 @@ #cmakedefine HAVE_MPI @EPETRAEXT_DEPRECATED_DECLARATIONS@ + +#cmakedefine EpetraExt_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/epetraext/src/EpetraExt_ConfigDefs.h b/packages/epetraext/src/EpetraExt_ConfigDefs.h index f40fc222c9a3..5467d9615eb9 100644 --- a/packages/epetraext/src/EpetraExt_ConfigDefs.h +++ b/packages/epetraext/src/EpetraExt_ConfigDefs.h @@ -89,3 +89,10 @@ #include "Teuchos_CompilerCodeTweakMacros.hpp" #endif /* EPETRAEXT_CONFIGDEFS_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/EpetraExt_MMHelpers.h b/packages/epetraext/src/EpetraExt_MMHelpers.h index 70019ba16545..40a9c2c4d76f 100644 --- a/packages/epetraext/src/EpetraExt_MMHelpers.h +++ b/packages/epetraext/src/EpetraExt_MMHelpers.h @@ -535,3 +535,10 @@ void PrintMultiplicationStatistics(Epetra_Export * Transfer, const std::string & #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/EpetraExt_MatrixMatrix.h b/packages/epetraext/src/EpetraExt_MatrixMatrix.h index c79a862b01d8..309716bbac1e 100644 --- a/packages/epetraext/src/EpetraExt_MatrixMatrix.h +++ b/packages/epetraext/src/EpetraExt_MatrixMatrix.h @@ -286,3 +286,10 @@ class MatrixMatrix { #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/EpetraExt_ProductOperator.h b/packages/epetraext/src/EpetraExt_ProductOperator.h index febd0ca7dcb0..e9eca74569da 100644 --- a/packages/epetraext/src/EpetraExt_ProductOperator.h +++ b/packages/epetraext/src/EpetraExt_ProductOperator.h @@ -416,3 +416,10 @@ void ProductOperator::validateIndex(int k) const } // namespace EpetraExt #endif // EPETRAEXT_PRODUCT_OPERATOR_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/EpetraExt_Version.h b/packages/epetraext/src/EpetraExt_Version.h index 0bc34a972891..bcb746c8d877 100644 --- a/packages/epetraext/src/EpetraExt_Version.h +++ b/packages/epetraext/src/EpetraExt_Version.h @@ -54,3 +54,10 @@ namespace EpetraExt { #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_BlockCrsMatrix.h b/packages/epetraext/src/block/EpetraExt_BlockCrsMatrix.h index 869e07f031e9..d3567192221a 100644 --- a/packages/epetraext/src/block/EpetraExt_BlockCrsMatrix.h +++ b/packages/epetraext/src/block/EpetraExt_BlockCrsMatrix.h @@ -273,3 +273,10 @@ template<> inline std::vector< std::vector >& BlockCrsMatrix::TRowSte } //namespace EpetraExt #endif /* EPETRA_CRSMATRIX_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_BlockDiagMatrix.h b/packages/epetraext/src/block/EpetraExt_BlockDiagMatrix.h index be36e12c3e11..e73b4220ed91 100644 --- a/packages/epetraext/src/block/EpetraExt_BlockDiagMatrix.h +++ b/packages/epetraext/src/block/EpetraExt_BlockDiagMatrix.h @@ -278,3 +278,10 @@ class EpetraExt_BlockDiagMatrix : public virtual Epetra_Operator, public Epetra_ }; /* EPETRAEXT_BLOCKDIAGMATRIX_H */ #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_BlockMultiVector.h b/packages/epetraext/src/block/EpetraExt_BlockMultiVector.h index 8b75b66526c9..3e982043821c 100644 --- a/packages/epetraext/src/block/EpetraExt_BlockMultiVector.h +++ b/packages/epetraext/src/block/EpetraExt_BlockMultiVector.h @@ -118,3 +118,10 @@ class BlockMultiVector: public Epetra_MultiVector { } //namespace EpetraExt #endif /* EPETRAEXT_BLOCKMULTIVECTOR_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_BlockUtility.h b/packages/epetraext/src/block/EpetraExt_BlockUtility.h index 649fc9101570..2b93fe6b7203 100644 --- a/packages/epetraext/src/block/EpetraExt_BlockUtility.h +++ b/packages/epetraext/src/block/EpetraExt_BlockUtility.h @@ -160,3 +160,10 @@ class BlockUtility { } //namespace EpetraExt #endif /* EPETRA_CRSMATRIX_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_BlockVector.h b/packages/epetraext/src/block/EpetraExt_BlockVector.h index be9b4287eddd..fbe97f8dfe57 100644 --- a/packages/epetraext/src/block/EpetraExt_BlockVector.h +++ b/packages/epetraext/src/block/EpetraExt_BlockVector.h @@ -136,3 +136,10 @@ class BlockVector: public Epetra_Vector { } //namespace EpetraExt #endif /* EPETRAEXT_BLOCKVECTOR_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_MultiComm.h b/packages/epetraext/src/block/EpetraExt_MultiComm.h index 821214132924..af48ed10abf7 100644 --- a/packages/epetraext/src/block/EpetraExt_MultiComm.h +++ b/packages/epetraext/src/block/EpetraExt_MultiComm.h @@ -107,3 +107,10 @@ class MultiComm: public virtual Epetra_Comm { + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_MultiMpiComm.h b/packages/epetraext/src/block/EpetraExt_MultiMpiComm.h index b13e3822316d..cd40a5ff32b3 100644 --- a/packages/epetraext/src/block/EpetraExt_MultiMpiComm.h +++ b/packages/epetraext/src/block/EpetraExt_MultiMpiComm.h @@ -214,3 +214,10 @@ class MultiMpiComm: public EpetraExt::MultiComm, public Epetra_MpiComm, } //namespace EpetraExt #endif /* EPETRAEXT_MULTIMPICOMM_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_MultiPointModelEvaluator.h b/packages/epetraext/src/block/EpetraExt_MultiPointModelEvaluator.h index cd618a718246..3ccfc7d6cb05 100644 --- a/packages/epetraext/src/block/EpetraExt_MultiPointModelEvaluator.h +++ b/packages/epetraext/src/block/EpetraExt_MultiPointModelEvaluator.h @@ -214,3 +214,10 @@ namespace EpetraExt { }; } #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_MultiSerialComm.h b/packages/epetraext/src/block/EpetraExt_MultiSerialComm.h index 629cc3061e31..4236eb82979f 100644 --- a/packages/epetraext/src/block/EpetraExt_MultiSerialComm.h +++ b/packages/epetraext/src/block/EpetraExt_MultiSerialComm.h @@ -184,3 +184,10 @@ class MultiSerialComm: public EpetraExt::MultiComm { } //namespace EpetraExt #endif /* EPETRAEXT_MULTISERIALCOMM_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/block/EpetraExt_PointToBlockDiagPermute.h b/packages/epetraext/src/block/EpetraExt_PointToBlockDiagPermute.h index b6065d4712d5..a0b68fcdc848 100644 --- a/packages/epetraext/src/block/EpetraExt_PointToBlockDiagPermute.h +++ b/packages/epetraext/src/block/EpetraExt_PointToBlockDiagPermute.h @@ -340,3 +340,10 @@ template<> inline long long*& EpetraExt_PointToBlockDiagPermute::Blockids_ref { } //namespace EpetraExt #endif //EpetraExt_CRSGRAPH_BTF_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/btf/EpetraExt_BTF_CrsMatrix.h b/packages/epetraext/src/btf/EpetraExt_BTF_CrsMatrix.h index 8ecee45eed88..07bdf5b9ecef 100644 --- a/packages/epetraext/src/btf/EpetraExt_BTF_CrsMatrix.h +++ b/packages/epetraext/src/btf/EpetraExt_BTF_CrsMatrix.h @@ -91,3 +91,10 @@ class CrsMatrix_BTF : public SameTypeTransform { } //namespace EpetraExt #endif //EpetraExt_CRSMATRIX_BTF_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/btf/EpetraExt_BTF_LinearProblem.h b/packages/epetraext/src/btf/EpetraExt_BTF_LinearProblem.h index df3c09ef782c..5d4fdb3d6c55 100644 --- a/packages/epetraext/src/btf/EpetraExt_BTF_LinearProblem.h +++ b/packages/epetraext/src/btf/EpetraExt_BTF_LinearProblem.h @@ -136,3 +136,10 @@ class LinearProblem_BTF : public SameTypeTransform { } //namespace EpetraExt #endif //EpetraExt_LINEARPROBLEM_BTF_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/btf/EpetraExt_BlockJacobi_LinearProblem.h b/packages/epetraext/src/btf/EpetraExt_BlockJacobi_LinearProblem.h index cf91f1c8e643..7b966e089493 100644 --- a/packages/epetraext/src/btf/EpetraExt_BlockJacobi_LinearProblem.h +++ b/packages/epetraext/src/btf/EpetraExt_BlockJacobi_LinearProblem.h @@ -109,3 +109,10 @@ class LinearProblem_BlockJacobi : public SameTypeTransform } //namespace EpetraExt #endif //EPETRAEXT_BLOCKJACOBI_LINEARPROBLEM_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/coloring/EpetraExt_MapColoring.h b/packages/epetraext/src/coloring/EpetraExt_MapColoring.h index ba105f4e7b7e..bb6ecd10299b 100644 --- a/packages/epetraext/src/coloring/EpetraExt_MapColoring.h +++ b/packages/epetraext/src/coloring/EpetraExt_MapColoring.h @@ -103,3 +103,10 @@ class CrsGraph_MapColoring : public StructuralTransform const & pList, } //namespace EpetraExt #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/distdir/EpetraExt_PackTraits.h b/packages/epetraext/src/distdir/EpetraExt_PackTraits.h index 0c7d1a625331..cf549823ac5f 100644 --- a/packages/epetraext/src/distdir/EpetraExt_PackTraits.h +++ b/packages/epetraext/src/distdir/EpetraExt_PackTraits.h @@ -152,3 +152,10 @@ struct PackTraits< std::vector > } //namespace EpetraExt #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/hypre/EpetraExt_HypreIJMatrix.h b/packages/epetraext/src/hypre/EpetraExt_HypreIJMatrix.h index 66d9cda53fd7..49010b551060 100644 --- a/packages/epetraext/src/hypre/EpetraExt_HypreIJMatrix.h +++ b/packages/epetraext/src/hypre/EpetraExt_HypreIJMatrix.h @@ -455,3 +455,10 @@ class EpetraExt_HypreIJMatrix: public Epetra_BasicRowMatrix { bool *IsPrecondSetup_; }; #endif /* EPETRAEXT_HYPREIJMATRIX_H_ */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_BlockMapIn.h b/packages/epetraext/src/inout/EpetraExt_BlockMapIn.h index 2ee7e24519a6..dbf4ebfeb63d 100644 --- a/packages/epetraext/src/inout/EpetraExt_BlockMapIn.h +++ b/packages/epetraext/src/inout/EpetraExt_BlockMapIn.h @@ -141,3 +141,10 @@ namespace EpetraExt { } // namespace EpetraExt #endif /* EPETRAEXT_BLOCKMAPIN_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_BlockMapOut.h b/packages/epetraext/src/inout/EpetraExt_BlockMapOut.h index 69cf6dfb5b8f..6122097b804d 100644 --- a/packages/epetraext/src/inout/EpetraExt_BlockMapOut.h +++ b/packages/epetraext/src/inout/EpetraExt_BlockMapOut.h @@ -96,3 +96,10 @@ namespace EpetraExt { } // namespace EpetraExt #endif /* EPETRAEXT_BLOCKMAPOUT_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_CrsMatrixIn.h b/packages/epetraext/src/inout/EpetraExt_CrsMatrixIn.h index f8ebc646ef46..38f49233bc85 100644 --- a/packages/epetraext/src/inout/EpetraExt_CrsMatrixIn.h +++ b/packages/epetraext/src/inout/EpetraExt_CrsMatrixIn.h @@ -266,3 +266,10 @@ must be integer values and in those in the third column must be floating point f #endif } // namespace EpetraExt #endif /* EPETRAEXT_CRSMATRIXIN_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_DistArray.h b/packages/epetraext/src/inout/EpetraExt_DistArray.h index f23bd47a9118..b73e17d76b3e 100644 --- a/packages/epetraext/src/inout/EpetraExt_DistArray.h +++ b/packages/epetraext/src/inout/EpetraExt_DistArray.h @@ -354,3 +354,10 @@ COO(i, j) = 1.24 } // namespace EpetraExt #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_Exception.h b/packages/epetraext/src/inout/EpetraExt_Exception.h index 798203c4fcd0..81d62c45a41e 100644 --- a/packages/epetraext/src/inout/EpetraExt_Exception.h +++ b/packages/epetraext/src/inout/EpetraExt_Exception.h @@ -99,3 +99,10 @@ class Exception } // namespace EpetraExt #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_HDF5.h b/packages/epetraext/src/inout/EpetraExt_HDF5.h index f28de4ee73e0..a32093630813 100644 --- a/packages/epetraext/src/inout/EpetraExt_HDF5.h +++ b/packages/epetraext/src/inout/EpetraExt_HDF5.h @@ -630,3 +630,10 @@ class HDF5 } #endif #endif /* EPETRAEXT_HDF5_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_HDF5_Handle.h b/packages/epetraext/src/inout/EpetraExt_HDF5_Handle.h index 5d6623d2c256..6fad1c806af9 100644 --- a/packages/epetraext/src/inout/EpetraExt_HDF5_Handle.h +++ b/packages/epetraext/src/inout/EpetraExt_HDF5_Handle.h @@ -207,3 +207,10 @@ class Epetra_Vector_Handle : public Handle } // namespace EpetraExt #endif #endif /* EPETRAEXT_HDF5_HANDLE_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_MultiVectorIn.h b/packages/epetraext/src/inout/EpetraExt_MultiVectorIn.h index 03ea357ed299..5ab86d012720 100644 --- a/packages/epetraext/src/inout/EpetraExt_MultiVectorIn.h +++ b/packages/epetraext/src/inout/EpetraExt_MultiVectorIn.h @@ -63,3 +63,10 @@ namespace EpetraExt { } // namespace EpetraExt #endif /* EPETRAEXT_MULTIVECTORIN_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_MultiVectorOut.h b/packages/epetraext/src/inout/EpetraExt_MultiVectorOut.h index df1695909cf2..5e7b6eb14823 100644 --- a/packages/epetraext/src/inout/EpetraExt_MultiVectorOut.h +++ b/packages/epetraext/src/inout/EpetraExt_MultiVectorOut.h @@ -125,3 +125,10 @@ namespace EpetraExt { } // namespace EpetraExt #endif /* EPETRAEXT_MULTIVECTOROUT_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_OperatorOut.h b/packages/epetraext/src/inout/EpetraExt_OperatorOut.h index dd350f00c3cc..de20b02c08c7 100644 --- a/packages/epetraext/src/inout/EpetraExt_OperatorOut.h +++ b/packages/epetraext/src/inout/EpetraExt_OperatorOut.h @@ -135,3 +135,10 @@ namespace EpetraExt { } // namespace EpetraExt #endif /* EPETRAEXT_OPERATOROUT_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_RowMatrixOut.h b/packages/epetraext/src/inout/EpetraExt_RowMatrixOut.h index 9db29c68013c..c1b012068069 100644 --- a/packages/epetraext/src/inout/EpetraExt_RowMatrixOut.h +++ b/packages/epetraext/src/inout/EpetraExt_RowMatrixOut.h @@ -129,3 +129,10 @@ namespace EpetraExt { } // namespace EpetraExt #endif /* EPETRAEXT_ROWMATRIXOUT_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_Utils.h b/packages/epetraext/src/inout/EpetraExt_Utils.h index fa38579cfa9f..9d7c89b7af0d 100644 --- a/packages/epetraext/src/inout/EpetraExt_Utils.h +++ b/packages/epetraext/src/inout/EpetraExt_Utils.h @@ -52,3 +52,10 @@ namespace EpetraExt } #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_VectorIn.h b/packages/epetraext/src/inout/EpetraExt_VectorIn.h index 9325b80da79e..e35088621fa3 100644 --- a/packages/epetraext/src/inout/EpetraExt_VectorIn.h +++ b/packages/epetraext/src/inout/EpetraExt_VectorIn.h @@ -64,3 +64,10 @@ namespace EpetraExt { } // namespace EpetraExt #endif /* EPETRAEXT_VECTORIN_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_VectorOut.h b/packages/epetraext/src/inout/EpetraExt_VectorOut.h index 0705115f7a72..bf89028b8635 100644 --- a/packages/epetraext/src/inout/EpetraExt_VectorOut.h +++ b/packages/epetraext/src/inout/EpetraExt_VectorOut.h @@ -129,3 +129,10 @@ namespace EpetraExt { } // namespace EpetraExt #endif /* EPETRAEXT_VECTOROUT_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_XMLReader.h b/packages/epetraext/src/inout/EpetraExt_XMLReader.h index 4f21e22f1005..59c3a65572e7 100644 --- a/packages/epetraext/src/inout/EpetraExt_XMLReader.h +++ b/packages/epetraext/src/inout/EpetraExt_XMLReader.h @@ -182,3 +182,10 @@ class XMLReader } // namespace EpetraExt #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_XMLWriter.h b/packages/epetraext/src/inout/EpetraExt_XMLWriter.h index ece0fff675ae..308a4af7879c 100644 --- a/packages/epetraext/src/inout/EpetraExt_XMLWriter.h +++ b/packages/epetraext/src/inout/EpetraExt_XMLWriter.h @@ -220,3 +220,10 @@ class XMLWriter } // namespace EpetraExt #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_mmio.h b/packages/epetraext/src/inout/EpetraExt_mmio.h index d44eddecd880..b7520f930257 100644 --- a/packages/epetraext/src/inout/EpetraExt_mmio.h +++ b/packages/epetraext/src/inout/EpetraExt_mmio.h @@ -183,3 +183,10 @@ int mm_read_unsymmetric_sparse(const char *fname, int *M_, int *N_, int *nz_, } // namespace EpetraExt #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/inout/EpetraExt_readEpetraLinearSystem.h b/packages/epetraext/src/inout/EpetraExt_readEpetraLinearSystem.h index 13c2249b1b11..4d74a4dcd5b7 100644 --- a/packages/epetraext/src/inout/EpetraExt_readEpetraLinearSystem.h +++ b/packages/epetraext/src/inout/EpetraExt_readEpetraLinearSystem.h @@ -99,3 +99,10 @@ void readEpetraLinearSystem64( } // namespace EpetraExt #endif // EPETRAEXT_READ_EPETRA_LINEAR_SYSTEM_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/matlab/EpetraExt_MatlabEngine.h b/packages/epetraext/src/matlab/EpetraExt_MatlabEngine.h index be1d797c3edc..f56b823e9b52 100644 --- a/packages/epetraext/src/matlab/EpetraExt_MatlabEngine.h +++ b/packages/epetraext/src/matlab/EpetraExt_MatlabEngine.h @@ -393,3 +393,10 @@ class EpetraExt_MatlabEngine { } // namespace EpetraExt #endif /* MATLAB_ENGINE_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/matlab/EpetraExt_PutBlockMap.h b/packages/epetraext/src/matlab/EpetraExt_PutBlockMap.h index 92a98cd68dcb..7334a0fee220 100644 --- a/packages/epetraext/src/matlab/EpetraExt_PutBlockMap.h +++ b/packages/epetraext/src/matlab/EpetraExt_PutBlockMap.h @@ -67,3 +67,10 @@ namespace Matlab { } // namespace Matlab #endif /* PUT_ROWBLOCKMAP_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/matlab/EpetraExt_PutMultiVector.h b/packages/epetraext/src/matlab/EpetraExt_PutMultiVector.h index 9914c3835045..379f4feae1a5 100644 --- a/packages/epetraext/src/matlab/EpetraExt_PutMultiVector.h +++ b/packages/epetraext/src/matlab/EpetraExt_PutMultiVector.h @@ -66,3 +66,10 @@ namespace Matlab { } // namespace Matlab #endif /* PUT_MULTIVECTOR_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/matlab/EpetraExt_PutRowMatrix.h b/packages/epetraext/src/matlab/EpetraExt_PutRowMatrix.h index 692f94561b55..fe203baa0c77 100644 --- a/packages/epetraext/src/matlab/EpetraExt_PutRowMatrix.h +++ b/packages/epetraext/src/matlab/EpetraExt_PutRowMatrix.h @@ -66,3 +66,10 @@ namespace Matlab { } // namespace Matlab #endif /* PUT_ROWMATRIX_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/model_evaluator/EpetraExt_ModelEvaluator.h b/packages/epetraext/src/model_evaluator/EpetraExt_ModelEvaluator.h index fd77876ee191..8d917e7d91ee 100644 --- a/packages/epetraext/src/model_evaluator/EpetraExt_ModelEvaluator.h +++ b/packages/epetraext/src/model_evaluator/EpetraExt_ModelEvaluator.h @@ -2378,3 +2378,10 @@ void ModelEvaluator::OutArgsSetup::set_DgDp_mp_properties( int j, int l, const D } // namespace EpetraExt #endif // EPETRA_EXT_MODEL_EVALUATOR_HPP + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/model_evaluator/EpetraExt_ModelEvaluatorScalingTools.h b/packages/epetraext/src/model_evaluator/EpetraExt_ModelEvaluatorScalingTools.h index ed6ea03feb36..80a6cd5b633f 100644 --- a/packages/epetraext/src/model_evaluator/EpetraExt_ModelEvaluatorScalingTools.h +++ b/packages/epetraext/src/model_evaluator/EpetraExt_ModelEvaluatorScalingTools.h @@ -729,3 +729,10 @@ class OutArgsGetterSetter_g { #endif // EPETRA_EXT_MODEL_EVALUATOR_SCALING_TOOLS_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/model_evaluator/EpetraExt_PolynomialVectorTraits.h b/packages/epetraext/src/model_evaluator/EpetraExt_PolynomialVectorTraits.h index 04067432f2d4..70fffc53fd46 100644 --- a/packages/epetraext/src/model_evaluator/EpetraExt_PolynomialVectorTraits.h +++ b/packages/epetraext/src/model_evaluator/EpetraExt_PolynomialVectorTraits.h @@ -90,3 +90,10 @@ namespace Teuchos { } // namespace Teuchos #endif // EPETRA_EXT_POLYNOMIAL_VECTOR_TRAITS_Hx + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/petsc/EpetraExt_PETScAIJMatrix.h b/packages/epetraext/src/petsc/EpetraExt_PETScAIJMatrix.h index d128d67bdbc2..9ea6551d7869 100644 --- a/packages/epetraext/src/petsc/EpetraExt_PETScAIJMatrix.h +++ b/packages/epetraext/src/petsc/EpetraExt_PETScAIJMatrix.h @@ -417,3 +417,10 @@ class Epetra_PETScAIJMatrix: public Epetra_Object, public Epetra_CompObject, pub //Epetra_PETScAIJMatrix(const Epetra_PETScAIJMatrix & Matrix) {(void)Matrix;} }; #endif /* _EPETRAEXT_PETSCAIJMATRIX_H_ */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/restrict/EpetraExt_RestrictedCrsMatrixWrapper.h b/packages/epetraext/src/restrict/EpetraExt_RestrictedCrsMatrixWrapper.h index a6027cfb5939..00e651c6fd67 100644 --- a/packages/epetraext/src/restrict/EpetraExt_RestrictedCrsMatrixWrapper.h +++ b/packages/epetraext/src/restrict/EpetraExt_RestrictedCrsMatrixWrapper.h @@ -115,3 +115,10 @@ class RestrictedCrsMatrixWrapper{ #endif #endif /* EPETRAEXT_RESTRICTEDCRSMATRIXWRAPPER_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/restrict/EpetraExt_RestrictedMultiVectorWrapper.h b/packages/epetraext/src/restrict/EpetraExt_RestrictedMultiVectorWrapper.h index 4681c9e14f08..894b319eaca9 100644 --- a/packages/epetraext/src/restrict/EpetraExt_RestrictedMultiVectorWrapper.h +++ b/packages/epetraext/src/restrict/EpetraExt_RestrictedMultiVectorWrapper.h @@ -124,3 +124,10 @@ class RestrictedMultiVectorWrapper{ #endif #endif /* EPETRAEXT_RESTRICTEDMULTIVECTORWRAPPER_H */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_AMD_CrsGraph.h b/packages/epetraext/src/transform/EpetraExt_AMD_CrsGraph.h index 8060ab3bed15..20f7edd51fc3 100644 --- a/packages/epetraext/src/transform/EpetraExt_AMD_CrsGraph.h +++ b/packages/epetraext/src/transform/EpetraExt_AMD_CrsGraph.h @@ -87,3 +87,10 @@ class CrsGraph_AMD : public StructuralSameTypeTransform { } //namespace EpetraExt #endif //EpetraExt_CRSGRAPH_AMD_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_BlockAdjacencyGraph.h b/packages/epetraext/src/transform/EpetraExt_BlockAdjacencyGraph.h index c3aa9d6c92e7..6307470ca866 100644 --- a/packages/epetraext/src/transform/EpetraExt_BlockAdjacencyGraph.h +++ b/packages/epetraext/src/transform/EpetraExt_BlockAdjacencyGraph.h @@ -97,3 +97,10 @@ class BlockAdjacencyGraph { } //namespace EpetraExt #endif //EpetraExt_BLOCK_ADJACENCY_GRAPH_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_CrsSingletonFilter_LinearProblem.h b/packages/epetraext/src/transform/EpetraExt_CrsSingletonFilter_LinearProblem.h index 2cb3e378d516..e9385e4f28cb 100644 --- a/packages/epetraext/src/transform/EpetraExt_CrsSingletonFilter_LinearProblem.h +++ b/packages/epetraext/src/transform/EpetraExt_CrsSingletonFilter_LinearProblem.h @@ -351,3 +351,10 @@ class LinearProblem_CrsSingletonFilter : public SameTypeTransform #endif //EpetraExt_CRSMATRIX_DIRICHLET_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Dirichlet_Vector.h b/packages/epetraext/src/transform/EpetraExt_Dirichlet_Vector.h index d63c119a4869..0833dbecdb74 100644 --- a/packages/epetraext/src/transform/EpetraExt_Dirichlet_Vector.h +++ b/packages/epetraext/src/transform/EpetraExt_Dirichlet_Vector.h @@ -92,3 +92,10 @@ class Vector_Dirichlet : public InPlaceTransform #endif //EpetraExt_VECTOR_DIRICHLET_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_LPTrans_From_GraphTrans.h b/packages/epetraext/src/transform/EpetraExt_LPTrans_From_GraphTrans.h index 1a827a501b41..974f89900270 100644 --- a/packages/epetraext/src/transform/EpetraExt_LPTrans_From_GraphTrans.h +++ b/packages/epetraext/src/transform/EpetraExt_LPTrans_From_GraphTrans.h @@ -122,3 +122,10 @@ class LinearProblem_GraphTrans : public SameTypeTransform #endif //EpetraExt_LINEARPROBLEM_GRAPHTRANS_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_LPTrans_From_MatrixTrans.h b/packages/epetraext/src/transform/EpetraExt_LPTrans_From_MatrixTrans.h index f1f7b50611a0..3ebaccacd11e 100644 --- a/packages/epetraext/src/transform/EpetraExt_LPTrans_From_MatrixTrans.h +++ b/packages/epetraext/src/transform/EpetraExt_LPTrans_From_MatrixTrans.h @@ -111,3 +111,10 @@ class LinearProblem_MatrixTrans : public SameTypeTransform #endif //EpetraExt_LINEARPROBLEM_MATRIXTRANS_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Overlap_CrsGraph.h b/packages/epetraext/src/transform/EpetraExt_Overlap_CrsGraph.h index ccf890d7a9be..f316b29086f8 100644 --- a/packages/epetraext/src/transform/EpetraExt_Overlap_CrsGraph.h +++ b/packages/epetraext/src/transform/EpetraExt_Overlap_CrsGraph.h @@ -87,3 +87,10 @@ class CrsGraph_Overlap : public StructuralSameTypeTransform { } //namespace EpetraExt #endif //EpetraExt_CRSGRAPH_OVERLAP_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Permutation.h b/packages/epetraext/src/transform/EpetraExt_Permutation.h index 8ae95f7fc294..59fa8a51e436 100644 --- a/packages/epetraext/src/transform/EpetraExt_Permutation.h +++ b/packages/epetraext/src/transform/EpetraExt_Permutation.h @@ -286,3 +286,10 @@ class Permutation64 : public TPermutation { #endif + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Permutation_impl.h b/packages/epetraext/src/transform/EpetraExt_Permutation_impl.h index 5495230c61da..ad11620b0631 100644 --- a/packages/epetraext/src/transform/EpetraExt_Permutation_impl.h +++ b/packages/epetraext/src/transform/EpetraExt_Permutation_impl.h @@ -594,3 +594,10 @@ TPermutation::operator()( typename TPermutation::Input } // namespace EpetraExt #endif //EpetraExt_PERMUTATION_IMPL_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Reindex_CrsMatrix.h b/packages/epetraext/src/transform/EpetraExt_Reindex_CrsMatrix.h index 6ae3f23f3738..d0ecd4665864 100644 --- a/packages/epetraext/src/transform/EpetraExt_Reindex_CrsMatrix.h +++ b/packages/epetraext/src/transform/EpetraExt_Reindex_CrsMatrix.h @@ -89,3 +89,10 @@ class CrsMatrix_Reindex : public ViewTransform { } //namespace EpetraExt #endif //EpetraExt_CRSMATRIX_REINDEX_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Reindex_LinearProblem.h b/packages/epetraext/src/transform/EpetraExt_Reindex_LinearProblem.h index 1d0089d9d6e7..9184bc317c0d 100644 --- a/packages/epetraext/src/transform/EpetraExt_Reindex_LinearProblem.h +++ b/packages/epetraext/src/transform/EpetraExt_Reindex_LinearProblem.h @@ -97,3 +97,10 @@ class LinearProblem_Reindex : public ViewTransform #endif //EpetraExt_LINEARPROBLEM_REINDEX_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Reindex_LinearProblem2.h b/packages/epetraext/src/transform/EpetraExt_Reindex_LinearProblem2.h index 5f7956480347..421f94f96e26 100644 --- a/packages/epetraext/src/transform/EpetraExt_Reindex_LinearProblem2.h +++ b/packages/epetraext/src/transform/EpetraExt_Reindex_LinearProblem2.h @@ -99,3 +99,10 @@ class LinearProblem_Reindex2 : public ViewTransform #endif //EpetraExt_LINEARPROBLEM_REINDEX_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Reindex_MultiVector.h b/packages/epetraext/src/transform/EpetraExt_Reindex_MultiVector.h index 0246f5a644f3..f461ae9bee60 100644 --- a/packages/epetraext/src/transform/EpetraExt_Reindex_MultiVector.h +++ b/packages/epetraext/src/transform/EpetraExt_Reindex_MultiVector.h @@ -82,3 +82,10 @@ class MultiVector_Reindex : public ViewTransform { } //namespace EpetraExt #endif //EpetraExt_MULTIVECTOR_REINDEX_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Scale_LinearProblem.h b/packages/epetraext/src/transform/EpetraExt_Scale_LinearProblem.h index 24bcf94179cc..1deaa864e31b 100644 --- a/packages/epetraext/src/transform/EpetraExt_Scale_LinearProblem.h +++ b/packages/epetraext/src/transform/EpetraExt_Scale_LinearProblem.h @@ -108,3 +108,10 @@ class LinearProblem_Scale : public InPlaceTransform #endif //EpetraExt_LINEARPROBLEM_SCALE_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_SolverMap_CrsMatrix.h b/packages/epetraext/src/transform/EpetraExt_SolverMap_CrsMatrix.h index 1a74196007f5..6b5df15d34dc 100644 --- a/packages/epetraext/src/transform/EpetraExt_SolverMap_CrsMatrix.h +++ b/packages/epetraext/src/transform/EpetraExt_SolverMap_CrsMatrix.h @@ -91,3 +91,10 @@ class CrsMatrix_SolverMap : public StructuralSameTypeTransform } //namespace EpetraExt #endif //EpetraExt_CRSMATRIX_SOLVERMAP_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_SolverMap_LinearProblem.h b/packages/epetraext/src/transform/EpetraExt_SolverMap_LinearProblem.h index 1962a44e5bed..91b577511885 100644 --- a/packages/epetraext/src/transform/EpetraExt_SolverMap_LinearProblem.h +++ b/packages/epetraext/src/transform/EpetraExt_SolverMap_LinearProblem.h @@ -80,3 +80,10 @@ class LinearProblem_SolverMap : public StructuralSameTypeTransform { } //namespace EpetraExt #endif //EpetraExt_CRSGRAPH_SUBCOPY_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_SymmRCM_CrsGraph.h b/packages/epetraext/src/transform/EpetraExt_SymmRCM_CrsGraph.h index 2670f280fb38..47a77dbff8bf 100644 --- a/packages/epetraext/src/transform/EpetraExt_SymmRCM_CrsGraph.h +++ b/packages/epetraext/src/transform/EpetraExt_SymmRCM_CrsGraph.h @@ -109,3 +109,10 @@ struct CrsGraph_SymmRCM : public StructuralSameTypeTransform { } //namespace EpetraExt #endif //EpetraExt_CRSGRAPH_SYMMRCM_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Transform.h b/packages/epetraext/src/transform/EpetraExt_Transform.h index 29c3bd055654..220e30c24186 100644 --- a/packages/epetraext/src/transform/EpetraExt_Transform.h +++ b/packages/epetraext/src/transform/EpetraExt_Transform.h @@ -315,3 +315,10 @@ class ViewTransform : public SameTypeTransform } //namespace EpetraExt #endif //EPETRAEXT_TRANSFORM_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Transform_Composite.h b/packages/epetraext/src/transform/EpetraExt_Transform_Composite.h index 7b3043ee8b30..2fa0df49f378 100644 --- a/packages/epetraext/src/transform/EpetraExt_Transform_Composite.h +++ b/packages/epetraext/src/transform/EpetraExt_Transform_Composite.h @@ -180,3 +180,10 @@ rvs() } //namespace EpetraExt #endif //EPETRAEXT_TRANSFORM_COMPOSITE_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Transpose_CrsGraph.h b/packages/epetraext/src/transform/EpetraExt_Transpose_CrsGraph.h index 13999b043fe0..4a0a7f70d4f7 100644 --- a/packages/epetraext/src/transform/EpetraExt_Transpose_CrsGraph.h +++ b/packages/epetraext/src/transform/EpetraExt_Transpose_CrsGraph.h @@ -74,3 +74,10 @@ class CrsGraph_Transpose : public StructuralSameTypeTransform { } //namespace EpetraExt #endif //EpetraExt_CRSGRAPH_TRANSPOSE_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_Transpose_RowMatrix.h b/packages/epetraext/src/transform/EpetraExt_Transpose_RowMatrix.h index 35fab3ecbea4..2a829c04586c 100644 --- a/packages/epetraext/src/transform/EpetraExt_Transpose_RowMatrix.h +++ b/packages/epetraext/src/transform/EpetraExt_Transpose_RowMatrix.h @@ -117,3 +117,10 @@ class RowMatrix_Transpose : public SameTypeTransform } //namespace EpetraExt #endif //EpetraExt_ROWMATRIX_TRANSPOSE_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_View_CrsGraph.h b/packages/epetraext/src/transform/EpetraExt_View_CrsGraph.h index 12e04fc48bea..c346bae9a4a9 100644 --- a/packages/epetraext/src/transform/EpetraExt_View_CrsGraph.h +++ b/packages/epetraext/src/transform/EpetraExt_View_CrsGraph.h @@ -75,3 +75,10 @@ class CrsGraph_View : public ViewTransform { } //namespace EpetraExt #endif //EpetraExt_CRSGRAPH_VIEW_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_View_CrsMatrix.h b/packages/epetraext/src/transform/EpetraExt_View_CrsMatrix.h index 8d382d4125d1..17a18dd9c2d5 100644 --- a/packages/epetraext/src/transform/EpetraExt_View_CrsMatrix.h +++ b/packages/epetraext/src/transform/EpetraExt_View_CrsMatrix.h @@ -75,3 +75,10 @@ class CrsMatrix_View : public ViewTransform { } //namespace EpetraExt #endif //EpetraExt_CRSMATRIX_VIEW_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/src/transform/EpetraExt_View_MultiVector.h b/packages/epetraext/src/transform/EpetraExt_View_MultiVector.h index f4abc79a6e7e..ed23c1341f11 100644 --- a/packages/epetraext/src/transform/EpetraExt_View_MultiVector.h +++ b/packages/epetraext/src/transform/EpetraExt_View_MultiVector.h @@ -79,3 +79,10 @@ class MultiVector_View : public ViewTransform { } //namespace EpetraExt #endif //EpetraExt_MULTIVECTOR_VIEW_H + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/test/epetra_test_err.h b/packages/epetraext/test/epetra_test_err.h index dd4dba500b98..3a2fd7119a52 100644 --- a/packages/epetraext/test/epetra_test_err.h +++ b/packages/epetraext/test/epetra_test_err.h @@ -62,3 +62,10 @@ using namespace std; } #endif /*_EPETRA_TEST_ERR_H_ */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/test/inout/Poisson2dOperator.h b/packages/epetraext/test/inout/Poisson2dOperator.h index ac2077be909f..6b2deb93bfd3 100644 --- a/packages/epetraext/test/inout/Poisson2dOperator.h +++ b/packages/epetraext/test/inout/Poisson2dOperator.h @@ -165,3 +165,10 @@ class Poisson2dOperator: public virtual Epetra_Operator { }; #endif /* _POISSON2DOPERATOR_H_ */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/epetraext/test/inout_LL/Poisson2dOperator.h b/packages/epetraext/test/inout_LL/Poisson2dOperator.h index 92fe92971e2e..905950a69a9e 100644 --- a/packages/epetraext/test/inout_LL/Poisson2dOperator.h +++ b/packages/epetraext/test/inout_LL/Poisson2dOperator.h @@ -164,3 +164,10 @@ class Poisson2dOperator: public virtual Epetra_Operator { }; #endif /* _POISSON2DOPERATOR_H_ */ + +#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The EpetraExt package is deprecated" +#endif +#endif + diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index 1df8ed3219d2..6238b3e605b0 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -1735,7 +1735,7 @@ opt-set-cmake-var Epetra_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error= opt-set-cmake-var EpetraExt_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow opt-set-cmake-var FEI_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow opt-set-cmake-var Galeri_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow -opt-set-cmake-var Ifpack_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror -Wno-error=shadow +opt-set-cmake-var Ifpack_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow opt-set-cmake-var Intrepid_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow opt-set-cmake-var Intrepid2_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror -Wno-error=shadow opt-set-cmake-var Isorropia_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow @@ -1753,7 +1753,7 @@ opt-set-cmake-var ShyLU_Node_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-er opt-set-cmake-var STK_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow opt-set-cmake-var Stokhos_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow opt-set-cmake-var Stratimikos_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow -opt-set-cmake-var Tempus_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror +# opt-set-cmake-var Tempus_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror opt-set-cmake-var TrilinosCouplings_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow opt-set-cmake-var Zoltan_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow @@ -1844,7 +1844,7 @@ opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON opt-set-cmake-var KokkosKernels_blas_serial_MPI_1_DISABLE BOOL : ON opt-set-cmake-var ROL_example_PDE-OPT_helmholtz_example_02_MPI_1_DISABLE BOOL : ON -opt-set-cmake-var CMAKE_CXX_FLAGS STRING FORCE : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-nonnull-compare -Wno-address -Wno-inline -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS +opt-set-cmake-var CMAKE_CXX_FLAGS STRING FORCE : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-error -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS # Test failures as of 11-28-22 opt-set-cmake-var ROL_example_PDE-OPT_navier-stokes_example_01_MPI_4_DISABLE BOOL : ON @@ -1961,7 +1961,7 @@ opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : - opt-set-cmake-var CMAKE_CXX_EXTENSIONS BOOL : OFF opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON opt-set-cmake-var ROL_test_algorithm_TypeP_CompareTypeU_MPI_1_DISABLE BOOL : ON -opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-inline -Wno-nonnull-compare -Wno-address -Werror -Werror=shadow -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS +opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-inline -Wno-nonnull-compare -Wno-address -Wno-error -Werror=shadow -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS use GCC_OPENMP_PACKAGE_SPECIFIC_WARNING_FLAGS @@ -2655,7 +2655,7 @@ use PACKAGE-ENABLES|ALL ####### under Testing ####### -[rhel7_sems-gnu-8.3.0-openmpi-1.10.7-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables] +[rhel7_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables] # uses sems-v2 modules use RHEL7_SEMS_COMPILER|GNU use NODE-TYPE|SERIAL @@ -2674,6 +2674,18 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES use COMMON_SPACK_TPLS +#opt-set-cmake-var Amesos_ENABLE_SuperLU BOOL FORCE : OFF +#opt-set-cmake-var Amesos_ENABLE_SuperLUDist BOOL FORCE : OFF +#opt-set-cmake-var Amesos2_ENABLE_SuperLU BOOL FORCE : OFF +#opt-set-cmake-var Amesos2_ENABLE_SuperLUDist BOOL FORCE : OFF +opt-set-cmake-var Trilinos_ENABLE_Ifpack BOOL FORCE : OFF +opt-set-cmake-var Trilinos_ENABLE_Amesos BOOL FORCE : OFF +opt-set-cmake-var Stokhos_ENABLE_EpetraExt BOOL FORCE : OFF +opt-set-cmake-var Piro_ENABLE_EpetraExt BOOL FORCE : OFF +opt-set-cmake-var Piro_ENABLE_Epetra BOOL FORCE : OFF +opt-set-cmake-var PIRO_HAVE_EPETRA_STACK BOOL FORCE : OFF + + opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none --mca btl vader,self opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON opt-set-cmake-var KokkosKernels_blas_serial_MPI_1_DISABLE BOOL : ON @@ -2682,9 +2694,9 @@ opt-set-cmake-var CMAKE_CXX_FLAGS STRING use RHEL7_POST -[rhel7_sems-gnu-8.3.0-openmpi-1.10.7-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] +[rhel7_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] # uses sems-v2 modules -use rhel7_sems-gnu-8.3.0-openmpi-1.10.7-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables +use rhel7_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables use PACKAGE-ENABLES|ALL [rhel7_cxx-20-sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] @@ -2713,7 +2725,7 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES use COMMON_SPACK_TPLS opt-set-cmake-var Trilinos_ENABLE_Fortran OFF BOOL : OFF -opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-label -Werror -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS +opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-label -Wno-error -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS opt-set-cmake-var TPL_ENABLE_ParMETIS BOOL FORCE : OFF opt-set-cmake-var TPL_ENABLE_Pnetcdf BOOL FORCE : OFF opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_LIB|ENV};${NETCDF_C_LIB|ENV}/libnetcdf.a;${TPL_HDF5_LIBRARIES|CMAKE} @@ -2860,7 +2872,7 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES use COMMON_SPACK_TPLS -opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-label -Werror -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS +opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-label -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm diff --git a/packages/framework/ini-files/supported-envs.ini b/packages/framework/ini-files/supported-envs.ini index 076adec316b0..b543e510fccb 100644 --- a/packages/framework/ini-files/supported-envs.ini +++ b/packages/framework/ini-files/supported-envs.ini @@ -151,6 +151,7 @@ sems-v2-gnu-8.3.0-serial: sems-gnu-8.3.0-openmpi-1.10.7-serial: cxx-20-sems-gnu-8.3.0-openmpi-1.10.1-serial: sems-gnu-8.3.0-openmpi-1.10.7-openmp: +sems-gnu-8.5.0-openmpi-4.1.6-serial: sems-clang-11.0.1-openmpi-1.10.1-openmp: sems-clang-11.0.1-openmpi-1.10.1-serial: clang-11.0.1 diff --git a/packages/ifpack/cmake/Ifpack_config.h.in b/packages/ifpack/cmake/Ifpack_config.h.in index 0caf16452db2..e73714d0209a 100644 --- a/packages/ifpack/cmake/Ifpack_config.h.in +++ b/packages/ifpack/cmake/Ifpack_config.h.in @@ -59,3 +59,6 @@ /* Add macros for declaring functions deprecated */ @IFPACK_DEPRECATED_DECLARATIONS@ + +#cmakedefine Ifpack_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/ifpack/src/Ifpack.h b/packages/ifpack/src/Ifpack.h index c5fa7dd42318..49d56ee155cd 100644 --- a/packages/ifpack/src/Ifpack.h +++ b/packages/ifpack/src/Ifpack.h @@ -284,3 +284,10 @@ TEUCHOS_ENUM_INPUT_STREAM_OPERATOR(Ifpack::EPrecType) #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_AMDReordering.h b/packages/ifpack/src/Ifpack_AMDReordering.h index b970f3dbd5a0..851311fb2116 100644 --- a/packages/ifpack/src/Ifpack_AMDReordering.h +++ b/packages/ifpack/src/Ifpack_AMDReordering.h @@ -128,3 +128,10 @@ class Ifpack_AMDReordering : public Ifpack_Reordering { }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_AdditiveSchwarz.h b/packages/ifpack/src/Ifpack_AdditiveSchwarz.h index 290c1c43f185..f9522df44b97 100644 --- a/packages/ifpack/src/Ifpack_AdditiveSchwarz.h +++ b/packages/ifpack/src/Ifpack_AdditiveSchwarz.h @@ -1233,3 +1233,10 @@ Condest(const Ifpack_CondestType CT, const int MaxIters, } #endif // IFPACK_ADDITIVESCHWARZ_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Amesos.h b/packages/ifpack/src/Ifpack_Amesos.h index 563b28fb1153..b3c7bd61c1c3 100644 --- a/packages/ifpack/src/Ifpack_Amesos.h +++ b/packages/ifpack/src/Ifpack_Amesos.h @@ -416,3 +416,10 @@ class Ifpack_Amesos : public Ifpack_Preconditioner { }; #endif // IFPACK_AMESOS_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_BlockRelaxation.h b/packages/ifpack/src/Ifpack_BlockRelaxation.h index a4ffbbaf1ab0..136f0da1863c 100644 --- a/packages/ifpack/src/Ifpack_BlockRelaxation.h +++ b/packages/ifpack/src/Ifpack_BlockRelaxation.h @@ -1305,3 +1305,10 @@ int Ifpack_BlockRelaxation::Initialize() //============================================================================== #endif // IFPACK_BLOCKPRECONDITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Chebyshev.h b/packages/ifpack/src/Ifpack_Chebyshev.h index d6d0c2920d88..3ed2d4605fde 100644 --- a/packages/ifpack/src/Ifpack_Chebyshev.h +++ b/packages/ifpack/src/Ifpack_Chebyshev.h @@ -441,3 +441,10 @@ class Ifpack_Chebyshev : public Ifpack_Preconditioner { #endif // IFPACK_CHEBYSHEV_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Condest.h b/packages/ifpack/src/Ifpack_Condest.h index 180da7cf42df..fed359feeee3 100644 --- a/packages/ifpack/src/Ifpack_Condest.h +++ b/packages/ifpack/src/Ifpack_Condest.h @@ -55,3 +55,10 @@ double Ifpack_Condest(const Ifpack_Preconditioner& IFP, Epetra_RowMatrix* Matrix = 0); #endif // IFPACK_CONDEST_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_CondestType.h b/packages/ifpack/src/Ifpack_CondestType.h index fdd8f1ddbfc6..7b5c48f18dfa 100644 --- a/packages/ifpack/src/Ifpack_CondestType.h +++ b/packages/ifpack/src/Ifpack_CondestType.h @@ -52,3 +52,10 @@ enum Ifpack_CondestType { }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_ConfigDefs.h b/packages/ifpack/src/Ifpack_ConfigDefs.h index 49365f040e01..a5705b377719 100644 --- a/packages/ifpack/src/Ifpack_ConfigDefs.h +++ b/packages/ifpack/src/Ifpack_ConfigDefs.h @@ -146,3 +146,10 @@ #define IFPACK_ABS(x) (((x) > 0.0) ? (x) : (-x)) /* abs function */ #endif /*_IFPACK_CONFIGDEFS_H_*/ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Container.h b/packages/ifpack/src/Ifpack_Container.h index bc6f2d81f9d9..d1567a5bdddd 100644 --- a/packages/ifpack/src/Ifpack_Container.h +++ b/packages/ifpack/src/Ifpack_Container.h @@ -179,3 +179,10 @@ inline std::ostream& operator<<(std::ostream& os, const Ifpack_Container& obj) } #endif // IFPACK_CONTAINER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_CrsGraph.h b/packages/ifpack/src/Ifpack_CrsGraph.h index e9fdcc76837d..5502b409cdc6 100644 --- a/packages/ifpack/src/Ifpack_CrsGraph.h +++ b/packages/ifpack/src/Ifpack_CrsGraph.h @@ -57,3 +57,10 @@ class Ifpack_CrsGraph }; #endif // _IFPACK_CrsGRAPH_H_ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_CrsIlut.h b/packages/ifpack/src/Ifpack_CrsIlut.h index a2814a528f4c..52d935dd863a 100644 --- a/packages/ifpack/src/Ifpack_CrsIlut.h +++ b/packages/ifpack/src/Ifpack_CrsIlut.h @@ -138,3 +138,10 @@ class Ifpack_CrsIlut: public Epetra_Object, public Epetra_CompObject, public Ifp }; #endif /* IFPACK_CRSILUT_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_CrsRick.h b/packages/ifpack/src/Ifpack_CrsRick.h index 826c48f35e37..deb9a5adb513 100644 --- a/packages/ifpack/src/Ifpack_CrsRick.h +++ b/packages/ifpack/src/Ifpack_CrsRick.h @@ -475,3 +475,10 @@ class Ifpack_CrsRick: public Epetra_Object, public Epetra_CompObject, public vir std::ostream& operator << (std::ostream& os, const Ifpack_CrsRick& A); #endif /* _IFPACK_CRSRICK_H_ */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_CrsRiluk.h b/packages/ifpack/src/Ifpack_CrsRiluk.h index d2d6737c4dc5..9dc4337ff2f0 100644 --- a/packages/ifpack/src/Ifpack_CrsRiluk.h +++ b/packages/ifpack/src/Ifpack_CrsRiluk.h @@ -520,3 +520,10 @@ class Ifpack_CrsRiluk: public Epetra_Object, public Epetra_CompObject, public vi std::ostream& operator << (std::ostream& os, const Ifpack_CrsRiluk& A); #endif /* _IFPACK_CRSRILUK_H_ */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_DenseContainer.h b/packages/ifpack/src/Ifpack_DenseContainer.h index f8fb4d910936..44460d5c01f1 100644 --- a/packages/ifpack/src/Ifpack_DenseContainer.h +++ b/packages/ifpack/src/Ifpack_DenseContainer.h @@ -378,3 +378,10 @@ class Ifpack_DenseContainer : public Ifpack_Container { }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_DiagPreconditioner.h b/packages/ifpack/src/Ifpack_DiagPreconditioner.h index 470b3affa5c1..f0887e4a246e 100644 --- a/packages/ifpack/src/Ifpack_DiagPreconditioner.h +++ b/packages/ifpack/src/Ifpack_DiagPreconditioner.h @@ -134,3 +134,10 @@ class Ifpack_DiagPreconditioner : public Epetra_Operator }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_DiagonalFilter.h b/packages/ifpack/src/Ifpack_DiagonalFilter.h index f34166704be3..2880f5155657 100644 --- a/packages/ifpack/src/Ifpack_DiagonalFilter.h +++ b/packages/ifpack/src/Ifpack_DiagonalFilter.h @@ -313,3 +313,10 @@ class Ifpack_DiagonalFilter : public virtual Epetra_RowMatrix { #endif /* IFPACK_DIAGONALFILTER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_DropFilter.h b/packages/ifpack/src/Ifpack_DropFilter.h index 7513e7553c0a..43f300e40718 100644 --- a/packages/ifpack/src/Ifpack_DropFilter.h +++ b/packages/ifpack/src/Ifpack_DropFilter.h @@ -299,3 +299,10 @@ class Ifpack_DropFilter : public virtual Epetra_RowMatrix { #endif /* IFPACK_DROPFILTER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_DynamicFactory.h b/packages/ifpack/src/Ifpack_DynamicFactory.h index bcf8e15396e0..3143b1eb8fe1 100644 --- a/packages/ifpack/src/Ifpack_DynamicFactory.h +++ b/packages/ifpack/src/Ifpack_DynamicFactory.h @@ -132,3 +132,10 @@ Ifpack_DynamicFactory::buildPreconditioner(Epetra_RowMatrix* Matrix, } #endif // IFPACK_DYNAMIC_FACTORY_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_EquationPartitioner.h b/packages/ifpack/src/Ifpack_EquationPartitioner.h index d0d5a9c471b2..9eaf3cdc897e 100644 --- a/packages/ifpack/src/Ifpack_EquationPartitioner.h +++ b/packages/ifpack/src/Ifpack_EquationPartitioner.h @@ -94,3 +94,10 @@ class Ifpack_EquationPartitioner : public Ifpack_OverlappingPartitioner { }; #endif // IFPACK_EQUATIONPARTITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Euclid.h b/packages/ifpack/src/Ifpack_Euclid.h index 43698d56ea0c..87529fafadc7 100644 --- a/packages/ifpack/src/Ifpack_Euclid.h +++ b/packages/ifpack/src/Ifpack_Euclid.h @@ -349,3 +349,10 @@ std::ostream& operator << (std::ostream& os, const Ifpack_Euclid& A); #endif // HAVE_EUCLID #endif /* IFPACK_EUCLID_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Graph.h b/packages/ifpack/src/Ifpack_Graph.h index 2a919e05e93e..0ada3bea72b7 100644 --- a/packages/ifpack/src/Ifpack_Graph.h +++ b/packages/ifpack/src/Ifpack_Graph.h @@ -139,3 +139,10 @@ inline std::ostream& operator<<(std::ostream& os, const Ifpack_Graph& obj) } #endif // iFPACK_GRAPH_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Graph_Epetra_CrsGraph.h b/packages/ifpack/src/Ifpack_Graph_Epetra_CrsGraph.h index 16a30a6c6236..e9ab75eeede4 100644 --- a/packages/ifpack/src/Ifpack_Graph_Epetra_CrsGraph.h +++ b/packages/ifpack/src/Ifpack_Graph_Epetra_CrsGraph.h @@ -178,3 +178,10 @@ class Ifpack_Graph_Epetra_CrsGraph : public Ifpack_Graph { }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Graph_Epetra_RowMatrix.h b/packages/ifpack/src/Ifpack_Graph_Epetra_RowMatrix.h index 1c7901f0bc25..65a495a50d14 100644 --- a/packages/ifpack/src/Ifpack_Graph_Epetra_RowMatrix.h +++ b/packages/ifpack/src/Ifpack_Graph_Epetra_RowMatrix.h @@ -184,3 +184,10 @@ class Ifpack_Graph_Epetra_RowMatrix : public Ifpack_Graph { }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_GreedyPartitioner.h b/packages/ifpack/src/Ifpack_GreedyPartitioner.h index cbcc2952ae39..9474480246ae 100644 --- a/packages/ifpack/src/Ifpack_GreedyPartitioner.h +++ b/packages/ifpack/src/Ifpack_GreedyPartitioner.h @@ -86,3 +86,10 @@ class Ifpack_GreedyPartitioner : public Ifpack_OverlappingPartitioner { }; // class Ifpack_GreedyPartitioner #endif // IFPACK_GREEDYPARTITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_HIPS.h b/packages/ifpack/src/Ifpack_HIPS.h index f4fc2026ad08..929271c5e76d 100644 --- a/packages/ifpack/src/Ifpack_HIPS.h +++ b/packages/ifpack/src/Ifpack_HIPS.h @@ -369,3 +369,10 @@ class Ifpack_HIPS: public Ifpack_Preconditioner { #endif #endif /* IFPACK_HIPS_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_HashTable.h b/packages/ifpack/src/Ifpack_HashTable.h index 4b8fe00a9acf..946dfda9a0f8 100644 --- a/packages/ifpack/src/Ifpack_HashTable.h +++ b/packages/ifpack/src/Ifpack_HashTable.h @@ -274,3 +274,10 @@ class Ifpack_HashTable64 : public TIfpack_HashTable }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Hypre.h b/packages/ifpack/src/Ifpack_Hypre.h index 112398c5f0f3..82c030bd2a49 100644 --- a/packages/ifpack/src/Ifpack_Hypre.h +++ b/packages/ifpack/src/Ifpack_Hypre.h @@ -649,3 +649,10 @@ class Ifpack_Hypre: public Ifpack_Preconditioner { #endif // HAVE_HYPRE #endif /* IFPACK_HYPRE_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_IC.h b/packages/ifpack/src/Ifpack_IC.h index 61c14014cf0e..b56112bef9ad 100644 --- a/packages/ifpack/src/Ifpack_IC.h +++ b/packages/ifpack/src/Ifpack_IC.h @@ -381,3 +381,10 @@ class Ifpack_IC: public Ifpack_Preconditioner { }; #endif /* IFPACK_IC_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_ICT.h b/packages/ifpack/src/Ifpack_ICT.h index 19085d63c3c1..29b5570a4abc 100644 --- a/packages/ifpack/src/Ifpack_ICT.h +++ b/packages/ifpack/src/Ifpack_ICT.h @@ -399,3 +399,10 @@ class Ifpack_ICT: public Ifpack_Preconditioner { }; #endif /* IFPACK_ICT_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_IC_Utils.h b/packages/ifpack/src/Ifpack_IC_Utils.h index fea83ae7c91a..0e9685ec1eef 100644 --- a/packages/ifpack/src/Ifpack_IC_Utils.h +++ b/packages/ifpack/src/Ifpack_IC_Utils.h @@ -73,3 +73,10 @@ void crout_ict( #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_IHSS.h b/packages/ifpack/src/Ifpack_IHSS.h index a51310407ddb..09bbf80aca84 100644 --- a/packages/ifpack/src/Ifpack_IHSS.h +++ b/packages/ifpack/src/Ifpack_IHSS.h @@ -392,3 +392,10 @@ class Ifpack_IHSS: public Ifpack_Preconditioner { #endif #endif /* IFPACK_IHSS_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_IKLU.h b/packages/ifpack/src/Ifpack_IKLU.h index 5e89322ac4d0..ae47a9cfc797 100644 --- a/packages/ifpack/src/Ifpack_IKLU.h +++ b/packages/ifpack/src/Ifpack_IKLU.h @@ -396,3 +396,10 @@ class Ifpack_IKLU: public Ifpack_Preconditioner { }; // Ifpack_IKLU #endif /* IFPACK_IKLU_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_IKLU_Utils.h b/packages/ifpack/src/Ifpack_IKLU_Utils.h index cb6c135e7dba..4ae6911c9e04 100644 --- a/packages/ifpack/src/Ifpack_IKLU_Utils.h +++ b/packages/ifpack/src/Ifpack_IKLU_Utils.h @@ -162,3 +162,10 @@ int csr_fkeep (csr *A, int (*fkeep) (int, int, double, void *), void *other); #define CS_TRIPLET(A) (A && (A->nz >= 0)) #endif // IFPACK_IKLU_UTILS_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_ILU.h b/packages/ifpack/src/Ifpack_ILU.h index 4df26412665a..e98a490daff9 100644 --- a/packages/ifpack/src/Ifpack_ILU.h +++ b/packages/ifpack/src/Ifpack_ILU.h @@ -449,3 +449,10 @@ class Ifpack_ILU: public Ifpack_Preconditioner { }; #endif /* IFPACK_ILU_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_ILUT.h b/packages/ifpack/src/Ifpack_ILUT.h index 4377097002bd..367e979fd624 100644 --- a/packages/ifpack/src/Ifpack_ILUT.h +++ b/packages/ifpack/src/Ifpack_ILUT.h @@ -391,3 +391,10 @@ class Ifpack_ILUT: public Ifpack_Preconditioner { }; // Ifpack_ILUT #endif /* IFPACK_ILUT_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_IlukGraph.h b/packages/ifpack/src/Ifpack_IlukGraph.h index 3a15b87161c9..4be9d8496f1d 100644 --- a/packages/ifpack/src/Ifpack_IlukGraph.h +++ b/packages/ifpack/src/Ifpack_IlukGraph.h @@ -292,3 +292,10 @@ class Ifpack_IlukGraph { std::ostream& operator << (std::ostream& os, const Ifpack_IlukGraph& A); #endif /* _IFPACK_ILUK_GRAPH_H_ */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Krylov.h b/packages/ifpack/src/Ifpack_Krylov.h index cfc152e53548..44b12bdb58fe 100644 --- a/packages/ifpack/src/Ifpack_Krylov.h +++ b/packages/ifpack/src/Ifpack_Krylov.h @@ -372,3 +372,10 @@ class Ifpack_Krylov : public Ifpack_Preconditioner { #endif // IFPACK_KRYLOV_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_LinePartitioner.h b/packages/ifpack/src/Ifpack_LinePartitioner.h index 0d2fc3cdcdac..0019e95cca4b 100644 --- a/packages/ifpack/src/Ifpack_LinePartitioner.h +++ b/packages/ifpack/src/Ifpack_LinePartitioner.h @@ -180,3 +180,10 @@ class Ifpack_LinePartitioner : public Ifpack_OverlappingPartitioner { }; #endif // IFPACK_LINEPARTITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_LinearPartitioner.h b/packages/ifpack/src/Ifpack_LinearPartitioner.h index d65879fab7c6..000720d3bbef 100644 --- a/packages/ifpack/src/Ifpack_LinearPartitioner.h +++ b/packages/ifpack/src/Ifpack_LinearPartitioner.h @@ -79,3 +79,10 @@ class Ifpack_LinearPartitioner : public Ifpack_OverlappingPartitioner { }; #endif // IFPACK_LINEARPARTITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_LocalFilter.h b/packages/ifpack/src/Ifpack_LocalFilter.h index c1ff575094c0..12183e43391c 100644 --- a/packages/ifpack/src/Ifpack_LocalFilter.h +++ b/packages/ifpack/src/Ifpack_LocalFilter.h @@ -443,3 +443,10 @@ const char* Label() const{ }; #endif /* IFPACK_LOCALFILTER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_METISPartitioner.h b/packages/ifpack/src/Ifpack_METISPartitioner.h index 8fbbbc8ffecf..f8a1c309e226 100644 --- a/packages/ifpack/src/Ifpack_METISPartitioner.h +++ b/packages/ifpack/src/Ifpack_METISPartitioner.h @@ -98,3 +98,10 @@ class Ifpack_METISPartitioner : public Ifpack_OverlappingPartitioner { }; // class Ifpack_METISPartitioner #endif // IFPACK_METISPARTITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_METISReordering.h b/packages/ifpack/src/Ifpack_METISReordering.h index 9af2462aad70..e78fc97ffbd9 100644 --- a/packages/ifpack/src/Ifpack_METISReordering.h +++ b/packages/ifpack/src/Ifpack_METISReordering.h @@ -134,3 +134,10 @@ class Ifpack_METISReordering : public Ifpack_Reordering { }; // class Ifpack_METISReordering #endif // IFPACK_METISREORDERING_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_NodeFilter.h b/packages/ifpack/src/Ifpack_NodeFilter.h index ccd1e6542bc3..963d866f4a30 100644 --- a/packages/ifpack/src/Ifpack_NodeFilter.h +++ b/packages/ifpack/src/Ifpack_NodeFilter.h @@ -464,3 +464,10 @@ const char* Label() const{ }; #endif //ifdef IFPACK_NODE_AWARE_CODE #endif /* IFPACK_NODEFILTER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_OverlapFactorObject.h b/packages/ifpack/src/Ifpack_OverlapFactorObject.h index 808e80b1dd9c..653e786ac852 100644 --- a/packages/ifpack/src/Ifpack_OverlapFactorObject.h +++ b/packages/ifpack/src/Ifpack_OverlapFactorObject.h @@ -130,3 +130,10 @@ class Ifpack_OverlapFactorObject { Epetra_RowMatrix * UserMatrix_; }; #endif // IFPACK_OVERLAPFACTOROBJECT_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_OverlapGraph.h b/packages/ifpack/src/Ifpack_OverlapGraph.h index 34f6f0193281..84bd64435a74 100644 --- a/packages/ifpack/src/Ifpack_OverlapGraph.h +++ b/packages/ifpack/src/Ifpack_OverlapGraph.h @@ -143,3 +143,10 @@ class Ifpack_OverlapGraph: public Epetra_Object { bool IsOverlapped_; }; #endif // IFPACK_OVERLAPGRAPH_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_OverlapSolveObject.h b/packages/ifpack/src/Ifpack_OverlapSolveObject.h index 6fb42a48c55e..60fe8b41f665 100644 --- a/packages/ifpack/src/Ifpack_OverlapSolveObject.h +++ b/packages/ifpack/src/Ifpack_OverlapSolveObject.h @@ -235,3 +235,10 @@ class Ifpack_OverlapSolveObject: public virtual Epetra_Operator { }; #endif // IFPACK_SOLVEOBJECT_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_OverlappingPartitioner.h b/packages/ifpack/src/Ifpack_OverlappingPartitioner.h index c678d14f65da..11e23ccee800 100644 --- a/packages/ifpack/src/Ifpack_OverlappingPartitioner.h +++ b/packages/ifpack/src/Ifpack_OverlappingPartitioner.h @@ -214,3 +214,10 @@ class Ifpack_OverlappingPartitioner : public Ifpack_Partitioner { }; // class Ifpack_Partitioner #endif // IFPACK_OVERLAPPINGPARTITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_OverlappingRowMatrix.h b/packages/ifpack/src/Ifpack_OverlappingRowMatrix.h index 9ed3f3a31d10..0a94ff80ad27 100644 --- a/packages/ifpack/src/Ifpack_OverlappingRowMatrix.h +++ b/packages/ifpack/src/Ifpack_OverlappingRowMatrix.h @@ -478,3 +478,10 @@ int ExportMultiVector(const Epetra_MultiVector& OvX, }; // class Ifpack_OverlappingRowMatrix #endif // IFPACK_OVERLAPPINGROWMATRIX_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Partitioner.h b/packages/ifpack/src/Ifpack_Partitioner.h index 7feb9a6db162..abc7b786fa12 100644 --- a/packages/ifpack/src/Ifpack_Partitioner.h +++ b/packages/ifpack/src/Ifpack_Partitioner.h @@ -214,3 +214,10 @@ inline std::ostream& operator<<(std::ostream& os, const Ifpack_Partitioner& obj) } #endif // IFPACK_PARTITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_PerturbedMatrix.h b/packages/ifpack/src/Ifpack_PerturbedMatrix.h index e5102bfe3183..45029a267aba 100644 --- a/packages/ifpack/src/Ifpack_PerturbedMatrix.h +++ b/packages/ifpack/src/Ifpack_PerturbedMatrix.h @@ -83,3 +83,10 @@ class Ifpack_PerturbedMatrix: public Epetra_Object { //@} #endif // IFPACK_PERTURBEDMATRIX_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_PointRelaxation.h b/packages/ifpack/src/Ifpack_PointRelaxation.h index 2693a6040640..0c417552e698 100644 --- a/packages/ifpack/src/Ifpack_PointRelaxation.h +++ b/packages/ifpack/src/Ifpack_PointRelaxation.h @@ -479,3 +479,10 @@ class Ifpack_PointRelaxation : public Ifpack_Preconditioner { }; #endif // IFPACK_POINTRELAXATION_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Polynomial.h b/packages/ifpack/src/Ifpack_Polynomial.h index ba50ade5a6f8..02286f98eb5b 100644 --- a/packages/ifpack/src/Ifpack_Polynomial.h +++ b/packages/ifpack/src/Ifpack_Polynomial.h @@ -442,3 +442,10 @@ class Ifpack_Polynomial : public Ifpack_Preconditioner { #endif // IFPACK_POLYNOMIAL_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Preconditioner.h b/packages/ifpack/src/Ifpack_Preconditioner.h index 58a6127539a2..14029455058f 100644 --- a/packages/ifpack/src/Ifpack_Preconditioner.h +++ b/packages/ifpack/src/Ifpack_Preconditioner.h @@ -206,3 +206,10 @@ inline std::ostream& operator<<(std::ostream& os, const Ifpack_Preconditioner& o } #endif // IFPACK_PRECONDITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_RCMReordering.h b/packages/ifpack/src/Ifpack_RCMReordering.h index b8a615458560..ea3d6c694392 100644 --- a/packages/ifpack/src/Ifpack_RCMReordering.h +++ b/packages/ifpack/src/Ifpack_RCMReordering.h @@ -136,3 +136,10 @@ class Ifpack_RCMReordering : public Ifpack_Reordering { }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_ReorderFilter.h b/packages/ifpack/src/Ifpack_ReorderFilter.h index f9f01c63d7df..60d8cf3b8555 100644 --- a/packages/ifpack/src/Ifpack_ReorderFilter.h +++ b/packages/ifpack/src/Ifpack_ReorderFilter.h @@ -354,3 +354,10 @@ class Ifpack_ReorderFilter : public virtual Epetra_RowMatrix { #endif /* IFPACK_DROPFILTER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Reordering.h b/packages/ifpack/src/Ifpack_Reordering.h index 0379f0fab258..1ea5ec175273 100644 --- a/packages/ifpack/src/Ifpack_Reordering.h +++ b/packages/ifpack/src/Ifpack_Reordering.h @@ -148,3 +148,10 @@ inline std::ostream& operator<<(std::ostream& os, const Ifpack_Reordering& obj) } #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SILU.h b/packages/ifpack/src/Ifpack_SILU.h index 2c261eb4fd45..1d82f0286af1 100644 --- a/packages/ifpack/src/Ifpack_SILU.h +++ b/packages/ifpack/src/Ifpack_SILU.h @@ -449,3 +449,10 @@ class Ifpack_SILU: public Ifpack_Preconditioner { #endif /* HAVE_IFPACK_SUPERLU */ #endif /* IFPACK_ILU_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SORa.h b/packages/ifpack/src/Ifpack_SORa.h index 3146a4c9e006..315534fe7e23 100644 --- a/packages/ifpack/src/Ifpack_SORa.h +++ b/packages/ifpack/src/Ifpack_SORa.h @@ -400,3 +400,10 @@ class Ifpack_SORa: public Ifpack_Preconditioner { #else #endif #endif /* IFPACK_SORa_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SPARSKIT.h b/packages/ifpack/src/Ifpack_SPARSKIT.h index fa03c4ec6b0a..72c70799bc81 100644 --- a/packages/ifpack/src/Ifpack_SPARSKIT.h +++ b/packages/ifpack/src/Ifpack_SPARSKIT.h @@ -303,3 +303,10 @@ class Ifpack_SPARSKIT: public Ifpack_Preconditioner { #endif // HAVE_IFPACK_SPARSKIT #endif /* IFPACK_SPARSKIT_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_ScalingType.h b/packages/ifpack/src/Ifpack_ScalingType.h index 0578dada11d3..6e2f8ecf7f4b 100644 --- a/packages/ifpack/src/Ifpack_ScalingType.h +++ b/packages/ifpack/src/Ifpack_ScalingType.h @@ -54,3 +54,10 @@ enum Ifpack_ScalingType {None, LeftDiagonal, RightDiagonal, RowAndColSum}; #endif /* _IFPACK_SCALINGTYPE_H_ */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SerialTriDiMatrix.h b/packages/ifpack/src/Ifpack_SerialTriDiMatrix.h index 330e81639f69..87a6bab2dd1e 100644 --- a/packages/ifpack/src/Ifpack_SerialTriDiMatrix.h +++ b/packages/ifpack/src/Ifpack_SerialTriDiMatrix.h @@ -526,3 +526,10 @@ inline const double& Ifpack_SerialTriDiMatrix::operator () (int RowIndex, int Co #endif /* EPETRA_SERIALTRIDIMATRIX_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SerialTriDiSolver.h b/packages/ifpack/src/Ifpack_SerialTriDiSolver.h index e65d65c249bb..b913a390e9fb 100644 --- a/packages/ifpack/src/Ifpack_SerialTriDiSolver.h +++ b/packages/ifpack/src/Ifpack_SerialTriDiSolver.h @@ -389,3 +389,10 @@ class Ifpack_SerialTriDiSolver : }; #endif /* EPETRA_SERIALTRIDISOLVER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SingletonFilter.h b/packages/ifpack/src/Ifpack_SingletonFilter.h index 698948bd4cc1..15adc9956ef1 100644 --- a/packages/ifpack/src/Ifpack_SingletonFilter.h +++ b/packages/ifpack/src/Ifpack_SingletonFilter.h @@ -296,3 +296,10 @@ class Ifpack_SingletonFilter : public virtual Epetra_RowMatrix { }; #endif /* IFPACK_SINGLETONFILTER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SparseContainer.h b/packages/ifpack/src/Ifpack_SparseContainer.h index e05362cce610..6cf8a0583237 100644 --- a/packages/ifpack/src/Ifpack_SparseContainer.h +++ b/packages/ifpack/src/Ifpack_SparseContainer.h @@ -633,3 +633,10 @@ std::ostream& Ifpack_SparseContainer::Print(std::ostream & os) const return(os); } #endif // IFPACK_SPARSECONTAINER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SparsityFilter.h b/packages/ifpack/src/Ifpack_SparsityFilter.h index 184ab90d125a..d2355af76cd0 100644 --- a/packages/ifpack/src/Ifpack_SparsityFilter.h +++ b/packages/ifpack/src/Ifpack_SparsityFilter.h @@ -283,3 +283,10 @@ class Ifpack_SparsityFilter : public virtual Epetra_RowMatrix { #endif /* IFPACK_SPARSITYFILTER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_SubdomainFilter.h b/packages/ifpack/src/Ifpack_SubdomainFilter.h index 371d2b296c90..08dbc046c794 100644 --- a/packages/ifpack/src/Ifpack_SubdomainFilter.h +++ b/packages/ifpack/src/Ifpack_SubdomainFilter.h @@ -460,3 +460,10 @@ const char* Label() const{ }; #endif //ifdef HAVE_IFPACK_PARALLEL_SUBDOMAIN_SOLVERS #endif /* IFPACK_SUBDOMAINFILTER_H */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_TriDiContainer.h b/packages/ifpack/src/Ifpack_TriDiContainer.h index 4fed41e3854a..dd80b0aaff4a 100644 --- a/packages/ifpack/src/Ifpack_TriDiContainer.h +++ b/packages/ifpack/src/Ifpack_TriDiContainer.h @@ -379,3 +379,10 @@ class Ifpack_TriDiContainer : public Ifpack_Container { }; #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_UserPartitioner.h b/packages/ifpack/src/Ifpack_UserPartitioner.h index ad74240e0b0c..a34f48efb845 100644 --- a/packages/ifpack/src/Ifpack_UserPartitioner.h +++ b/packages/ifpack/src/Ifpack_UserPartitioner.h @@ -89,3 +89,10 @@ class Ifpack_UserPartitioner : public Ifpack_OverlappingPartitioner { }; #endif // IFPACK_USERPARTITIONER_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Utils.h b/packages/ifpack/src/Ifpack_Utils.h index 26ac6e790a59..c731cd15cadc 100644 --- a/packages/ifpack/src/Ifpack_Utils.h +++ b/packages/ifpack/src/Ifpack_Utils.h @@ -187,3 +187,10 @@ class Ifpack_Element { }; #endif // IFPACK_UTILS_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_ValidParameters.h b/packages/ifpack/src/Ifpack_ValidParameters.h index 18474457f5ee..7bb7476e7494 100644 --- a/packages/ifpack/src/Ifpack_ValidParameters.h +++ b/packages/ifpack/src/Ifpack_ValidParameters.h @@ -50,3 +50,10 @@ Teuchos::ParameterList Ifpack_GetValidParameters(); #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/Ifpack_Version.h b/packages/ifpack/src/Ifpack_Version.h index 3f1e01857294..c7036721a162 100644 --- a/packages/ifpack/src/Ifpack_Version.h +++ b/packages/ifpack/src/Ifpack_Version.h @@ -47,3 +47,10 @@ std::string Ifpack_Version() { return("Ifpack in Trilinos " TRILINOS_VERSION_STRING); } + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/az_ifpack.h b/packages/ifpack/src/az_ifpack.h index 71c6decba007..88c3ca227ac7 100644 --- a/packages/ifpack/src/az_ifpack.h +++ b/packages/ifpack/src/az_ifpack.h @@ -75,3 +75,10 @@ void AZ_ifpack_prec_destroy(int *options, double *params, int *proc_config, AZ_MATRIX *Amat, AZ_PRECOND *Prec); void az2ifp_blockmatrix (void **bmat, AZ_MATRIX *Amat); + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Euclid_dh.h b/packages/ifpack/src/euclid/Euclid_dh.h index c961e7d9e68d..8cbe95b6e982 100644 --- a/packages/ifpack/src/euclid/Euclid_dh.h +++ b/packages/ifpack/src/euclid/Euclid_dh.h @@ -200,3 +200,10 @@ extern "C" } #endif #endif /* #ifndef EUCLID_MPI_INTERFACE_DH */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/ExternalRows_dh.h b/packages/ifpack/src/euclid/ExternalRows_dh.h index 7fc38272ac08..acae6efe1a6b 100644 --- a/packages/ifpack/src/euclid/ExternalRows_dh.h +++ b/packages/ifpack/src/euclid/ExternalRows_dh.h @@ -110,3 +110,10 @@ extern "C" #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Factor_dh.h b/packages/ifpack/src/euclid/Factor_dh.h index 4e5ac3311e96..7868c7cc7727 100644 --- a/packages/ifpack/src/euclid/Factor_dh.h +++ b/packages/ifpack/src/euclid/Factor_dh.h @@ -136,3 +136,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Hash_dh.h b/packages/ifpack/src/euclid/Hash_dh.h index 80e237ef2651..3aa4a71990f5 100644 --- a/packages/ifpack/src/euclid/Hash_dh.h +++ b/packages/ifpack/src/euclid/Hash_dh.h @@ -105,3 +105,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Hash_i_dh.h b/packages/ifpack/src/euclid/Hash_i_dh.h index 166145fed3ca..c38e73a43821 100644 --- a/packages/ifpack/src/euclid/Hash_i_dh.h +++ b/packages/ifpack/src/euclid/Hash_i_dh.h @@ -86,3 +86,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/MatGenFD.h b/packages/ifpack/src/euclid/MatGenFD.h index 33d82d90a320..e6e4298a9793 100644 --- a/packages/ifpack/src/euclid/MatGenFD.h +++ b/packages/ifpack/src/euclid/MatGenFD.h @@ -182,3 +182,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Mat_dh.h b/packages/ifpack/src/euclid/Mat_dh.h index 896c6b1d172f..279a0268be4d 100644 --- a/packages/ifpack/src/euclid/Mat_dh.h +++ b/packages/ifpack/src/euclid/Mat_dh.h @@ -200,3 +200,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Mem_dh.h b/packages/ifpack/src/euclid/Mem_dh.h index 01234f0288b0..59adc16cf26f 100644 --- a/packages/ifpack/src/euclid/Mem_dh.h +++ b/packages/ifpack/src/euclid/Mem_dh.h @@ -67,3 +67,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Numbering_dh.h b/packages/ifpack/src/euclid/Numbering_dh.h index e675a5a3007a..25ca6783a078 100644 --- a/packages/ifpack/src/euclid/Numbering_dh.h +++ b/packages/ifpack/src/euclid/Numbering_dh.h @@ -94,3 +94,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Parser_dh.h b/packages/ifpack/src/euclid/Parser_dh.h index 3253da0f673b..aaceb9bda3f7 100644 --- a/packages/ifpack/src/euclid/Parser_dh.h +++ b/packages/ifpack/src/euclid/Parser_dh.h @@ -110,3 +110,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/SortedList_dh.h b/packages/ifpack/src/euclid/SortedList_dh.h index ae8ecef77184..06dac20cb151 100644 --- a/packages/ifpack/src/euclid/SortedList_dh.h +++ b/packages/ifpack/src/euclid/SortedList_dh.h @@ -128,3 +128,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/SortedSet_dh.h b/packages/ifpack/src/euclid/SortedSet_dh.h index 96a13c4822d8..130771cc908a 100644 --- a/packages/ifpack/src/euclid/SortedSet_dh.h +++ b/packages/ifpack/src/euclid/SortedSet_dh.h @@ -67,3 +67,10 @@ extern "C" #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/SubdomainGraph_dh.h b/packages/ifpack/src/euclid/SubdomainGraph_dh.h index f2289b5a9780..43d5da0fabe4 100644 --- a/packages/ifpack/src/euclid/SubdomainGraph_dh.h +++ b/packages/ifpack/src/euclid/SubdomainGraph_dh.h @@ -165,3 +165,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/TimeLog_dh.h b/packages/ifpack/src/euclid/TimeLog_dh.h index c8a12d6794c8..6b35e6800d4a 100644 --- a/packages/ifpack/src/euclid/TimeLog_dh.h +++ b/packages/ifpack/src/euclid/TimeLog_dh.h @@ -69,3 +69,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Timer_dh.h b/packages/ifpack/src/euclid/Timer_dh.h index b6240afdd150..b3a9e8933044 100644 --- a/packages/ifpack/src/euclid/Timer_dh.h +++ b/packages/ifpack/src/euclid/Timer_dh.h @@ -133,3 +133,10 @@ extern "C" #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/Vec_dh.h b/packages/ifpack/src/euclid/Vec_dh.h index de84910edaba..a3de4e4d2c07 100644 --- a/packages/ifpack/src/euclid/Vec_dh.h +++ b/packages/ifpack/src/euclid/Vec_dh.h @@ -83,3 +83,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/blas_dh.h b/packages/ifpack/src/euclid/blas_dh.h index c80c0c33c565..2bcae26c3ab0 100644 --- a/packages/ifpack/src/euclid/blas_dh.h +++ b/packages/ifpack/src/euclid/blas_dh.h @@ -73,3 +73,10 @@ extern "C" #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/call_epetra.h b/packages/ifpack/src/euclid/call_epetra.h index 584f8be9a6af..e05e8ad51755 100644 --- a/packages/ifpack/src/euclid/call_epetra.h +++ b/packages/ifpack/src/euclid/call_epetra.h @@ -69,3 +69,10 @@ extern "C" #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/euclid.h b/packages/ifpack/src/euclid/euclid.h index 3092ecad51cb..f463f264cafd 100644 --- a/packages/ifpack/src/euclid/euclid.h +++ b/packages/ifpack/src/euclid/euclid.h @@ -61,3 +61,10 @@ #include "mat_dh_private.h" #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/euclid_common.h b/packages/ifpack/src/euclid/euclid_common.h index 43b65a8f6b6c..f1327fa10140 100644 --- a/packages/ifpack/src/euclid/euclid_common.h +++ b/packages/ifpack/src/euclid/euclid_common.h @@ -193,3 +193,10 @@ extern "C" #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/euclid_config.h b/packages/ifpack/src/euclid/euclid_config.h index 52ac271896a8..3f44ebc2b1f5 100644 --- a/packages/ifpack/src/euclid/euclid_config.h +++ b/packages/ifpack/src/euclid/euclid_config.h @@ -140,3 +140,10 @@ you need to write EUCLID_GET_ROW() functions: see src/getRow.c */ #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/getRow_dh.h b/packages/ifpack/src/euclid/getRow_dh.h index ad25c7092eb6..d2b811576f87 100644 --- a/packages/ifpack/src/euclid/getRow_dh.h +++ b/packages/ifpack/src/euclid/getRow_dh.h @@ -70,3 +70,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/guards_dh.h b/packages/ifpack/src/euclid/guards_dh.h index 84853d28ae60..811e4660e38e 100644 --- a/packages/ifpack/src/euclid/guards_dh.h +++ b/packages/ifpack/src/euclid/guards_dh.h @@ -69,3 +69,10 @@ #endif /* #ifndef GUARDS_DH */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/ilu_dh.h b/packages/ifpack/src/euclid/ilu_dh.h index 9b57c483fcee..b476c998c013 100644 --- a/packages/ifpack/src/euclid/ilu_dh.h +++ b/packages/ifpack/src/euclid/ilu_dh.h @@ -83,3 +83,10 @@ extern "C" #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/io_dh.h b/packages/ifpack/src/euclid/io_dh.h index a9015d69634b..7bc8672fff89 100644 --- a/packages/ifpack/src/euclid/io_dh.h +++ b/packages/ifpack/src/euclid/io_dh.h @@ -94,3 +94,10 @@ extern "C" #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/krylov_dh.h b/packages/ifpack/src/euclid/krylov_dh.h index e3026de11640..778195942b61 100644 --- a/packages/ifpack/src/euclid/krylov_dh.h +++ b/packages/ifpack/src/euclid/krylov_dh.h @@ -60,3 +60,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/macros_dh.h b/packages/ifpack/src/euclid/macros_dh.h index 24aa84f60ef2..9c2b21756c73 100644 --- a/packages/ifpack/src/euclid/macros_dh.h +++ b/packages/ifpack/src/euclid/macros_dh.h @@ -223,3 +223,10 @@ #endif #endif /* #ifndef MACROS_DH */ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/mat_dh_private.h b/packages/ifpack/src/euclid/mat_dh_private.h index 487cab636706..1e58ef97f099 100644 --- a/packages/ifpack/src/euclid/mat_dh_private.h +++ b/packages/ifpack/src/euclid/mat_dh_private.h @@ -172,3 +172,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/shellSort_dh.h b/packages/ifpack/src/euclid/shellSort_dh.h index a820db123ef0..af05b591ec48 100644 --- a/packages/ifpack/src/euclid/shellSort_dh.h +++ b/packages/ifpack/src/euclid/shellSort_dh.h @@ -62,3 +62,10 @@ extern void shellSort_int_int_float(int n, int *x, int *y, double *v); } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/euclid/sig_dh.h b/packages/ifpack/src/euclid/sig_dh.h index 850bb0df4e3f..072cf92e2a9a 100644 --- a/packages/ifpack/src/euclid/sig_dh.h +++ b/packages/ifpack/src/euclid/sig_dh.h @@ -95,3 +95,10 @@ extern "C" } #endif #endif + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/ifp_parameters.h b/packages/ifpack/src/ifp_parameters.h index ada5e5c76883..5d4211d81453 100644 --- a/packages/ifpack/src/ifp_parameters.h +++ b/packages/ifpack/src/ifp_parameters.h @@ -106,3 +106,10 @@ void set_parameters(const Teuchos::ParameterList& parameterlist, #endif //_ifp_parameters_h_ + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack/src/supportgraph/Ifpack_SupportGraph.h b/packages/ifpack/src/supportgraph/Ifpack_SupportGraph.h index 72942afe89e9..0175f266b710 100644 --- a/packages/ifpack/src/supportgraph/Ifpack_SupportGraph.h +++ b/packages/ifpack/src/supportgraph/Ifpack_SupportGraph.h @@ -790,3 +790,10 @@ Condest(const Ifpack_CondestType CT, const int MaxIters, } #endif // IFPACK_SUPPORTGRAPH_H + +#if defined(Ifpack_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Ifpack package is deprecated" +#endif +#endif + diff --git a/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_decl.hpp b/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_decl.hpp index 592160b77121..15d47a420058 100644 --- a/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_decl.hpp +++ b/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_decl.hpp @@ -163,7 +163,7 @@ class RBILUK : virtual public Ifpack2::RILUK< Tpetra::RowMatrix< typename Matrix local_ordinal_type, global_ordinal_type, node_type> crs_matrix_type; - + using crs_graph_type = Tpetra::CrsGraph; @@ -175,11 +175,16 @@ class RBILUK : virtual public Ifpack2::RILUK< Tpetra::RowMatrix< typename Matrix template friend class RBILUK; + typedef typename block_crs_matrix_type::nonconst_global_inds_host_view_type nonconst_global_inds_host_view_type; + typedef typename block_crs_matrix_type::nonconst_local_inds_host_view_type nonconst_local_inds_host_view_type; + typedef typename block_crs_matrix_type::nonconst_values_host_view_type nonconst_values_host_view_type; + //@} //! \name Implementation of KK ILU(k). //@{ - - typedef typename crs_matrix_type::local_matrix_device_type local_matrix_device_type; + + typedef typename block_crs_matrix_type::local_matrix_device_type local_matrix_device_type; + typedef typename block_crs_matrix_type::local_matrix_host_type local_matrix_host_type; typedef typename local_matrix_device_type::StaticCrsGraphType::row_map_type lno_row_view_t; typedef typename local_matrix_device_type::StaticCrsGraphType::entries_type lno_nonzero_view_t; typedef typename local_matrix_device_type::values_type scalar_nonzero_view_t; diff --git a/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_def.hpp b/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_def.hpp index 7398d77e1a57..fcc5a62932cc 100644 --- a/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_def.hpp +++ b/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_def.hpp @@ -45,13 +45,16 @@ #include "Tpetra_BlockMultiVector.hpp" #include "Tpetra_BlockView.hpp" +#include "Tpetra_BlockCrsMatrix_Helpers_decl.hpp" #include "Ifpack2_OverlappingRowMatrix.hpp" +#include "Ifpack2_Details_getCrsMatrix.hpp" #include "Ifpack2_LocalFilter.hpp" #include "Ifpack2_Utilities.hpp" #include "Ifpack2_RILUK.hpp" +#include "KokkosSparse_trsv.hpp" //#define IFPACK2_RBILUK_INITIAL -#define IFPACK2_RBILUK_INITIAL_NOKK +//#define IFPACK2_RBILUK_INITIAL_NOKK #ifndef IFPACK2_RBILUK_INITIAL_NOKK #include "KokkosBatched_Gemm_Decl.hpp" @@ -69,7 +72,7 @@ template struct LocalRowHandler { using LocalOrdinal = typename MatrixType::local_ordinal_type; - using row_matrix_type = Tpetra::RowMatrix< + using row_matrix_type = Tpetra::RowMatrix< typename MatrixType::scalar_type, LocalOrdinal, typename MatrixType::global_ordinal_type, @@ -96,7 +99,7 @@ struct LocalRowHandler A_->getLocalRowView(local_row,InI,InV); NumIn = (LocalOrdinal)InI.size(); } - else + else { size_t cnt; A_->getLocalRowCopy(local_row,ind_nc_,val_nc_,cnt); @@ -266,7 +269,7 @@ makeLocalFilter (const Teuchos::RCP::row_matri template Teuchos::RCP::crs_graph_type> -getBlockCrsGraph(const Teuchos::RCP::row_matrix_type>& A,const typename MatrixType::local_ordinal_type blockSize) +getBlockCrsGraph(const Teuchos::RCP::row_matrix_type>& A) { using local_ordinal_type = typename MatrixType::local_ordinal_type; using Teuchos::RCP; @@ -289,10 +292,10 @@ getBlockCrsGraph(const Teuchos::RCP::row_matri { overlappedA = rcp_dynamic_cast > (filteredA->getUnderlyingMatrix ()); } - + if (! overlappedA.is_null ()) { A_block = rcp_dynamic_cast(overlappedA->getUnderlyingMatrix()); - } + } else if (!filteredA.is_null ()){ //If there is no overlap, filteredA could be the block CRS matrix A_block = rcp_dynamic_cast(filteredA->getUnderlyingMatrix()); @@ -360,6 +363,7 @@ void RBILUK::initialize () "underlying graph is fill complete."); blockSize_ = this->A_->getBlockSize(); + this->A_local_ = makeLocalFilter(this->A_); Teuchos::Time timer ("RBILUK::initialize"); double startTime = timer.wallTime(); @@ -378,12 +382,25 @@ void RBILUK::initialize () this->isComputed_ = false; this->Graph_ = Teuchos::null; - RCP matrixCrsGraph = getBlockCrsGraph(this->A_,blockSize_); + RCP matrixCrsGraph = getBlockCrsGraph(this->A_); this->Graph_ = rcp (new Ifpack2::IlukGraph (matrixCrsGraph, this->LevelOfFill_, 0)); - this->Graph_->initialize (); + if (this->isKokkosKernelsSpiluk_) { + this->KernelHandle_ = Teuchos::rcp (new kk_handle_type ()); + KernelHandle_->create_spiluk_handle( KokkosSparse::Experimental::SPILUKAlgorithm::SEQLVLSCHD_TP1, + this->A_local_->getLocalNumRows(), + 2*this->A_local_->getLocalNumEntries()*(this->LevelOfFill_+1), + 2*this->A_local_->getLocalNumEntries()*(this->LevelOfFill_+1), + blockSize_); + this->Graph_->initialize(KernelHandle_); // this calls spiluk_symbolic + } + else { + this->Graph_->initialize (); + } + allocate_L_and_U_blocks (); + #ifdef IFPACK2_RBILUK_INITIAL initAllValues (); #endif @@ -577,6 +594,10 @@ struct GetManagedView { template void RBILUK::compute () { + using Teuchos::RCP; + using Teuchos::rcp; + using Teuchos::Array; + typedef impl_scalar_type IST; const char prefix[] = "Ifpack2::Experimental::RBILUK::compute: "; @@ -627,205 +648,205 @@ void RBILUK::compute () // const scalar_type MinDiagonalValue = STS::rmin (); // const scalar_type MaxDiagonalValue = STS::one () / MinDiagonalValue; - initAllValues (); - - size_t NumIn; - LO NumL, NumU, NumURead; + if (!this->isKokkosKernelsSpiluk_) { + initAllValues (); + size_t NumIn; + LO NumL, NumU, NumURead; - // Get Maximum Row length - const size_t MaxNumEntries = - L_block_->getLocalMaxNumRowEntries () + U_block_->getLocalMaxNumRowEntries () + 1; + // Get Maximum Row length + const size_t MaxNumEntries = + L_block_->getLocalMaxNumRowEntries () + U_block_->getLocalMaxNumRowEntries () + 1; - const LO blockMatSize = blockSize_*blockSize_; + const LO blockMatSize = blockSize_*blockSize_; - // FIXME (mfh 08 Nov 2015, 24 May 2016) We need to move away from - // expressing these strides explicitly, in order to finish #177 - // (complete Kokkos-ization of BlockCrsMatrix) thoroughly. - const LO rowStride = blockSize_; + // FIXME (mfh 08 Nov 2015, 24 May 2016) We need to move away from + // expressing these strides explicitly, in order to finish #177 + // (complete Kokkos-ization of BlockCrsMatrix) thoroughly. + const LO rowStride = blockSize_; - Teuchos::Array ipiv_teuchos(blockSize_); - Kokkos::View ipiv (ipiv_teuchos.getRawPtr (), blockSize_); - Teuchos::Array work_teuchos(blockSize_); - Kokkos::View work (work_teuchos.getRawPtr (), blockSize_); + Teuchos::Array ipiv_teuchos(blockSize_); + Kokkos::View ipiv (ipiv_teuchos.getRawPtr (), blockSize_); + Teuchos::Array work_teuchos(blockSize_); + Kokkos::View work (work_teuchos.getRawPtr (), blockSize_); - size_t num_cols = U_block_->getColMap()->getLocalNumElements(); - Teuchos::Array colflag(num_cols); + size_t num_cols = U_block_->getColMap()->getLocalNumElements(); + Teuchos::Array colflag(num_cols); - typename GetManagedView::managed_non_const_type diagModBlock ("diagModBlock", blockSize_, blockSize_); - typename GetManagedView::managed_non_const_type matTmp ("matTmp", blockSize_, blockSize_); - typename GetManagedView::managed_non_const_type multiplier ("multiplier", blockSize_, blockSize_); + typename GetManagedView::managed_non_const_type diagModBlock ("diagModBlock", blockSize_, blockSize_); + typename GetManagedView::managed_non_const_type matTmp ("matTmp", blockSize_, blockSize_); + typename GetManagedView::managed_non_const_type multiplier ("multiplier", blockSize_, blockSize_); // Teuchos::ArrayRCP DV = D_->get1dViewNonConst(); // Get view of diagonal - // Now start the factorization. + // Now start the factorization. - // Need some integer workspace and pointers - LO NumUU; - for (size_t j = 0; j < num_cols; ++j) { - colflag[j] = -1; - } - Teuchos::Array InI(MaxNumEntries, 0); - Teuchos::Array InV(MaxNumEntries*blockMatSize,STM::zero()); - - const LO numLocalRows = L_block_->getLocalNumRows (); - for (LO local_row = 0; local_row < numLocalRows; ++local_row) { - - // Fill InV, InI with current row of L, D and U combined - - NumIn = MaxNumEntries; - local_inds_host_view_type colValsL; - values_host_view_type valsL; - - L_block_->getLocalRowView(local_row, colValsL, valsL); - NumL = (LO) colValsL.size(); - for (LO j = 0; j < NumL; ++j) - { - const LO matOffset = blockMatSize*j; - little_block_host_type lmat((typename little_block_host_type::value_type*) &valsL[matOffset],blockSize_,rowStride); - little_block_host_type lmatV((typename little_block_host_type::value_type*) &InV[matOffset],blockSize_,rowStride); - //lmatV.assign(lmat); - Tpetra::COPY (lmat, lmatV); - InI[j] = colValsL[j]; + // Need some integer workspace and pointers + LO NumUU; + for (size_t j = 0; j < num_cols; ++j) { + colflag[j] = -1; } + Teuchos::Array InI(MaxNumEntries, 0); + Teuchos::Array InV(MaxNumEntries*blockMatSize,STM::zero()); - little_block_host_type dmat = D_block_->getLocalBlockHostNonConst(local_row, local_row); - little_block_host_type dmatV((typename little_block_host_type::value_type*) &InV[NumL*blockMatSize], blockSize_, rowStride); - //dmatV.assign(dmat); - Tpetra::COPY (dmat, dmatV); - InI[NumL] = local_row; - - local_inds_host_view_type colValsU; - values_host_view_type valsU; - U_block_->getLocalRowView(local_row, colValsU, valsU); - NumURead = (LO) colValsU.size(); - NumU = 0; - for (LO j = 0; j < NumURead; ++j) - { - if (!(colValsU[j] < numLocalRows)) continue; - InI[NumL+1+j] = colValsU[j]; - const LO matOffset = blockMatSize*(NumL+1+j); - little_block_host_type umat((typename little_block_host_type::value_type*) &valsU[blockMatSize*j], blockSize_, rowStride); - little_block_host_type umatV((typename little_block_host_type::value_type*) &InV[matOffset], blockSize_, rowStride); - //umatV.assign(umat); - Tpetra::COPY (umat, umatV); - NumU += 1; - } - NumIn = NumL+NumU+1; + const LO numLocalRows = L_block_->getLocalNumRows (); + for (LO local_row = 0; local_row < numLocalRows; ++local_row) { - // Set column flags - for (size_t j = 0; j < NumIn; ++j) { - colflag[InI[j]] = j; - } + // Fill InV, InI with current row of L, D and U combined + + NumIn = MaxNumEntries; + local_inds_host_view_type colValsL; + values_host_view_type valsL; + + L_block_->getLocalRowView(local_row, colValsL, valsL); + NumL = (LO) colValsL.size(); + for (LO j = 0; j < NumL; ++j) + { + const LO matOffset = blockMatSize*j; + little_block_host_type lmat((typename little_block_host_type::value_type*) &valsL[matOffset],blockSize_,rowStride); + little_block_host_type lmatV((typename little_block_host_type::value_type*) &InV[matOffset],blockSize_,rowStride); + //lmatV.assign(lmat); + Tpetra::COPY (lmat, lmatV); + InI[j] = colValsL[j]; + } + + little_block_host_type dmat = D_block_->getLocalBlockHostNonConst(local_row, local_row); + little_block_host_type dmatV((typename little_block_host_type::value_type*) &InV[NumL*blockMatSize], blockSize_, rowStride); + //dmatV.assign(dmat); + Tpetra::COPY (dmat, dmatV); + InI[NumL] = local_row; + + local_inds_host_view_type colValsU; + values_host_view_type valsU; + U_block_->getLocalRowView(local_row, colValsU, valsU); + NumURead = (LO) colValsU.size(); + NumU = 0; + for (LO j = 0; j < NumURead; ++j) + { + if (!(colValsU[j] < numLocalRows)) continue; + InI[NumL+1+j] = colValsU[j]; + const LO matOffset = blockMatSize*(NumL+1+j); + little_block_host_type umat((typename little_block_host_type::value_type*) &valsU[blockMatSize*j], blockSize_, rowStride); + little_block_host_type umatV((typename little_block_host_type::value_type*) &InV[matOffset], blockSize_, rowStride); + //umatV.assign(umat); + Tpetra::COPY (umat, umatV); + NumU += 1; + } + NumIn = NumL+NumU+1; + + // Set column flags + for (size_t j = 0; j < NumIn; ++j) { + colflag[InI[j]] = j; + } #ifndef IFPACK2_RBILUK_INITIAL - for (LO i = 0; i < blockSize_; ++i) - for (LO j = 0; j < blockSize_; ++j){ - { - diagModBlock(i,j) = 0; + for (LO i = 0; i < blockSize_; ++i) + for (LO j = 0; j < blockSize_; ++j){ + { + diagModBlock(i,j) = 0; + } } - } #else - scalar_type diagmod = STM::zero (); // Off-diagonal accumulator - Kokkos::deep_copy (diagModBlock, diagmod); + scalar_type diagmod = STM::zero (); // Off-diagonal accumulator + Kokkos::deep_copy (diagModBlock, diagmod); #endif - for (LO jj = 0; jj < NumL; ++jj) { - LO j = InI[jj]; - little_block_host_type currentVal((typename little_block_host_type::value_type*) &InV[jj*blockMatSize], blockSize_, rowStride); // current_mults++; - //multiplier.assign(currentVal); - Tpetra::COPY (currentVal, multiplier); + for (LO jj = 0; jj < NumL; ++jj) { + LO j = InI[jj]; + little_block_host_type currentVal((typename little_block_host_type::value_type*) &InV[jj*blockMatSize], blockSize_, rowStride); // current_mults++; + //multiplier.assign(currentVal); + Tpetra::COPY (currentVal, multiplier); - const little_block_host_type dmatInverse = D_block_->getLocalBlockHostNonConst(j,j); - // alpha = 1, beta = 0 + const little_block_host_type dmatInverse = D_block_->getLocalBlockHostNonConst(j,j); + // alpha = 1, beta = 0 #ifndef IFPACK2_RBILUK_INITIAL_NOKK - KokkosBatched::Experimental::SerialGemm - ::invoke - (STS::one (), currentVal, dmatInverse, STS::zero (), matTmp); + KokkosBatched::SerialGemm + ::invoke + (STS::one (), currentVal, dmatInverse, STS::zero (), matTmp); #else - Tpetra::GEMM ("N", "N", STS::one (), currentVal, dmatInverse, - STS::zero (), matTmp); + Tpetra::GEMM ("N", "N", STS::one (), currentVal, dmatInverse, + STS::zero (), matTmp); #endif - //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast (currentVal.data ()), reinterpret_cast (dmatInverse.data ()), reinterpret_cast (matTmp.data ()), blockSize_); - //currentVal.assign(matTmp); - Tpetra::COPY (matTmp, currentVal); - local_inds_host_view_type UUI; - values_host_view_type UUV; - - U_block_->getLocalRowView(j, UUI, UUV); - NumUU = (LO) UUI.size(); - - if (this->RelaxValue_ == STM::zero ()) { - for (LO k = 0; k < NumUU; ++k) { - if (!(UUI[k] < numLocalRows)) continue; - const int kk = colflag[UUI[k]]; - if (kk > -1) { - little_block_host_type kkval((typename little_block_host_type::value_type*) &InV[kk*blockMatSize], blockSize_, rowStride); - little_block_host_type uumat((typename little_block_host_type::value_type*) &UUV[k*blockMatSize], blockSize_, rowStride); + //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast (currentVal.data ()), reinterpret_cast (dmatInverse.data ()), reinterpret_cast (matTmp.data ()), blockSize_); + //currentVal.assign(matTmp); + Tpetra::COPY (matTmp, currentVal); + local_inds_host_view_type UUI; + values_host_view_type UUV; + + U_block_->getLocalRowView(j, UUI, UUV); + NumUU = (LO) UUI.size(); + + if (this->RelaxValue_ == STM::zero ()) { + for (LO k = 0; k < NumUU; ++k) { + if (!(UUI[k] < numLocalRows)) continue; + const int kk = colflag[UUI[k]]; + if (kk > -1) { + little_block_host_type kkval((typename little_block_host_type::value_type*) &InV[kk*blockMatSize], blockSize_, rowStride); + little_block_host_type uumat((typename little_block_host_type::value_type*) &UUV[k*blockMatSize], blockSize_, rowStride); #ifndef IFPACK2_RBILUK_INITIAL_NOKK - KokkosBatched::Experimental::SerialGemm - ::invoke - ( magnitude_type(-STM::one ()), multiplier, uumat, STM::one (), kkval); + KokkosBatched::SerialGemm + ::invoke + ( magnitude_type(-STM::one ()), multiplier, uumat, STM::one (), kkval); #else - Tpetra::GEMM ("N", "N", magnitude_type(-STM::one ()), multiplier, uumat, - STM::one (), kkval); + Tpetra::GEMM ("N", "N", magnitude_type(-STM::one ()), multiplier, uumat, + STM::one (), kkval); #endif - //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast (multiplier.data ()), reinterpret_cast (uumat.data ()), reinterpret_cast (kkval.data ()), blockSize_, -STM::one(), STM::one()); + //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast (multiplier.data ()), reinterpret_cast (uumat.data ()), reinterpret_cast (kkval.data ()), blockSize_, -STM::one(), STM::one()); + } } } - } - else { - for (LO k = 0; k < NumUU; ++k) { - if (!(UUI[k] < numLocalRows)) continue; - const int kk = colflag[UUI[k]]; - little_block_host_type uumat((typename little_block_host_type::value_type*) &UUV[k*blockMatSize], blockSize_, rowStride); - if (kk > -1) { - little_block_host_type kkval((typename little_block_host_type::value_type*) &InV[kk*blockMatSize], blockSize_, rowStride); + else { + for (LO k = 0; k < NumUU; ++k) { + if (!(UUI[k] < numLocalRows)) continue; + const int kk = colflag[UUI[k]]; + little_block_host_type uumat((typename little_block_host_type::value_type*) &UUV[k*blockMatSize], blockSize_, rowStride); + if (kk > -1) { + little_block_host_type kkval((typename little_block_host_type::value_type*) &InV[kk*blockMatSize], blockSize_, rowStride); #ifndef IFPACK2_RBILUK_INITIAL_NOKK - KokkosBatched::Experimental::SerialGemm - ::invoke - (magnitude_type(-STM::one ()), multiplier, uumat, STM::one (), kkval); + KokkosBatched::SerialGemm + ::invoke + (magnitude_type(-STM::one ()), multiplier, uumat, STM::one (), kkval); #else - Tpetra::GEMM ("N", "N", magnitude_type(-STM::one ()), multiplier, uumat, - STM::one (), kkval); + Tpetra::GEMM ("N", "N", magnitude_type(-STM::one ()), multiplier, uumat, + STM::one (), kkval); #endif - //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast(multiplier.data ()), reinterpret_cast(uumat.data ()), reinterpret_cast(kkval.data ()), blockSize_, -STM::one(), STM::one()); - } - else { + //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast(multiplier.data ()), reinterpret_cast(uumat.data ()), reinterpret_cast(kkval.data ()), blockSize_, -STM::one(), STM::one()); + } + else { #ifndef IFPACK2_RBILUK_INITIAL_NOKK - KokkosBatched::Experimental::SerialGemm - ::invoke - (magnitude_type(-STM::one ()), multiplier, uumat, STM::one (), diagModBlock); + KokkosBatched::SerialGemm + ::invoke + (magnitude_type(-STM::one ()), multiplier, uumat, STM::one (), diagModBlock); #else - Tpetra::GEMM ("N", "N", magnitude_type(-STM::one ()), multiplier, uumat, - STM::one (), diagModBlock); + Tpetra::GEMM ("N", "N", magnitude_type(-STM::one ()), multiplier, uumat, + STM::one (), diagModBlock); #endif - //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast(multiplier.data ()), reinterpret_cast(uumat.data ()), reinterpret_cast(diagModBlock.data ()), blockSize_, -STM::one(), STM::one()); + //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast(multiplier.data ()), reinterpret_cast(uumat.data ()), reinterpret_cast(diagModBlock.data ()), blockSize_, -STM::one(), STM::one()); + } } } } - } - if (NumL) { - // Replace current row of L - L_block_->replaceLocalValues (local_row, InI.getRawPtr (), InV.getRawPtr (), NumL); - } + if (NumL) { + // Replace current row of L + L_block_->replaceLocalValues (local_row, InI.getRawPtr (), InV.getRawPtr (), NumL); + } - // dmat.assign(dmatV); - Tpetra::COPY (dmatV, dmat); + // dmat.assign(dmatV); + Tpetra::COPY (dmatV, dmat); - if (this->RelaxValue_ != STM::zero ()) { - //dmat.update(this->RelaxValue_, diagModBlock); - Tpetra::AXPY (this->RelaxValue_, diagModBlock, dmat); - } + if (this->RelaxValue_ != STM::zero ()) { + //dmat.update(this->RelaxValue_, diagModBlock); + Tpetra::AXPY (this->RelaxValue_, diagModBlock, dmat); + } // if (STS::magnitude (DV[i]) > STS::magnitude (MaxDiagonalValue)) { // if (STS::real (DV[i]) < STM::zero ()) { @@ -836,61 +857,130 @@ void RBILUK::compute () // } // } // else - { - int lapackInfo = 0; - for (int k = 0; k < blockSize_; ++k) { - ipiv[k] = 0; - } - - Tpetra::GETF2 (dmat, ipiv, lapackInfo); - //lapack.GETRF(blockSize_, blockSize_, d_raw, blockSize_, ipiv.getRawPtr(), &lapackInfo); - TEUCHOS_TEST_FOR_EXCEPTION( - lapackInfo != 0, std::runtime_error, "Ifpack2::Experimental::RBILUK::compute: " - "lapackInfo = " << lapackInfo << " which indicates an error in the factorization GETRF."); + { + int lapackInfo = 0; + for (int k = 0; k < blockSize_; ++k) { + ipiv[k] = 0; + } - Tpetra::GETRI (dmat, ipiv, work, lapackInfo); - //lapack.GETRI(blockSize_, d_raw, blockSize_, ipiv.getRawPtr(), work.getRawPtr(), lwork, &lapackInfo); - TEUCHOS_TEST_FOR_EXCEPTION( - lapackInfo != 0, std::runtime_error, "Ifpack2::Experimental::RBILUK::compute: " - "lapackInfo = " << lapackInfo << " which indicates an error in the matrix inverse GETRI."); - } + Tpetra::GETF2 (dmat, ipiv, lapackInfo); + //lapack.GETRF(blockSize_, blockSize_, d_raw, blockSize_, ipiv.getRawPtr(), &lapackInfo); + TEUCHOS_TEST_FOR_EXCEPTION( + lapackInfo != 0, std::runtime_error, "Ifpack2::Experimental::RBILUK::compute: " + "lapackInfo = " << lapackInfo << " which indicates an error in the factorization GETRF."); + + Tpetra::GETRI (dmat, ipiv, work, lapackInfo); + //lapack.GETRI(blockSize_, d_raw, blockSize_, ipiv.getRawPtr(), work.getRawPtr(), lwork, &lapackInfo); + TEUCHOS_TEST_FOR_EXCEPTION( + lapackInfo != 0, std::runtime_error, "Ifpack2::Experimental::RBILUK::compute: " + "lapackInfo = " << lapackInfo << " which indicates an error in the matrix inverse GETRI."); + } - for (LO j = 0; j < NumU; ++j) { - little_block_host_type currentVal((typename little_block_host_type::value_type*) &InV[(NumL+1+j)*blockMatSize], blockSize_, rowStride); // current_mults++; - // scale U by the diagonal inverse + for (LO j = 0; j < NumU; ++j) { + little_block_host_type currentVal((typename little_block_host_type::value_type*) &InV[(NumL+1+j)*blockMatSize], blockSize_, rowStride); // current_mults++; + // scale U by the diagonal inverse #ifndef IFPACK2_RBILUK_INITIAL_NOKK - KokkosBatched::Experimental::SerialGemm - ::invoke - (STS::one (), dmat, currentVal, STS::zero (), matTmp); + KokkosBatched::SerialGemm + ::invoke + (STS::one (), dmat, currentVal, STS::zero (), matTmp); #else - Tpetra::GEMM ("N", "N", STS::one (), dmat, currentVal, - STS::zero (), matTmp); + Tpetra::GEMM ("N", "N", STS::one (), dmat, currentVal, + STS::zero (), matTmp); #endif - //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast(dmat.data ()), reinterpret_cast(currentVal.data ()), reinterpret_cast(matTmp.data ()), blockSize_); - //currentVal.assign(matTmp); - Tpetra::COPY (matTmp, currentVal); - } + //blockMatOpts.square_matrix_matrix_multiply(reinterpret_cast(dmat.data ()), reinterpret_cast(currentVal.data ()), reinterpret_cast(matTmp.data ()), blockSize_); + //currentVal.assign(matTmp); + Tpetra::COPY (matTmp, currentVal); + } - if (NumU) { - // Replace current row of L and U - U_block_->replaceLocalValues (local_row, &InI[NumL+1], &InV[blockMatSize*(NumL+1)], NumU); - } + if (NumU) { + // Replace current row of L and U + U_block_->replaceLocalValues (local_row, &InI[NumL+1], &InV[blockMatSize*(NumL+1)], NumU); + } #ifndef IFPACK2_RBILUK_INITIAL - // Reset column flags - for (size_t j = 0; j < NumIn; ++j) { - colflag[InI[j]] = -1; - } + // Reset column flags + for (size_t j = 0; j < NumIn; ++j) { + colflag[InI[j]] = -1; + } #else - // Reset column flags - for (size_t j = 0; j < num_cols; ++j) { - colflag[j] = -1; - } + // Reset column flags + for (size_t j = 0; j < num_cols; ++j) { + colflag[j] = -1; + } #endif - } + } + } // !this->isKokkosKernelsSpiluk_ + else { + RCP A_local_bcrs = Details::getBcrsMatrix(this->A_local_); + RCP A_local_crs = Details::getCrsMatrix(this->A_local_); + if (A_local_bcrs.is_null()) { + if (A_local_crs.is_null()) { + local_ordinal_type numRows = this->A_local_->getLocalNumRows(); + Array entriesPerRow(numRows); + for(local_ordinal_type i = 0; i < numRows; i++) { + entriesPerRow[i] = this->A_local_->getNumEntriesInLocalRow(i); + } + RCP A_local_crs_nc = + rcp (new crs_matrix_type (this->A_local_->getRowMap (), + this->A_local_->getColMap (), + entriesPerRow())); + // copy entries into A_local_crs + nonconst_local_inds_host_view_type indices("indices",this->A_local_->getLocalMaxNumRowEntries()); + nonconst_values_host_view_type values("values",this->A_local_->getLocalMaxNumRowEntries()); + for(local_ordinal_type i = 0; i < numRows; i++) { + size_t numEntries = 0; + this->A_local_->getLocalRowCopy(i, indices, values, numEntries); + A_local_crs_nc->insertLocalValues(i, numEntries, reinterpret_cast(values.data()),indices.data()); + } + A_local_crs_nc->fillComplete (this->A_local_->getDomainMap (), this->A_local_->getRangeMap ()); + A_local_crs = Teuchos::rcp_const_cast (A_local_crs_nc); + } + // Create bcrs from crs + // We can skip fillLogicalBlocks if we know the input is already filled + if (blockSize_ > 1) { + auto crs_matrix_block_filled = Tpetra::fillLogicalBlocks(*A_local_crs, blockSize_); + A_local_bcrs = Tpetra::convertToBlockCrsMatrix(*crs_matrix_block_filled, blockSize_); + } + else { + A_local_bcrs = Tpetra::convertToBlockCrsMatrix(*A_local_crs, blockSize_); + } + } + + TEUCHOS_TEST_FOR_EXCEPTION( + this->isKokkosKernelsStream_, std::runtime_error, "Ifpack2::RBILUK::compute: " + "streams are not yet supported."); + auto lclMtx = A_local_bcrs->getLocalMatrixDevice(); + this->A_local_rowmap_ = lclMtx.graph.row_map; + this->A_local_entries_ = lclMtx.graph.entries; + this->A_local_values_ = lclMtx.values; + + // L_block_->resumeFill (); + // U_block_->resumeFill (); + + if (L_block_->isLocallyIndexed ()) { + L_block_->setAllToScalar (STS::zero ()); // Zero out L and U matrices + U_block_->setAllToScalar (STS::zero ()); + } + + using row_map_type = typename local_matrix_device_type::row_map_type; + + auto lclL = L_block_->getLocalMatrixDevice(); + row_map_type L_rowmap = lclL.graph.row_map; + auto L_entries = lclL.graph.entries; + auto L_values = lclL.values; + + auto lclU = U_block_->getLocalMatrixDevice(); + row_map_type U_rowmap = lclU.graph.row_map; + auto U_entries = lclU.graph.entries; + auto U_values = lclU.values; + + KokkosSparse::Experimental::spiluk_numeric( KernelHandle_.getRawPtr(), this->LevelOfFill_, + this->A_local_rowmap_, this->A_local_entries_, this->A_local_values_, + L_rowmap, L_entries, L_values, U_rowmap, U_entries, U_values ); + } } // Stop timing // Sync everything back to device, for efficient solves. @@ -962,104 +1052,147 @@ apply (const Tpetra::MultiVectorGraph_->getA_Graph()->getDomainMap ()), blockSize_, numVectors); - BMV rBlock (* (this->Graph_->getA_Graph()->getDomainMap ()), blockSize_, numVectors); - for (LO imv = 0; imv < numVectors; ++imv) - { - for (size_t i = 0; i < D_block_->getLocalNumRows(); ++i) + if (!this->isKokkosKernelsSpiluk_) { + if (alpha == one && beta == zero) { + if (mode == Teuchos::NO_TRANS) { // Solve L (D (U Y)) = X for Y. + // Start by solving L C = X for C. C must have the same Map + // as D. We have to use a temp multivector, since our + // implementation of triangular solves does not allow its + // input and output to alias one another. + // + // FIXME (mfh 24 Jan 2014) Cache this temp multivector. + const LO numVectors = xBlock.getNumVectors(); + BMV cBlock (* (this->Graph_->getA_Graph()->getDomainMap ()), blockSize_, numVectors); + BMV rBlock (* (this->Graph_->getA_Graph()->getDomainMap ()), blockSize_, numVectors); + for (LO imv = 0; imv < numVectors; ++imv) { - LO local_row = i; - const_host_little_vec_type xval = - xBlock.getLocalBlockHost(local_row, imv, Tpetra::Access::ReadOnly); - little_host_vec_type cval = - cBlock.getLocalBlockHost(local_row, imv, Tpetra::Access::OverwriteAll); - //cval.assign(xval); - Tpetra::COPY (xval, cval); - - local_inds_host_view_type colValsL; - values_host_view_type valsL; - L_block_->getLocalRowView(local_row, colValsL, valsL); - LO NumL = (LO) colValsL.size(); - - for (LO j = 0; j < NumL; ++j) + for (size_t i = 0; i < D_block_->getLocalNumRows(); ++i) { - LO col = colValsL[j]; - const_host_little_vec_type prevVal = - cBlock.getLocalBlockHost(col, imv, Tpetra::Access::ReadOnly); - - const LO matOffset = blockMatSize*j; - little_block_host_type lij((typename little_block_host_type::value_type*) &valsL[matOffset],blockSize_,rowStride); - - //cval.matvecUpdate(-one, lij, prevVal); - Tpetra::GEMV (-one, lij, prevVal, cval); + LO local_row = i; + const_host_little_vec_type xval = + xBlock.getLocalBlockHost(local_row, imv, Tpetra::Access::ReadOnly); + little_host_vec_type cval = + cBlock.getLocalBlockHost(local_row, imv, Tpetra::Access::OverwriteAll); + //cval.assign(xval); + Tpetra::COPY (xval, cval); + + local_inds_host_view_type colValsL; + values_host_view_type valsL; + L_block_->getLocalRowView(local_row, colValsL, valsL); + LO NumL = (LO) colValsL.size(); + + for (LO j = 0; j < NumL; ++j) + { + LO col = colValsL[j]; + const_host_little_vec_type prevVal = + cBlock.getLocalBlockHost(col, imv, Tpetra::Access::ReadOnly); + + const LO matOffset = blockMatSize*j; + little_block_host_type lij((typename little_block_host_type::value_type*) &valsL[matOffset],blockSize_,rowStride); + + //cval.matvecUpdate(-one, lij, prevVal); + Tpetra::GEMV (-one, lij, prevVal, cval); + } } } - } - // Solve D R = C. Note that D has been replaced by D^{-1} at this point. - D_block_->applyBlock(cBlock, rBlock); + // Solve D R = C. Note that D has been replaced by D^{-1} at this point. + D_block_->applyBlock(cBlock, rBlock); - // Solve U Y = R. - for (LO imv = 0; imv < numVectors; ++imv) - { - const LO numRows = D_block_->getLocalNumRows(); - for (LO i = 0; i < numRows; ++i) + // Solve U Y = R. + for (LO imv = 0; imv < numVectors; ++imv) { - LO local_row = (numRows-1)-i; - const_host_little_vec_type rval = - rBlock.getLocalBlockHost(local_row, imv, Tpetra::Access::ReadOnly); - little_host_vec_type yval = - yBlock.getLocalBlockHost(local_row, imv, Tpetra::Access::OverwriteAll); - //yval.assign(rval); - Tpetra::COPY (rval, yval); - - local_inds_host_view_type colValsU; - values_host_view_type valsU; - U_block_->getLocalRowView(local_row, colValsU, valsU); - LO NumU = (LO) colValsU.size(); - - for (LO j = 0; j < NumU; ++j) + const LO numRows = D_block_->getLocalNumRows(); + for (LO i = 0; i < numRows; ++i) { - LO col = colValsU[NumU-1-j]; - const_host_little_vec_type prevVal = - yBlock.getLocalBlockHost(col, imv, Tpetra::Access::ReadOnly); - - const LO matOffset = blockMatSize*(NumU-1-j); - little_block_host_type uij((typename little_block_host_type::value_type*) &valsU[matOffset], blockSize_, rowStride); - - //yval.matvecUpdate(-one, uij, prevVal); - Tpetra::GEMV (-one, uij, prevVal, yval); + LO local_row = (numRows-1)-i; + const_host_little_vec_type rval = + rBlock.getLocalBlockHost(local_row, imv, Tpetra::Access::ReadOnly); + little_host_vec_type yval = + yBlock.getLocalBlockHost(local_row, imv, Tpetra::Access::OverwriteAll); + //yval.assign(rval); + Tpetra::COPY (rval, yval); + + local_inds_host_view_type colValsU; + values_host_view_type valsU; + U_block_->getLocalRowView(local_row, colValsU, valsU); + LO NumU = (LO) colValsU.size(); + + for (LO j = 0; j < NumU; ++j) + { + LO col = colValsU[NumU-1-j]; + const_host_little_vec_type prevVal = + yBlock.getLocalBlockHost(col, imv, Tpetra::Access::ReadOnly); + + const LO matOffset = blockMatSize*(NumU-1-j); + little_block_host_type uij((typename little_block_host_type::value_type*) &valsU[matOffset], blockSize_, rowStride); + + //yval.matvecUpdate(-one, uij, prevVal); + Tpetra::GEMV (-one, uij, prevVal, yval); + } } } } + else { // Solve U^P (D^P (L^P Y)) = X for Y (where P is * or T). + TEUCHOS_TEST_FOR_EXCEPTION( + true, std::runtime_error, + "Ifpack2::Experimental::RBILUK::apply: transpose apply is not implemented for the block algorithm without KokkosKernels. "); + } } - else { // Solve U^P (D^P (L^P Y)) = X for Y (where P is * or T). - TEUCHOS_TEST_FOR_EXCEPTION( - true, std::runtime_error, - "Ifpack2::Experimental::RBILUK::apply: transpose apply is not implemented for the block algorithm. "); + else { // alpha != 1 or beta != 0 + if (alpha == zero) { + if (beta == zero) { + Y.putScalar (zero); + } else { + Y.scale (beta); + } + } else { // alpha != zero + MV Y_tmp (Y.getMap (), Y.getNumVectors ()); + apply (X, Y_tmp, mode); + Y.update (alpha, Y_tmp, beta); + } } } - else { // alpha != 1 or beta != 0 - if (alpha == zero) { - if (beta == zero) { - Y.putScalar (zero); - } else { - Y.scale (beta); - } - } else { // alpha != zero - MV Y_tmp (Y.getMap (), Y.getNumVectors ()); - apply (X, Y_tmp, mode); - Y.update (alpha, Y_tmp, beta); + else { + // Kokkos kernels impl. For now, the only block trsv available is Sequential + // and must be done on host. + using row_map_type = typename local_matrix_host_type::row_map_type; + using index_type = typename local_matrix_host_type::index_type; + using values_type = typename local_matrix_host_type::values_type; + + auto X_view = X.getLocalViewHost(Tpetra::Access::ReadOnly); + auto Y_view = Y.getLocalViewHost(Tpetra::Access::ReadWrite); + + auto L_row_ptrs_host = L_block_->getCrsGraph().getLocalRowPtrsHost(); + auto L_entries_host = L_block_->getCrsGraph().getLocalIndicesHost(); + auto U_row_ptrs_host = U_block_->getCrsGraph().getLocalRowPtrsHost(); + auto U_entries_host = U_block_->getCrsGraph().getLocalIndicesHost(); + auto L_values_host = L_block_->getValuesHost(); + auto U_values_host = U_block_->getValuesHost(); + + row_map_type* L_row_ptrs_host_ri = reinterpret_cast(&L_row_ptrs_host); + index_type* L_entries_host_ri = reinterpret_cast(&L_entries_host); + row_map_type* U_row_ptrs_host_ri = reinterpret_cast(&U_row_ptrs_host); + index_type* U_entries_host_ri = reinterpret_cast(&U_entries_host); + values_type* L_values_host_ri = reinterpret_cast(&L_values_host); + values_type* U_values_host_ri = reinterpret_cast(&U_values_host); + + const auto numRows = L_block_->getLocalNumRows(); + local_matrix_host_type L_block_local_host("L_block_local_host", numRows, numRows, L_entries_host.size(), *L_values_host_ri, *L_row_ptrs_host_ri, *L_entries_host_ri, blockSize_); + local_matrix_host_type U_block_local_host("U_block_local_host", numRows, numRows, U_entries_host.size(), *U_values_host_ri, *U_row_ptrs_host_ri, *U_entries_host_ri, blockSize_); + + if (mode == Teuchos::NO_TRANS) { + KokkosSparse::trsv("L", "N", "N", L_block_local_host, X_view, Y_view); + KokkosSparse::trsv("U", "N", "N", U_block_local_host, Y_view, Y_view); + KokkosBlas::axpby(alpha, Y_view, beta, Y_view); } + else { + KokkosSparse::trsv("U", "T", "N", U_block_local_host, X_view, Y_view); + KokkosSparse::trsv("L", "T", "N", L_block_local_host, Y_view, Y_view); + KokkosBlas::axpby(alpha, Y_view, beta, Y_view); + } + + //Y.getWrappedDualView().sync(); } } // Stop timing diff --git a/packages/ifpack2/src/Ifpack2_IlukGraph.hpp b/packages/ifpack2/src/Ifpack2_IlukGraph.hpp index 6d293c003b08..c9bf970d322d 100644 --- a/packages/ifpack2/src/Ifpack2_IlukGraph.hpp +++ b/packages/ifpack2/src/Ifpack2_IlukGraph.hpp @@ -189,7 +189,7 @@ class IlukGraph : public Teuchos::Describable { size_t getNumGlobalDiagonals() const { return NumGlobalDiagonals_; } private: - typedef typename GraphType::map_type map_type; + typedef typename GraphType::map_type map_type; /// \brief Copy constructor (UNIMPLEMENTED; DO NOT USE). /// @@ -313,7 +313,7 @@ void IlukGraph::initialize() : Kokkos::ceil(static_cast(RowMaxNumIndices) * Kokkos::pow(overalloc, levelfill)); }); - + }; bool insertError; // No error found yet while inserting entries @@ -415,7 +415,7 @@ void IlukGraph::initialize() L_Graph_->getLocalRowCopy(i, CurrentRow_view, LenL); // Get L Indices CurrentRow[LenL] = i; // Put in Diagonal if (LenU > 0) { - ArrayView URowView = CurrentRow.view (LenL+1,LenU); + ArrayView URowView = CurrentRow.view (LenL+1,LenU); nonconst_local_inds_host_view_type URowView_v(URowView.data(),URowView.size()); // Get U Indices @@ -584,7 +584,7 @@ void IlukGraph::initialize(const Teuchos::RCP lno_row_view_t; typedef typename Kokkos::View lno_nonzero_view_t; - + constructOverlapGraph(); // FIXME (mfh 23 Dec 2013) Use size_t or whatever @@ -614,7 +614,7 @@ void IlukGraph::initialize(const Teuchos::RCP(Overalloc_)*L_entries.extent(0); - data_type nnzU = static_cast(Overalloc_)*U_entries.extent(0); + data_type nnzU = static_cast(Overalloc_)*U_entries.extent(0); KernelHandle->get_spiluk_handle()->reset_handle(NumMyRows, nnzL, nnzU); Kokkos::resize(L_entries, KernelHandle->get_spiluk_handle()->get_nnzL()); Kokkos::resize(U_entries, KernelHandle->get_spiluk_handle()->get_nnzU()); @@ -628,17 +628,17 @@ void IlukGraph::initialize(const Teuchos::RCPget_spiluk_handle()->get_nnzL()); Kokkos::resize(U_entries, KernelHandle->get_spiluk_handle()->get_nnzU()); - + RCP params = Teuchos::parameterList (); params->set ("Optimize Storage",false); - + L_Graph_ = rcp (new crs_graph_type (OverlapGraph_->getRowMap (), - OverlapGraph_->getRowMap (), + OverlapGraph_->getRowMap (), L_row_map, L_entries)); U_Graph_ = rcp (new crs_graph_type (OverlapGraph_->getRowMap (), - OverlapGraph_->getRowMap (), + OverlapGraph_->getRowMap (), U_row_map, U_entries)); - + RCP L_DomainMap = OverlapGraph_->getRowMap (); RCP L_RangeMap = Graph_->getRangeMap (); RCP U_DomainMap = Graph_->getDomainMap (); diff --git a/packages/ifpack2/src/Ifpack2_RILUK_decl.hpp b/packages/ifpack2/src/Ifpack2_RILUK_decl.hpp index 850c121922df..07f95154e909 100644 --- a/packages/ifpack2/src/Ifpack2_RILUK_decl.hpp +++ b/packages/ifpack2/src/Ifpack2_RILUK_decl.hpp @@ -319,7 +319,7 @@ class RILUK: kk_handle_type; typedef Ifpack2::IlukGraph, kk_handle_type> iluk_graph_type; - + /// \brief Constructor that takes a Tpetra::RowMatrix. /// /// \param A_in [in] The input matrix. @@ -402,7 +402,7 @@ class RILUK: } //! Get a rough estimate of cost per iteration - size_t getNodeSmootherComplexity() const; + size_t getNodeSmootherComplexity() const; @@ -599,7 +599,7 @@ class RILUK: /// may be computed using a crs_matrix_type that initialize() constructs /// temporarily. Teuchos::RCP A_local_; - lno_row_view_t A_local_rowmap_; + lno_row_view_t A_local_rowmap_; lno_nonzero_view_t A_local_entries_; scalar_nonzero_view_t A_local_values_; std::vector A_local_diagblks; diff --git a/packages/ifpack2/src/Ifpack2_RILUK_def.hpp b/packages/ifpack2/src/Ifpack2_RILUK_def.hpp index c42873035843..92770862324c 100644 --- a/packages/ifpack2/src/Ifpack2_RILUK_def.hpp +++ b/packages/ifpack2/src/Ifpack2_RILUK_def.hpp @@ -125,7 +125,7 @@ RILUK::RILUK (const Teuchos::RCP& Matrix_in) template -RILUK::~RILUK() +RILUK::~RILUK() { if (!isKokkosKernelsStream_) { if (Teuchos::nonnull (KernelHandle_)) { @@ -315,12 +315,12 @@ void RILUK::allocate_L_and_U () for (int i = 0; i < num_streams_; i++) { L_v_[i] = null; U_v_[i] = null; - + L_v_[i] = rcp (new crs_matrix_type (Graph_v_[i]->getL_Graph ())); U_v_[i] = rcp (new crs_matrix_type (Graph_v_[i]->getU_Graph ())); L_v_[i]->setAllToScalar (STS::zero ()); // Zero out L and U matrices U_v_[i]->setAllToScalar (STS::zero ()); - + L_v_[i]->fillComplete (); U_v_[i]->fillComplete (); } @@ -620,9 +620,9 @@ void RILUK::initialize () if (this->isKokkosKernelsSpiluk_) { if (!isKokkosKernelsStream_) { this->KernelHandle_ = Teuchos::rcp (new kk_handle_type ()); - KernelHandle_->create_spiluk_handle( KokkosSparse::Experimental::SPILUKAlgorithm::SEQLVLSCHD_TP1, + KernelHandle_->create_spiluk_handle( KokkosSparse::Experimental::SPILUKAlgorithm::SEQLVLSCHD_TP1, A_local_->getLocalNumRows(), - 2*A_local_->getLocalNumEntries()*(LevelOfFill_+1), + 2*A_local_->getLocalNumEntries()*(LevelOfFill_+1), 2*A_local_->getLocalNumEntries()*(LevelOfFill_+1) ); Graph_->initialize (KernelHandle_); // this calls spiluk_symbolic } @@ -630,9 +630,9 @@ void RILUK::initialize () KernelHandle_v_ = std::vector< Teuchos::RCP >(num_streams_); for (int i = 0; i < num_streams_; i++) { KernelHandle_v_[i] = Teuchos::rcp (new kk_handle_type ()); - KernelHandle_v_[i]->create_spiluk_handle( KokkosSparse::Experimental::SPILUKAlgorithm::SEQLVLSCHD_TP1, + KernelHandle_v_[i]->create_spiluk_handle( KokkosSparse::Experimental::SPILUKAlgorithm::SEQLVLSCHD_TP1, A_local_diagblks[i].numRows(), - 2*A_local_diagblks[i].nnz()*(LevelOfFill_+1), + 2*A_local_diagblks[i].nnz()*(LevelOfFill_+1), 2*A_local_diagblks[i].nnz()*(LevelOfFill_+1) ); Graph_v_[i]->initialize (KernelHandle_v_[i]); // this calls spiluk_symbolic } @@ -655,7 +655,7 @@ void RILUK::initialize () L_solver_->setMatrices (L_v_); } L_solver_->initialize (); - //NOTE (Nov-09-2022): + //NOTE (Nov-09-2022): //For Cuda >= 11.3 (using cusparseSpSV), skip trisolve computes here. //Instead, call trisolve computes within RILUK compute #if !defined(KOKKOSKERNELS_ENABLE_TPL_CUSPARSE) || !defined(KOKKOS_ENABLE_CUDA) || (CUDA_VERSION < 11030) @@ -925,7 +925,7 @@ void RILUK::compute () nonconst_local_inds_host_view_type InI_sub(InI.data()+NumL+1,MaxNumEntries-NumL-1); nonconst_values_host_view_type InV_sub(reinterpret_cast(InV.data())+NumL+1,MaxNumEntries-NumL-1); - + U_->getLocalRowCopy (local_row, InI_sub,InV_sub, NumU); NumIn = NumL+NumU+1; @@ -939,12 +939,12 @@ void RILUK::compute () for (size_t jj = 0; jj < NumL; ++jj) { local_ordinal_type j = InI[jj]; IST multiplier = InV[jj]; // current_mults++; - + InV[jj] *= static_cast(DV(j)); - + U_->getLocalRowView(j, UUI, UUV); // View of row above NumUU = UUI.size(); - + if (RelaxValue_ == STM::zero ()) { for (size_t k = 0; k < NumUU; ++k) { const int kk = colflag[UUI[k]]; @@ -1001,7 +1001,7 @@ void RILUK::compute () } if (NumU) { - // Replace current row of L and U + // Replace current row of L and U U_->replaceLocalValues (local_row, InI (NumL+1, NumU), InV (NumL+1, NumU)); } @@ -1087,7 +1087,7 @@ void RILUK::compute () for(int i = 0; i < num_streams_; i++) { L_v_[i]->resumeFill (); U_v_[i]->resumeFill (); - + if (L_v_[i]->isStaticGraph () || L_v_[i]->isLocallyIndexed ()) { L_v_[i]->setAllToScalar (STS::zero ()); // Zero out L and U matrices U_v_[i]->setAllToScalar (STS::zero ()); @@ -1108,8 +1108,8 @@ void RILUK::compute () auto U_entries = lclU.graph.entries; auto U_values = lclU.values; - KokkosSparse::Experimental::spiluk_numeric( KernelHandle_.getRawPtr(), LevelOfFill_, - A_local_rowmap_, A_local_entries_, A_local_values_, + KokkosSparse::Experimental::spiluk_numeric( KernelHandle_.getRawPtr(), LevelOfFill_, + A_local_rowmap_, A_local_entries_, A_local_values_, L_rowmap, L_entries, L_values, U_rowmap, U_entries, U_values ); L_->fillComplete (L_->getColMap (), A_local_->getRangeMap ()); @@ -1117,7 +1117,7 @@ void RILUK::compute () L_solver_->setMatrix (L_); U_solver_->setMatrix (U_); - } + } else { std::vector L_rowmap_v(num_streams_); std::vector L_entries_v(num_streams_); @@ -1131,7 +1131,7 @@ void RILUK::compute () L_rowmap_v[i] = lclL.graph.row_map; L_entries_v[i] = lclL.graph.entries; L_values_v[i] = lclL.values; - + auto lclU = U_v_[i]->getLocalMatrixDevice(); U_rowmap_v[i] = lclU.graph.row_map; U_entries_v[i] = lclU.graph.entries; @@ -1210,7 +1210,7 @@ apply (const Tpetra::MultiVectorapply (Y, Y, mode); // Solve U Y = Y. #endif } - else { // Solve U^P (D^P (L^P Y)) = X for Y (where P is * or T). + else { // Solve U^P (D^P (L^P Y)) = X for Y (where P is * or T). #if defined(KOKKOSKERNELS_ENABLE_TPL_CUSPARSE) && defined(KOKKOS_ENABLE_CUDA) && (CUDA_VERSION >= 11030) //NOTE (Nov-15-2022): //This is a workaround for Cuda >= 11.3 (using cusparseSpSV) @@ -1425,8 +1425,8 @@ std::string RILUK::description () const os << "Level-of-fill: " << getLevelOfFill() << ", "; if(isKokkosKernelsSpiluk_) os<<"KK-SPILUK, "; - if(isKokkosKernelsStream_) os<<"KK-Stream, "; - + if(isKokkosKernelsStream_) os<<"KK-Stream, "; + if (A_.is_null ()) { os << "Matrix: null"; } diff --git a/packages/ifpack2/test/belos/CMakeLists.txt b/packages/ifpack2/test/belos/CMakeLists.txt index c1bf68e37405..fc969c2b9dee 100644 --- a/packages/ifpack2/test/belos/CMakeLists.txt +++ b/packages/ifpack2/test/belos/CMakeLists.txt @@ -43,14 +43,14 @@ ENDIF() TRIBITS_COPY_FILES_TO_BINARY_DIR(Ifpack2BelosCopyFiles DEST_FILES test_database_schwarz.xml - test_ILUT_calore1_mm.xml - test_Jacobi_calore1_mm.xml - test_Jacobi_calore1_mm_constGraph.xml + test_ILUT_calore1_mm.xml + test_Jacobi_calore1_mm.xml + test_Jacobi_calore1_mm_constGraph.xml test_BlockRelaxationAmesos2_calore1_mm.xml test_BlockRelaxationZoltan2_calore1_mm.xml test_GS_calore1_mm.xml test_MTGS_calore1_mm.xml - test_RILUK_calore1_mm.xml + test_RILUK_calore1_mm.xml test_Cheby_calore1_mm.xml test_Cheby_calore1_nospectralradius_mm.xml test_FILU_calore1_mm.xml @@ -59,41 +59,42 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(Ifpack2BelosCopyFiles test_FIC_calore1_mm_sptrsv.xml test_FILDL_calore1_mm.xml test_FILDL_calore1_mm_sptrsv.xml - test_Jacobi_nos1_hb.xml - test_2_Jacobi_nos1_hb.xml - test_Jacobi_gcrodr_nos1_hb.xml + test_Jacobi_nos1_hb.xml + test_2_Jacobi_nos1_hb.xml + test_Jacobi_gcrodr_nos1_hb.xml nos1.rsa test_Jacobi_bcsstk14_hb.xml test_Jacobi_minres_bcsstk14_hb.xml test_Jacobi_pseudoblockcg_bcsstk14_hb.xml bcsstk14.hb - test_2_ILUT_nos1_hb.xml + test_2_ILUT_nos1_hb.xml test_2_RILUK_nos1_hb.xml + test_RBILUK_nos1_hb_block.xml test_2_RILUK_HTS_nos1_hb.xml test_2_RILUK_2streams_nos1_hb.xml test_2_RILUK_4streams_nos1_hb.xml test_2_RILUK_2streams_rcm_nos1_hb.xml test_2_RILUK_4streams_rcm_nos1_hb.xml - test_4_ILUT_nos1_hb.xml + test_4_ILUT_nos1_hb.xml test_4_RILUK_nos1_hb.xml test_4_RILUK_HTS_nos1_hb.xml test_4_RILUK_2streams_nos1_hb.xml test_4_RILUK_4streams_nos1_hb.xml test_4_RILUK_2streams_rcm_nos1_hb.xml test_4_RILUK_4streams_rcm_nos1_hb.xml - test_SGS_calore1_mm.xml + test_SGS_calore1_mm.xml test_MTSGS_calore1_mm.xml - calore1.mtx + calore1.mtx calore1_rhs.mtx test_pseudoblockcg_small_sym_mm.xml test_minres_small_sym_mm.xml - test_Jacobi_small_sym_mm.xml - small_sym.mtx + test_Jacobi_small_sym_mm.xml + small_sym.mtx test_gmres_small_sym_mm.xml test_Diagonal_tfqmr_calore1_mm.xml test_Diagonal_bicgstab_calore1_mm.xml test_Diagonal_gcrodr_calore1_mm.xml - test_GS_tfqmr_small_sym_mm.xml + test_GS_tfqmr_small_sym_mm.xml test_ILUT_tfqmr_small_sym_mm.xml test_tfqmr_small_sym_mm.xml test_FILU_tfqmr_small_sym_mm.xml @@ -106,9 +107,9 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(Ifpack2BelosCopyFiles test_FILDL_tfqmr_small_sym_mm_sptrsv.xml test_FILDL_tfqmr_small_sym_mm_schwarz.xml test_ILUT_tfqmr_calore1_mm.xml - 5w.mtx + 5w.mtx 5w.vec - 6w.mtx + 6w.mtx 6w.vec 5w_bel_tif_ILUT.xml 5w_bel_tif_FILU.xml @@ -122,13 +123,13 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(Ifpack2BelosCopyFiles 5w_bel_tif_FILDL.xml 5w_bel_tif_FILDL_sptrsv.xml 5w_bel_tif_FILDL_schwarz.xml - 5w_missing_diag.mtx + 5w_missing_diag.mtx 5w_missing_diag_ILUT.xml - 5w_bel_tif_RILUK_0.xml + 5w_bel_tif_RILUK_0.xml 5w_bel_tif_RILUK_1.xml test_RILUK_tfqmr_small_sym_mm.xml - test_bordered_DIAG_small.xml - test_minres_bordered_DIAG_small.xml + test_bordered_DIAG_small.xml + test_minres_bordered_DIAG_small.xml test_FILU_small_sym_sing.xml test_FILU_small_sym_sing_sptrsv.xml test_FIC_small_sym_sing.xml @@ -171,7 +172,7 @@ TRIBITS_ADD_TEST( NUM_MPI_PROCS 1 STANDARD_PASS_OUTPUT ) -ENDIF() +ENDIF() IF (Tpetra_ENABLE_quadmath) TRIBITS_ADD_TEST( @@ -299,10 +300,10 @@ TRIBITS_ADD_TEST( # NAME Jacobi_bcsstk14_hb_belos # ARGS "--xml_file=test_Jacobi_bcsstk14_hb.xml" # COMM serial mpi -# NUM_MPI_PROCS 1 +# NUM_MPI_PROCS 1 # STANDARD_PASS_OUTPUT #) - + TRIBITS_ADD_TEST( tif_belos NAME Jacobi_bcsstk14_minres_hb_belos @@ -348,6 +349,15 @@ TRIBITS_ADD_TEST( STANDARD_PASS_OUTPUT ) +TRIBITS_ADD_TEST( + tif_belos + NAME RBILUK_hb_belos_block_serial + ARGS "--xml_file=test_RBILUK_nos1_hb_block.xml" + COMM serial mpi + NUM_MPI_PROCS 1 + STANDARD_PASS_OUTPUT +) + TRIBITS_ADD_TEST( tif_belos NAME RILUK_hb_belos diff --git a/packages/ifpack2/test/belos/belos_solve.cpp b/packages/ifpack2/test/belos/belos_solve.cpp index d0a83bd50a22..214501328b49 100644 --- a/packages/ifpack2/test/belos/belos_solve.cpp +++ b/packages/ifpack2/test/belos/belos_solve.cpp @@ -53,6 +53,7 @@ #include "Tpetra_Core.hpp" #include "Tpetra_Map.hpp" +#include "Tpetra_BlockCrsMatrix_Helpers_decl.hpp" #include "build_problem.hpp" #include "build_solver.hpp" @@ -95,6 +96,7 @@ int main (int argc, char* argv[]) typedef Tpetra::MultiVector TMV; typedef Tpetra::Operator TOP; typedef Tpetra::CrsMatrix crs_matrix_type; + typedef Tpetra::BlockCrsMatrix block_crs_matrix_type; typedef Belos::LinearProblem BLinProb; typedef Belos::SolverManager BSolverMgr; using Teuchos::RCP; @@ -171,8 +173,27 @@ int main (int argc, char* argv[]) std::string prec_side("Left"); Ifpack2::getParameter (test_params, "Preconditioner Side", prec_side); if (tifpack_precond != "not specified") { - auto A = Teuchos::rcp_dynamic_cast(problem->getOperator()); - RCP precond = build_precond (test_params, A); + RCP precond; + if (tifpack_precond == "RBILUK") { + int blockSize = 0; + Teuchos::ParameterList& prec_params = test_params.sublist("Ifpack2"); + Ifpack2::getParameter (prec_params, "fact: block size", blockSize); + assert(blockSize >= 1); + auto A_crs = Teuchos::rcp_dynamic_cast(problem->getOperator()); + if (blockSize > 1) { + auto crs_matrix_block_filled = Tpetra::fillLogicalBlocks(*A_crs, blockSize); + auto A = Teuchos::rcp_const_cast(Tpetra::convertToBlockCrsMatrix(*crs_matrix_block_filled, blockSize)); + precond = build_precond (test_params, A); + } + else { + auto A = Teuchos::rcp_const_cast(Tpetra::convertToBlockCrsMatrix(*A_crs, blockSize)); + precond = build_precond (test_params, A); + } + } + else { + auto A = Teuchos::rcp_dynamic_cast(problem->getOperator()); + precond = build_precond (test_params, A); + } if (prec_side == "Left") problem->setLeftPrec (precond); else if (prec_side == "Right") diff --git a/packages/ifpack2/test/belos/build_precond.hpp b/packages/ifpack2/test/belos/build_precond.hpp index 2a09ca3f4f84..47a74a35b263 100644 --- a/packages/ifpack2/test/belos/build_precond.hpp +++ b/packages/ifpack2/test/belos/build_precond.hpp @@ -48,10 +48,10 @@ #include "Ifpack2_Factory.hpp" -template +template Teuchos::RCP > build_precond (Teuchos::ParameterList& test_params, - const Teuchos::RCP >& A) + const Teuchos::RCP& A) { using Teuchos::FancyOStream; using Teuchos::getFancyOStream; diff --git a/packages/ifpack2/test/belos/test_RBILUK_nos1_hb_block.xml b/packages/ifpack2/test/belos/test_RBILUK_nos1_hb_block.xml new file mode 100644 index 000000000000..ec07f94f0ccf --- /dev/null +++ b/packages/ifpack2/test/belos/test_RBILUK_nos1_hb_block.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/intrepid/CMakeLists.txt b/packages/intrepid/CMakeLists.txt index 14716537af7e..dc4c4315df95 100644 --- a/packages/intrepid/CMakeLists.txt +++ b/packages/intrepid/CMakeLists.txt @@ -10,6 +10,8 @@ TRIBITS_PACKAGE(Intrepid) # B) Set up package-specific options # +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() + IF(Amesos_ENABLE_UMFPACK) SET(${PACKAGE_NAME}_ENABLE_AMESOS_UMFPACK_DEFAULT ON) ELSE() diff --git a/packages/intrepid/cmake/Intrepid_config.h.in b/packages/intrepid/cmake/Intrepid_config.h.in index 913f0e2e0218..651dab993531 100644 --- a/packages/intrepid/cmake/Intrepid_config.h.in +++ b/packages/intrepid/cmake/Intrepid_config.h.in @@ -18,3 +18,6 @@ /* Define if want to build with sacado enabled */ #cmakedefine HAVE_INTREPID_SACADO + +#cmakedefine Intrepid_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/intrepid/src/Cell/Intrepid_CellTools.hpp b/packages/intrepid/src/Cell/Intrepid_CellTools.hpp index da6305109e9b..30eb6ac7c86c 100644 --- a/packages/intrepid/src/Cell/Intrepid_CellTools.hpp +++ b/packages/intrepid/src/Cell/Intrepid_CellTools.hpp @@ -1776,3 +1776,10 @@ Therefore, a subcell workset is defined by */ #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Cell/Intrepid_CellToolsDef.hpp b/packages/intrepid/src/Cell/Intrepid_CellToolsDef.hpp index 1c5c0fbb3204..146f3adc9d5c 100644 --- a/packages/intrepid/src/Cell/Intrepid_CellToolsDef.hpp +++ b/packages/intrepid/src/Cell/Intrepid_CellToolsDef.hpp @@ -3498,3 +3498,10 @@ void CellTools::printWorksetSubcell(const ArrayCell & cellWo } // get Barycenter } // namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_Basis.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_Basis.hpp index 2f53de20b34e..8d9fada6a745 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_Basis.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_Basis.hpp @@ -481,3 +481,10 @@ class DofCoordsInterface { \endverbatim */ #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_BasisDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_BasisDef.hpp index 99357edb82e4..3d4361de4d8d 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_BasisDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_BasisDef.hpp @@ -401,3 +401,10 @@ void getValues_HDIV_Args(ArrayScalar & outputValues, // is included in the definition file. template DofCoordsInterface::~DofCoordsInterface() {} + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_I1_FEM.hpp index 51482f514c3f..cad273dac0fb 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_I1_FEM.hpp @@ -161,3 +161,10 @@ class Basis_HCURL_HEX_I1_FEM : public Basis, public DofCoor #include "Intrepid_HCURL_HEX_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_I1_FEMDef.hpp index bb9bdd1a1c55..9e134ea051c0 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_I1_FEMDef.hpp @@ -327,3 +327,10 @@ void Basis_HCURL_HEX_I1_FEM::getDofCoords(ArrayScalar & Dof } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_In_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_In_FEM.hpp index 50283690fe46..2d9bad8f1518 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_In_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_In_FEM.hpp @@ -131,3 +131,10 @@ class Basis_HCURL_HEX_In_FEM : #include "Intrepid_HCURL_HEX_In_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_In_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_In_FEMDef.hpp index 502c2ebf54b3..e5e0227974d0 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_In_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_HEX_In_FEMDef.hpp @@ -530,3 +530,10 @@ namespace Intrepid { } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEM.hpp index 45fd8e369f96..2cd317e6b29e 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEM.hpp @@ -145,3 +145,10 @@ class Basis_HCURL_QUAD_I1_FEM : public Basis, public DofCoo #include "Intrepid_HCURL_QUAD_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEMDef.hpp index 86209811661f..5756aa761f04 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEMDef.hpp @@ -227,3 +227,10 @@ void Basis_HCURL_QUAD_I1_FEM::getDofCoords(ArrayScalar & Do } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_In_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_In_FEM.hpp index 3f9cc21f2a66..0339d34e2e3d 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_In_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_In_FEM.hpp @@ -138,3 +138,10 @@ class Basis_HCURL_QUAD_In_FEM : #include "Intrepid_HCURL_QUAD_In_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_In_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_In_FEMDef.hpp index 28c04d168f91..2377e1dda21a 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_In_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_QUAD_In_FEMDef.hpp @@ -418,3 +418,10 @@ namespace Intrepid { }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_I1_FEM.hpp index 4d74fe02844c..19f10c7161b5 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_I1_FEM.hpp @@ -149,3 +149,10 @@ class Basis_HCURL_TET_I1_FEM : public Basis, public DofCoor #include "Intrepid_HCURL_TET_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_I1_FEMDef.hpp index 3df8cdfa2107..cc12135fe17e 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_I1_FEMDef.hpp @@ -267,3 +267,10 @@ void Basis_HCURL_TET_I1_FEM::getDofCoords(ArrayScalar & Dof } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_In_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_In_FEM.hpp index bc2116871ff1..a2975d338fe2 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_In_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_In_FEM.hpp @@ -140,3 +140,10 @@ class Basis_HCURL_TET_In_FEM: public Basis { #include "Intrepid_HCURL_TET_In_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_In_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_In_FEMDef.hpp index a5128ec8ec0d..76a25ece957f 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_In_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TET_In_FEMDef.hpp @@ -520,3 +520,10 @@ namespace Intrepid { }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_I1_FEM.hpp index 24b2bb44835c..02353c47e5a8 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_I1_FEM.hpp @@ -143,3 +143,10 @@ class Basis_HCURL_TRI_I1_FEM : public Basis, public DofCoor #include "Intrepid_HCURL_TRI_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_I1_FEMDef.hpp index 213bb603fb52..0ed37baff8b5 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_I1_FEMDef.hpp @@ -224,3 +224,10 @@ void Basis_HCURL_TRI_I1_FEM::getDofCoords(ArrayScalar & Dof }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_In_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_In_FEM.hpp index cd076f621691..a624f4de122b 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_In_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_In_FEM.hpp @@ -127,3 +127,10 @@ class Basis_HCURL_TRI_In_FEM: public Basis { #include "Intrepid_HCURL_TRI_In_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_In_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_In_FEMDef.hpp index a3f439de4a05..1b9fefcf514e 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_In_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_TRI_In_FEMDef.hpp @@ -365,3 +365,10 @@ namespace Intrepid { }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEM.hpp index 8f41c9173085..2b71cb5b3f5b 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEM.hpp @@ -147,3 +147,10 @@ class Basis_HCURL_WEDGE_I1_FEM : public Basis { #include "Intrepid_HCURL_WEDGE_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEMDef.hpp index bb1fe8a23b71..ddd52b83259a 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEMDef.hpp @@ -273,3 +273,10 @@ void Basis_HCURL_WEDGE_I1_FEM::getValues(ArrayScalar& } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_I1_FEM.hpp index a3cfbec30c4e..f151df49e2ca 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_I1_FEM.hpp @@ -152,3 +152,10 @@ class Basis_HDIV_HEX_I1_FEM : public Basis , #include "Intrepid_HDIV_HEX_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_I1_FEMDef.hpp index 13546b6bb47e..03ab0aaa4ea9 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_I1_FEMDef.hpp @@ -247,3 +247,10 @@ void Basis_HDIV_HEX_I1_FEM::getDofCoords(ArrayScalar & DofC } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_In_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_In_FEM.hpp index bc73db145523..9e21d9c986f8 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_In_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_In_FEM.hpp @@ -131,3 +131,10 @@ class Basis_HDIV_HEX_In_FEM : #include "Intrepid_HDIV_HEX_In_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_In_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_In_FEMDef.hpp index 7ee41d8d3540..dd93a0d7c58f 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_In_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_HEX_In_FEMDef.hpp @@ -534,3 +534,10 @@ namespace Intrepid { } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEM.hpp index c831e2dd8ba1..8df6795558b6 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEM.hpp @@ -141,3 +141,10 @@ class Basis_HDIV_QUAD_I1_FEM : public Basis { #include "Intrepid_HDIV_QUAD_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEMDef.hpp index 64f46cacdac1..b0d303ed2e5d 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEMDef.hpp @@ -207,3 +207,10 @@ void Basis_HDIV_QUAD_I1_FEM::getValues(ArrayScalar& } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_In_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_In_FEM.hpp index 64e4bbd6ebfd..b3890ed348fb 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_In_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_In_FEM.hpp @@ -139,3 +139,10 @@ class Basis_HDIV_QUAD_In_FEM : #include "Intrepid_HDIV_QUAD_In_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_In_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_In_FEMDef.hpp index 425d89152a26..ccf928683adc 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_In_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_QUAD_In_FEMDef.hpp @@ -408,3 +408,10 @@ namespace Intrepid { }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_I1_FEM.hpp index bc7b2ecd98f1..325797bfda65 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_I1_FEM.hpp @@ -148,3 +148,10 @@ class Basis_HDIV_TET_I1_FEM : public Basis, public DofCoord #include "Intrepid_HDIV_TET_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_I1_FEMDef.hpp index 07f5431148e2..de1258d678e7 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_I1_FEMDef.hpp @@ -233,3 +233,10 @@ void Basis_HDIV_TET_I1_FEM::getDofCoords(ArrayScalar & DofC } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_In_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_In_FEM.hpp index 6a7828d24723..0e8dabaccfb4 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_In_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_In_FEM.hpp @@ -138,3 +138,10 @@ class Basis_HDIV_TET_In_FEM: public Basis { #include "Intrepid_HDIV_TET_In_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_In_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_In_FEMDef.hpp index 36f1b4048d10..879d0ee54079 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_In_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TET_In_FEMDef.hpp @@ -358,3 +358,10 @@ namespace Intrepid { }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_I1_FEM.hpp index 02cb9db180c5..d12f87b484ce 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_I1_FEM.hpp @@ -139,3 +139,10 @@ class Basis_HDIV_TRI_I1_FEM : public Basis { #include "Intrepid_HDIV_TRI_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_I1_FEMDef.hpp index 809a959e30df..556481e8a6fa 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_I1_FEMDef.hpp @@ -207,3 +207,10 @@ void Basis_HDIV_TRI_I1_FEM::getValues(ArrayScalar& } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_In_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_In_FEM.hpp index ad56030187a0..9e91ab6b680c 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_In_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_In_FEM.hpp @@ -138,3 +138,10 @@ class Basis_HDIV_TRI_In_FEM: public Basis { #include "Intrepid_HDIV_TRI_In_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_In_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_In_FEMDef.hpp index c638a56e825d..4c5ee2a7f11f 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_In_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_TRI_In_FEMDef.hpp @@ -362,3 +362,10 @@ namespace Intrepid { }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEM.hpp index b5859e8659f5..a9bc920e5862 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEM.hpp @@ -141,3 +141,10 @@ class Basis_HDIV_WEDGE_I1_FEM : public Basis { #include "Intrepid_HDIV_WEDGE_I1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEMDef.hpp index 1e219063a318..155a077dd95f 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEMDef.hpp @@ -219,3 +219,10 @@ void Basis_HDIV_WEDGE_I1_FEM::getValues(ArrayScalar& } }// namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEM.hpp index c954d6485c33..d8f426d27900 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEM.hpp @@ -137,3 +137,10 @@ class Basis_HGRAD_HEX_C1_FEM : public Basis, public DofCoor #include "Intrepid_HGRAD_HEX_C1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEMDef.hpp index 6c46fd78d556..f744b3749e1e 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEMDef.hpp @@ -324,3 +324,10 @@ void Basis_HGRAD_HEX_C1_FEM::getDofCoords(ArrayScalar & Dof #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEM.hpp index ca2d96b99ce6..511a091c2b55 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEM.hpp @@ -184,3 +184,10 @@ class Basis_HGRAD_HEX_C2_FEM : public Basis, public DofCoor #include "Intrepid_HGRAD_HEX_C2_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEMDef.hpp index 20b055a70af9..234bec812a0f 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEMDef.hpp @@ -1107,3 +1107,10 @@ void Basis_HGRAD_HEX_C2_FEM::getDofCoords(ArrayScalar & Dof }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEM.hpp index 9c58a64f5117..84ec4c025f40 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEM.hpp @@ -130,3 +130,10 @@ class Basis_HGRAD_HEX_Cn_FEM : #include "Intrepid_HGRAD_HEX_Cn_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEMDef.hpp index a9b8cb6c550a..39740fdc3434 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEMDef.hpp @@ -430,3 +430,10 @@ void Basis_HGRAD_HEX_Cn_FEM::getValues(ArrayScalar& }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_I2_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_I2_FEM.hpp index 337223cc1749..6e794f63190b 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_I2_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_I2_FEM.hpp @@ -169,3 +169,10 @@ class Basis_HGRAD_HEX_I2_FEM : public Basis, public DofCoor #include "Intrepid_HGRAD_HEX_I2_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_I2_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_I2_FEMDef.hpp index c7d4d6525438..be3ac6ba30af 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_I2_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_HEX_I2_FEMDef.hpp @@ -787,3 +787,10 @@ void Basis_HGRAD_HEX_I2_FEM::getDofCoords(ArrayScalar & Dof }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEM.hpp index eede27d8359d..2f908f9d4737 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEM.hpp @@ -119,3 +119,10 @@ class Basis_HGRAD_LINE_C1_FEM: public Basis { #include "Intrepid_HGRAD_LINE_C1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEMDef.hpp index fccbf45a5ff6..a3456363cb05 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEMDef.hpp @@ -179,3 +179,10 @@ void Basis_HGRAD_LINE_C1_FEM::getValues(ArrayScalar& }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM.hpp index 3376cfe1a82b..2473aa2552ac 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM.hpp @@ -143,3 +143,10 @@ class Basis_HGRAD_LINE_Cn_FEM: #include "Intrepid_HGRAD_LINE_Cn_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEMDef.hpp index 50475df155c1..26db0b5db2ed 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEMDef.hpp @@ -347,3 +347,10 @@ namespace Intrepid { }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBI.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBI.hpp index 5068e2818475..4b4e46cfcd38 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBI.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBI.hpp @@ -180,3 +180,10 @@ class Basis_HGRAD_LINE_Cn_FEM_JACOBI: public Basis { #include "Intrepid_HGRAD_LINE_Cn_FEM_JACOBIDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBIDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBIDef.hpp index ad7217eeb0a8..aa966e2b0438 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBIDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBIDef.hpp @@ -235,3 +235,10 @@ void Basis_HGRAD_LINE_Cn_FEM_JACOBI::initializeTags() { }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Hermite_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Hermite_FEM.hpp index 4163fc0ab34e..b3ae9dbdb835 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Hermite_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Hermite_FEM.hpp @@ -181,3 +181,10 @@ class Basis_HGRAD_LINE_Hermite_FEM: public Basis { #include "Intrepid_HGRAD_LINE_Hermite_FEMDef.hpp" #endif // INTREPID_HGRAD_LINE_HERMITE_FEM_HPP + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Hermite_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Hermite_FEMDef.hpp index e0ccb4a28b1d..ff5970143663 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Hermite_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_LINE_Hermite_FEMDef.hpp @@ -564,3 +564,10 @@ void Basis_HGRAD_LINE_Hermite_FEM::getDofCoords( ArrayScalar }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_POLY_C1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_POLY_C1_FEM.hpp index 644cf622ce34..9a6f10034adb 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_POLY_C1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_POLY_C1_FEM.hpp @@ -107,3 +107,10 @@ namespace Intrepid{ #include "Intrepid_HGRAD_POLY_C1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_POLY_C1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_POLY_C1_FEMDef.hpp index 74ce16903219..9efbcb01a2cf 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_POLY_C1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_POLY_C1_FEMDef.hpp @@ -211,3 +211,10 @@ namespace Intrepid{ } // namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_C1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_C1_FEM.hpp index bd7335d155c5..7423472d370f 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_C1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_C1_FEM.hpp @@ -123,3 +123,10 @@ class Basis_HGRAD_PYR_C1_FEM : public Basis { #include "Intrepid_HGRAD_PYR_C1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_C1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_C1_FEMDef.hpp index e7a5e06f62fb..5235de54ce78 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_C1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_C1_FEMDef.hpp @@ -291,3 +291,10 @@ void Basis_HGRAD_PYR_C1_FEM::getValues(ArrayScalar& } }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_I2_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_I2_FEM.hpp index 3a782f6c765f..9d29c0febd14 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_I2_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_I2_FEM.hpp @@ -143,3 +143,10 @@ class Basis_HGRAD_PYR_I2_FEM : public Basis { #include "Intrepid_HGRAD_PYR_I2_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_I2_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_I2_FEMDef.hpp index 180547674180..e2760a0fca05 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_I2_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_PYR_I2_FEMDef.hpp @@ -547,3 +547,10 @@ void Basis_HGRAD_PYR_I2_FEM::getValues(ArrayScalar& o } }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEM.hpp index 63cd6354ea88..dfaa289488ba 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEM.hpp @@ -128,3 +128,10 @@ class Basis_HGRAD_QUAD_C1_FEM : public Basis, public DofCoo #include "Intrepid_HGRAD_QUAD_C1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEMDef.hpp index 2a4cd470833d..8458ea65556a 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEMDef.hpp @@ -257,3 +257,10 @@ void Basis_HGRAD_QUAD_C1_FEM::getDofCoords(ArrayScalar & Do }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEM.hpp index 8b497c580514..12b2dd16fb6f 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEM.hpp @@ -138,3 +138,10 @@ class Basis_HGRAD_QUAD_C2_FEM : public Basis, public DofCoo #include "Intrepid_HGRAD_QUAD_C2_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEMDef.hpp index e577c115db39..a8acf3b60914 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEMDef.hpp @@ -444,3 +444,10 @@ void Basis_HGRAD_QUAD_C2_FEM::getDofCoords(ArrayScalar & Do }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEM.hpp index fa349f1ca1a3..20677a824c60 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEM.hpp @@ -117,3 +117,10 @@ class Basis_HGRAD_QUAD_Cn_FEM : #include "Intrepid_HGRAD_QUAD_Cn_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEMDef.hpp index 2e9db5bb7662..49a6c7e54cfc 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEMDef.hpp @@ -392,3 +392,10 @@ namespace Intrepid { }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C1_FEM.hpp index d34ab3dc3b24..7ab5a7bd3806 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C1_FEM.hpp @@ -128,3 +128,10 @@ class Basis_HGRAD_TET_C1_FEM : public Basis, public DofCoor #include "Intrepid_HGRAD_TET_C1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C1_FEMDef.hpp index dee6550928e1..721a72b0ad3b 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C1_FEMDef.hpp @@ -224,3 +224,10 @@ void Basis_HGRAD_TET_C1_FEM::getDofCoords(ArrayScalar & Dof }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C2_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C2_FEM.hpp index 22c6ccfeef84..a57c1b91e730 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C2_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C2_FEM.hpp @@ -146,3 +146,10 @@ class Basis_HGRAD_TET_C2_FEM : public Basis, public DofCoor #include "Intrepid_HGRAD_TET_C2_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C2_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C2_FEMDef.hpp index 4e6aa709464f..a22402dc6983 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C2_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_C2_FEMDef.hpp @@ -349,3 +349,10 @@ void Basis_HGRAD_TET_C2_FEM::getDofCoords(ArrayScalar & Dof }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEM.hpp index ce77837c5291..f091e3635cb3 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEM.hpp @@ -185,3 +185,10 @@ class Basis_HGRAD_TET_COMP12_FEM : public Basis, public Dof #include "Intrepid_HGRAD_TET_COMP12_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEMDef.hpp index d3085062c7ff..02245cecc5af 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEMDef.hpp @@ -681,3 +681,10 @@ Basis_HGRAD_TET_COMP12_FEM::getSubTetDetF() const }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM.hpp index cb52673d2cb9..590debd78b5f 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM.hpp @@ -140,3 +140,10 @@ class Basis_HGRAD_TET_Cn_FEM: public Basis { #include "Intrepid_HGRAD_TET_Cn_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEMDef.hpp index 0345b0f8f991..7605ba16e6ae 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEMDef.hpp @@ -343,3 +343,10 @@ namespace Intrepid { }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTH.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTH.hpp index 74cd7692b824..429f58cdbe19 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTH.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTH.hpp @@ -233,3 +233,10 @@ class TabulatorTet #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTHDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTHDef.hpp index 6eee58f9f1ad..0081b3bd97d5 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTHDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTHDef.hpp @@ -301,3 +301,10 @@ namespace Intrepid { #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEM.hpp index 0a220632c3a4..d7f6057bb732 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEM.hpp @@ -129,3 +129,10 @@ class Basis_HGRAD_TRI_C1_FEM: public Basis, public DofCoord #include "Intrepid_HGRAD_TRI_C1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEMDef.hpp index dfb660b9f7ee..f9c954b307c7 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEMDef.hpp @@ -222,3 +222,10 @@ void Basis_HGRAD_TRI_C1_FEM::getDofCoords(ArrayScalar & Dof }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEM.hpp index 2fa11a5a0558..e04b8bee3949 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEM.hpp @@ -135,3 +135,10 @@ class Basis_HGRAD_TRI_C2_FEM: public Basis, public DofCoord #include "Intrepid_HGRAD_TRI_C2_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEMDef.hpp index 8f074d4b6bb2..660072a70635 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEMDef.hpp @@ -283,3 +283,10 @@ void Basis_HGRAD_TRI_C2_FEM::getDofCoords(ArrayScalar & Dof }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM.hpp index 2d4829e4c0fa..49e54a374893 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM.hpp @@ -136,3 +136,10 @@ class Basis_HGRAD_TRI_Cn_FEM: public Basis { #include "Intrepid_HGRAD_TRI_Cn_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEMDef.hpp index a49fde5ffceb..d8822dd13a98 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEMDef.hpp @@ -294,3 +294,10 @@ namespace Intrepid { }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTH.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTH.hpp index 7e72fe5f0f57..4ddc3f15967d 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTH.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTH.hpp @@ -235,3 +235,10 @@ class TabulatorTri #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTHDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTHDef.hpp index 28549d60de46..436069007314 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTHDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTHDef.hpp @@ -315,3 +315,10 @@ void TabulatorTri::tabulate( ArrayScalar &outputV }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEM.hpp index 6f0d07e2eccc..021a8e24e686 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEM.hpp @@ -123,3 +123,10 @@ class Basis_HGRAD_WEDGE_C1_FEM : public Basis { #include "Intrepid_HGRAD_WEDGE_C1_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEMDef.hpp index 091dd33ae449..71b3f29df3bf 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEMDef.hpp @@ -242,3 +242,10 @@ void Basis_HGRAD_WEDGE_C1_FEM::getValues(ArrayScalar& } }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEM.hpp index 1401b9fc60ed..5a6f02c12dda 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEM.hpp @@ -157,3 +157,10 @@ class Basis_HGRAD_WEDGE_C2_FEM : public Basis { #include "Intrepid_HGRAD_WEDGE_C2_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEMDef.hpp index b541bee67a5b..7df9093c01a1 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEMDef.hpp @@ -697,3 +697,10 @@ void Basis_HGRAD_WEDGE_C2_FEM::getValues(ArrayScalar& } }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_I2_FEM.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_I2_FEM.hpp index 762916a31f1f..ac904557af60 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_I2_FEM.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_I2_FEM.hpp @@ -148,3 +148,10 @@ class Basis_HGRAD_WEDGE_I2_FEM : public Basis { #include "Intrepid_HGRAD_WEDGE_I2_FEMDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_I2_FEMDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_I2_FEMDef.hpp index 09f4761eab11..9f5eb8d43c25 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_I2_FEMDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_HGRAD_WEDGE_I2_FEMDef.hpp @@ -564,3 +564,10 @@ void Basis_HGRAD_WEDGE_I2_FEM::getValues(ArrayScalar& } }// namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_OrthogonalBases.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_OrthogonalBases.hpp index f46f9c5f1f1a..5345568bb2e1 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_OrthogonalBases.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_OrthogonalBases.hpp @@ -154,3 +154,10 @@ namespace Intrepid { + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_OrthogonalBasesDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_OrthogonalBasesDef.hpp index 31c9b1f2c4f5..98752f04d73a 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_OrthogonalBasesDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_OrthogonalBasesDef.hpp @@ -241,3 +241,10 @@ namespace Intrepid { } } // namespace Intrepid; + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_ProductTopology.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_ProductTopology.hpp index f431ed91bafc..5225f6fd2358 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_ProductTopology.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_ProductTopology.hpp @@ -372,3 +372,10 @@ namespace Intrepid { } #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_ProductTopologyDef.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_ProductTopologyDef.hpp index a77a84affe4f..ea2593592d32 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_ProductTopologyDef.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_ProductTopologyDef.hpp @@ -273,3 +273,10 @@ namespace Intrepid } } } + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Basis/Intrepid_TensorBasis.hpp b/packages/intrepid/src/Discretization/Basis/Intrepid_TensorBasis.hpp index 2bff6b5d62cd..a33c6cc4f333 100644 --- a/packages/intrepid/src/Discretization/Basis/Intrepid_TensorBasis.hpp +++ b/packages/intrepid/src/Discretization/Basis/Intrepid_TensorBasis.hpp @@ -97,3 +97,10 @@ class TensorBasis: public Basis } #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceTools.hpp b/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceTools.hpp index d79fa233b117..7780b1d11e8b 100644 --- a/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceTools.hpp +++ b/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceTools.hpp @@ -1405,4 +1405,11 @@ where + + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif diff --git a/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsDef.hpp b/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsDef.hpp index 5789224b4208..1df59963e178 100644 --- a/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsDef.hpp +++ b/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsDef.hpp @@ -1819,3 +1819,10 @@ void FunctionSpaceTools::evaluate(ArrayOutPointVals & outPointVals, } // evaluate } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsInPlace.hpp b/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsInPlace.hpp index ac55c283e34a..e248ddc61a9f 100644 --- a/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsInPlace.hpp +++ b/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsInPlace.hpp @@ -437,4 +437,11 @@ class FunctionSpaceToolsInPlace { + + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif diff --git a/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsInPlaceDef.hpp b/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsInPlaceDef.hpp index fc6026c1aed8..c83da9fa95fc 100644 --- a/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsInPlaceDef.hpp +++ b/packages/intrepid/src/Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsInPlaceDef.hpp @@ -394,3 +394,10 @@ namespace Intrepid { } } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGrid.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGrid.hpp index 974f8e806d78..e8184d6f53a5 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGrid.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGrid.hpp @@ -187,3 +187,10 @@ class AdaptiveSparseGrid { #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridDef.hpp index 8cf8ba207dea..34c676b78bcf 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridDef.hpp @@ -440,3 +440,10 @@ void AdaptiveSparseGrid::buildSparseGrid( } } // end Intrepid namespace + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridInterface.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridInterface.hpp index 9527a8975a2d..bee6e03bcb0d 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridInterface.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridInterface.hpp @@ -172,3 +172,10 @@ class AdaptiveSparseGridInterface { #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridInterfaceDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridInterfaceDef.hpp index 412a52e256a4..683207f30306 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridInterfaceDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_AdaptiveSparseGridInterfaceDef.hpp @@ -156,3 +156,10 @@ Scalar AdaptiveSparseGridInterface::getInitialDiff() { + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_Cubature.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_Cubature.hpp index 0afc323b43a5..184cac71ae30 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_Cubature.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_Cubature.hpp @@ -123,3 +123,10 @@ class Cubature { }// end namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureCompositeTet.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureCompositeTet.hpp index 2a640880de23..f0087b61093c 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureCompositeTet.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureCompositeTet.hpp @@ -122,3 +122,10 @@ inline const CubatureTemplate (& CubatureCompositeTet #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureCompositeTetDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureCompositeTetDef.hpp index 49187e2e7b69..1e78c40ab359 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureCompositeTetDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureCompositeTetDef.hpp @@ -141,3 +141,10 @@ const CubatureTemplate CubatureCompositeTet::cuba }; } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolume.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolume.hpp index 8861252561ae..b73c8e28718e 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolume.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolume.hpp @@ -140,3 +140,10 @@ namespace Intrepid{ #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeBoundary.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeBoundary.hpp index 59bf786e5d40..5003b76fadb8 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeBoundary.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeBoundary.hpp @@ -147,3 +147,10 @@ namespace Intrepid{ #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeBoundaryDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeBoundaryDef.hpp index 2a34d3b4bc24..8ba16a6d8a4a 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeBoundaryDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeBoundaryDef.hpp @@ -229,3 +229,10 @@ void CubatureControlVolumeBoundary::getAccuracy(s #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeDef.hpp index 012b3e2fc4bb..0a90aa51a706 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeDef.hpp @@ -165,3 +165,10 @@ void CubatureControlVolume::getAccuracy(std::vect #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeSide.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeSide.hpp index df8b9c8035d8..8a4e0c9b786f 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeSide.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeSide.hpp @@ -136,3 +136,10 @@ namespace Intrepid{ #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeSideDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeSideDef.hpp index 294acc17269b..716022a57ff3 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeSideDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureControlVolumeSideDef.hpp @@ -278,3 +278,10 @@ void CubatureControlVolumeSide::getAccuracy(std:: #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirect.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirect.hpp index fa0390ae46e7..cfad1e66c6b9 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirect.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirect.hpp @@ -159,3 +159,10 @@ class CubatureDirect : public Intrepid::Cubature #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectDef.hpp index 29ac196587bb..aeac2b1c0589 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectDef.hpp @@ -107,3 +107,10 @@ void CubatureDirect::getAccuracy(std::vector } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGauss.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGauss.hpp index 9d5f4421572e..d84179a4ff62 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGauss.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGauss.hpp @@ -128,3 +128,10 @@ inline const CubatureTemplate (& CubatureDirectLineGauss #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussDef.hpp index 0f387e9df7e4..a48a3013e5f7 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussDef.hpp @@ -2438,3 +2438,10 @@ const CubatureTemplate CubatureDirectLineGauss::c }; } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussJacobi20.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussJacobi20.hpp index 3540e35262c1..528a54a75840 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussJacobi20.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussJacobi20.hpp @@ -128,3 +128,10 @@ inline const CubatureTemplate (& CubatureDirectLineGaussJacobi20 #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussJacobi20Def.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussJacobi20Def.hpp index 2aefd46b46cd..60c40d7d610a 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussJacobi20Def.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectLineGaussJacobi20Def.hpp @@ -228,3 +228,10 @@ const CubatureTemplate CubatureDirectLineGaussJacobi20 #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTetDefaultDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTetDefaultDef.hpp index f32cd0d8c343..04f846ba97f3 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTetDefaultDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTetDefaultDef.hpp @@ -10196,3 +10196,10 @@ const CubatureTemplate CubatureDirectTetDefault:: }; } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTriDefault.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTriDefault.hpp index 1b4b3159fb5e..0fc296ff0ba9 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTriDefault.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTriDefault.hpp @@ -125,3 +125,10 @@ inline const CubatureTemplate (& CubatureDirectTriDefault #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTriDefaultDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTriDefaultDef.hpp index d43170ed3b77..f398ba8f9943 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTriDefaultDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureDirectTriDefaultDef.hpp @@ -1432,3 +1432,10 @@ const CubatureTemplate CubatureDirectTriDefault:: }; } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureGenSparse.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureGenSparse.hpp index 11873413a109..4a312eeb82cb 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureGenSparse.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureGenSparse.hpp @@ -136,3 +136,10 @@ inline Scalar Sum(Scalar* list, int first, int last) #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureGenSparseDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureGenSparseDef.hpp index c17f97602060..996f9b7f043c 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureGenSparseDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureGenSparseDef.hpp @@ -254,3 +254,10 @@ void CubatureGenSparse::getAccuracy(st } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureLineSorted.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureLineSorted.hpp index 2141595e0f30..a06771a3e475 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureLineSorted.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureLineSorted.hpp @@ -206,3 +206,10 @@ int growthRule1D(int index, EIntrepidGrowth growth, EIntrepidBurkardt rule); #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureLineSortedDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureLineSortedDef.hpp index 549bfbf32479..15fbeed79514 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureLineSortedDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureLineSortedDef.hpp @@ -767,3 +767,10 @@ int growthRule1D(int index, EIntrepidGrowth growth, EIntrepidBurkardt rule) { } // end growthRule1D } // Intrepid namespace + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolygon.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolygon.hpp index 0b768f8d0e75..8f71dd48f110 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolygon.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolygon.hpp @@ -148,3 +148,10 @@ namespace Intrepid{ #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolygonDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolygonDef.hpp index 2a3bb835aed1..e8da69bb5a9a 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolygonDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolygonDef.hpp @@ -184,3 +184,10 @@ void CubaturePolygon::getAccuracy(std::vector #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolylibDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolylibDef.hpp index 109f9bc0a5a5..991c5c96a967 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolylibDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubaturePolylibDef.hpp @@ -168,3 +168,10 @@ void CubaturePolylib::getCubature(ArrayPoint & cu } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparse.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparse.hpp index fe9b74465ab3..b586831e742a 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparse.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparse.hpp @@ -215,3 +215,10 @@ inline int calculateNumPoints(int dim, int level) #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparseDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparseDef.hpp index f3b9952050db..6c0830c31ec3 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparseDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparseDef.hpp @@ -237,3 +237,10 @@ void iterateThroughDimensions(int level, } } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparseHelper.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparseHelper.hpp index d7000ed932a2..c78de1c84bde 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparseHelper.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureSparseHelper.hpp @@ -260,3 +260,10 @@ void SGNodes::copyToTeuchos(Teuchos::Array< Scalar* > & cubPoints, Teu } #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensor.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensor.hpp index 1ab4cdb60403..2f230208d1ce 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensor.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensor.hpp @@ -156,3 +156,10 @@ class CubatureTensor : public Intrepid::Cubature #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorDef.hpp index 3ca2b58a6f12..fc9dac16d499 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorDef.hpp @@ -228,3 +228,10 @@ void CubatureTensor::getAccuracy(std::vector } // end getAccuracy } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorPyr.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorPyr.hpp index f93c24e1b96c..b23b41e6aca0 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorPyr.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorPyr.hpp @@ -139,3 +139,10 @@ class CubatureTensorPyr : public Intrepid::CubatureTensor #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorPyrDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorPyrDef.hpp index 6b0104e3e339..35832ec77403 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorPyrDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorPyrDef.hpp @@ -116,3 +116,10 @@ void CubatureTensorPyr::getAccuracy(std::vector kron_prod(CubatureTensorSorted & rule1, #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorSortedDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorSortedDef.hpp index 579f30e7f029..71081ed3b8f8 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorSortedDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_CubatureTensorSortedDef.hpp @@ -420,3 +420,10 @@ CubatureTensorSorted kron_prod(CubatureTensorSorted & rule1, } } } // end Intrepid namespace + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_DefaultCubatureFactory.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_DefaultCubatureFactory.hpp index 0586a1146166..915e18a06692 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_DefaultCubatureFactory.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_DefaultCubatureFactory.hpp @@ -129,3 +129,10 @@ class DefaultCubatureFactory { #include "Intrepid_DefaultCubatureFactoryDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Discretization/Integration/Intrepid_DefaultCubatureFactoryDef.hpp b/packages/intrepid/src/Discretization/Integration/Intrepid_DefaultCubatureFactoryDef.hpp index 408df4f52c9f..008679a2e19a 100644 --- a/packages/intrepid/src/Discretization/Integration/Intrepid_DefaultCubatureFactoryDef.hpp +++ b/packages/intrepid/src/Discretization/Integration/Intrepid_DefaultCubatureFactoryDef.hpp @@ -170,3 +170,10 @@ Teuchos::RCP > DefaultCubatureFactory #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefCloneScale.hpp b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefCloneScale.hpp index c1730767392e..a9a5b2300e12 100644 --- a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefCloneScale.hpp +++ b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefCloneScale.hpp @@ -303,3 +303,10 @@ void ArrayTools::scaleFields(ArrayInOutFields & inoutFields, } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefContractions.hpp b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefContractions.hpp index ad54605a2fc3..2cc2e81269c6 100644 --- a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefContractions.hpp +++ b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefContractions.hpp @@ -728,3 +728,10 @@ void ArrayTools::contractDataDataTensor(ArrayOutData & outputData, } + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefDot.hpp b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefDot.hpp index b4fa936a4683..69c063104c30 100644 --- a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefDot.hpp +++ b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefDot.hpp @@ -622,3 +622,10 @@ void ArrayTools::dotMultiplyDataData(ArrayOutData & outputData, } // end namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefScalar.hpp b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefScalar.hpp index 70aa114bfc42..5c6ac0419470 100644 --- a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefScalar.hpp +++ b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefScalar.hpp @@ -854,3 +854,10 @@ void ArrayTools::scalarMultiplyDataData(ArrayOutData & outputData, } // end namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefTensor.hpp b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefTensor.hpp index 712b328c4747..c3514cadab73 100644 --- a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefTensor.hpp +++ b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefTensor.hpp @@ -2440,4 +2440,11 @@ ArrayWrapper::value, true>input + + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif diff --git a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefTensorTEMP.hpp b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefTensorTEMP.hpp index bfc7bacff69a..d09595e3b8a4 100644 --- a/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefTensorTEMP.hpp +++ b/packages/intrepid/src/Shared/Intrepid_ArrayToolsDefTensorTEMP.hpp @@ -476,3 +476,10 @@ } + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_BurkardtRules.hpp b/packages/intrepid/src/Shared/Intrepid_BurkardtRules.hpp index 6032e2526359..3fedfd67577b 100644 --- a/packages/intrepid/src/Shared/Intrepid_BurkardtRules.hpp +++ b/packages/intrepid/src/Shared/Intrepid_BurkardtRules.hpp @@ -319,3 +319,10 @@ namespace Intrepid { #include "Intrepid_BurkardtRulesDef.hpp" #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_BurkardtRulesDef.hpp b/packages/intrepid/src/Shared/Intrepid_BurkardtRulesDef.hpp index 6f170c0dbb86..753a99b0cc50 100644 --- a/packages/intrepid/src/Shared/Intrepid_BurkardtRulesDef.hpp +++ b/packages/intrepid/src/Shared/Intrepid_BurkardtRulesDef.hpp @@ -6466,3 +6466,10 @@ Scalar IntrepidBurkardtRules::r8_sign ( Scalar x ) } // end of namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_FieldContainer.hpp b/packages/intrepid/src/Shared/Intrepid_FieldContainer.hpp index ed45f3bb07dc..457f202e55f9 100644 --- a/packages/intrepid/src/Shared/Intrepid_FieldContainer.hpp +++ b/packages/intrepid/src/Shared/Intrepid_FieldContainer.hpp @@ -918,3 +918,10 @@ struct Return_Type, Scalar>{ + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_FieldContainerDef.hpp b/packages/intrepid/src/Shared/Intrepid_FieldContainerDef.hpp index 6ef77740faef..e5c130196fe8 100644 --- a/packages/intrepid/src/Shared/Intrepid_FieldContainerDef.hpp +++ b/packages/intrepid/src/Shared/Intrepid_FieldContainerDef.hpp @@ -1732,3 +1732,10 @@ std::ostream& operator << (std::ostream& os, const FieldContainer #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_PointToolsDef.hpp b/packages/intrepid/src/Shared/Intrepid_PointToolsDef.hpp index d2482b749383..f8ae12bb21a2 100644 --- a/packages/intrepid/src/Shared/Intrepid_PointToolsDef.hpp +++ b/packages/intrepid/src/Shared/Intrepid_PointToolsDef.hpp @@ -807,3 +807,10 @@ namespace Intrepid { } // face Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_Polylib.hpp b/packages/intrepid/src/Shared/Intrepid_Polylib.hpp index c2271ece97c8..967d5d339787 100644 --- a/packages/intrepid/src/Shared/Intrepid_Polylib.hpp +++ b/packages/intrepid/src/Shared/Intrepid_Polylib.hpp @@ -634,3 +634,10 @@ namespace Intrepid { #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_PolylibDef.hpp b/packages/intrepid/src/Shared/Intrepid_PolylibDef.hpp index b9e46eb837ee..d19dae726945 100644 --- a/packages/intrepid/src/Shared/Intrepid_PolylibDef.hpp +++ b/packages/intrepid/src/Shared/Intrepid_PolylibDef.hpp @@ -840,3 +840,10 @@ Scalar IntrepidPolylib::gammaF(const Scalar x){ } // end of namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_Rank.hpp b/packages/intrepid/src/Shared/Intrepid_Rank.hpp index d61de56024cb..c458711e7e8a 100644 --- a/packages/intrepid/src/Shared/Intrepid_Rank.hpp +++ b/packages/intrepid/src/Shared/Intrepid_Rank.hpp @@ -521,3 +521,10 @@ struct ArrayWrapper { #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_RealSpaceTools.hpp b/packages/intrepid/src/Shared/Intrepid_RealSpaceTools.hpp index 6218f4575cc1..98f18d1a0a93 100644 --- a/packages/intrepid/src/Shared/Intrepid_RealSpaceTools.hpp +++ b/packages/intrepid/src/Shared/Intrepid_RealSpaceTools.hpp @@ -500,3 +500,10 @@ class RealSpaceTools { #include #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_RealSpaceToolsDef.hpp b/packages/intrepid/src/Shared/Intrepid_RealSpaceToolsDef.hpp index 1680cc8eb202..40e32d036833 100644 --- a/packages/intrepid/src/Shared/Intrepid_RealSpaceToolsDef.hpp +++ b/packages/intrepid/src/Shared/Intrepid_RealSpaceToolsDef.hpp @@ -2123,3 +2123,10 @@ void RealSpaceTools::vecprod(ArrayVecProd & vecProd, const ArrayIn1 & in } // namespace Intrepid + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_Types.hpp b/packages/intrepid/src/Shared/Intrepid_Types.hpp index ed9cc0bb305a..57df3d1edc14 100644 --- a/packages/intrepid/src/Shared/Intrepid_Types.hpp +++ b/packages/intrepid/src/Shared/Intrepid_Types.hpp @@ -732,3 +732,10 @@ namespace Intrepid { #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/intrepid/src/Shared/Intrepid_Utils.hpp b/packages/intrepid/src/Shared/Intrepid_Utils.hpp index 09247795a579..eb3fcaa3e0e9 100644 --- a/packages/intrepid/src/Shared/Intrepid_Utils.hpp +++ b/packages/intrepid/src/Shared/Intrepid_Utils.hpp @@ -1133,3 +1133,10 @@ bool requireDimensionMatch(std::string& errmsg, } // end namespace Intrepid #endif + +#if defined(Intrepid_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Intrepid package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/CMakeLists.txt b/packages/isorropia/CMakeLists.txt index 14871eb6093d..d7cd042ec58a 100644 --- a/packages/isorropia/CMakeLists.txt +++ b/packages/isorropia/CMakeLists.txt @@ -11,6 +11,7 @@ TRIBITS_PACKAGE(Isorropia) # # ToDo: Add these as you need them! +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() # # C) Add the libraries, tests, and examples diff --git a/packages/isorropia/cmake/Isorropia_config.h.in b/packages/isorropia/cmake/Isorropia_config.h.in index ce29d221cb40..d0caf5384859 100644 --- a/packages/isorropia/cmake/Isorropia_config.h.in +++ b/packages/isorropia/cmake/Isorropia_config.h.in @@ -14,3 +14,6 @@ /* define if we want to use MPI */ #cmakedefine ISORROPIA_HAVE_OMP + +#cmakedefine Isorropia_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/isorropia/src/Isorropia_Colorer.hpp b/packages/isorropia/src/Isorropia_Colorer.hpp index 51f766074132..908747c2d44a 100644 --- a/packages/isorropia/src/Isorropia_Colorer.hpp +++ b/packages/isorropia/src/Isorropia_Colorer.hpp @@ -157,3 +157,10 @@ class Colorer : virtual public Operator { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_ConfigDefs.hpp b/packages/isorropia/src/Isorropia_ConfigDefs.hpp index e1a903960e56..4286d25891b0 100644 --- a/packages/isorropia/src/Isorropia_ConfigDefs.hpp +++ b/packages/isorropia/src/Isorropia_ConfigDefs.hpp @@ -97,3 +97,10 @@ #endif //_Isorropia_ConfigDefs_hpp_ + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_CostDescriber.hpp b/packages/isorropia/src/Isorropia_CostDescriber.hpp index 670fdb5b4489..bc607386afdf 100644 --- a/packages/isorropia/src/Isorropia_CostDescriber.hpp +++ b/packages/isorropia/src/Isorropia_CostDescriber.hpp @@ -172,3 +172,10 @@ class CostDescriber { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_Exception.hpp b/packages/isorropia/src/Isorropia_Exception.hpp index a102b2c5e176..efda1e350f01 100644 --- a/packages/isorropia/src/Isorropia_Exception.hpp +++ b/packages/isorropia/src/Isorropia_Exception.hpp @@ -72,3 +72,10 @@ const char* Exception::what() const throw() { return( smsg_.c_str() ); } #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_LevelScheduler.hpp b/packages/isorropia/src/Isorropia_LevelScheduler.hpp index 21a2cb098006..00fa2ae28bc8 100644 --- a/packages/isorropia/src/Isorropia_LevelScheduler.hpp +++ b/packages/isorropia/src/Isorropia_LevelScheduler.hpp @@ -116,3 +116,10 @@ class LevelScheduler : virtual public Operator { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_Operator.hpp b/packages/isorropia/src/Isorropia_Operator.hpp index b21a1b32e717..9cc899511a67 100644 --- a/packages/isorropia/src/Isorropia_Operator.hpp +++ b/packages/isorropia/src/Isorropia_Operator.hpp @@ -198,3 +198,10 @@ class Operator { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_Orderer.hpp b/packages/isorropia/src/Isorropia_Orderer.hpp index 8b2dfc482675..602f519d88dc 100644 --- a/packages/isorropia/src/Isorropia_Orderer.hpp +++ b/packages/isorropia/src/Isorropia_Orderer.hpp @@ -120,3 +120,10 @@ class Orderer : virtual public Operator { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_Partitioner.hpp b/packages/isorropia/src/Isorropia_Partitioner.hpp index 0f9334ebb554..82d280b6b6ce 100644 --- a/packages/isorropia/src/Isorropia_Partitioner.hpp +++ b/packages/isorropia/src/Isorropia_Partitioner.hpp @@ -158,3 +158,10 @@ class Partitioner : virtual public Operator { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_Partitioner2D.hpp b/packages/isorropia/src/Isorropia_Partitioner2D.hpp index 70c790d66ddf..b003576f1a2a 100644 --- a/packages/isorropia/src/Isorropia_Partitioner2D.hpp +++ b/packages/isorropia/src/Isorropia_Partitioner2D.hpp @@ -132,3 +132,10 @@ class Partitioner2D : public Isorropia::Partitioner #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_Redistributor.hpp b/packages/isorropia/src/Isorropia_Redistributor.hpp index 97db25ffd4de..ce19387b755d 100644 --- a/packages/isorropia/src/Isorropia_Redistributor.hpp +++ b/packages/isorropia/src/Isorropia_Redistributor.hpp @@ -62,3 +62,10 @@ class Redistributor { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_Utils.hpp b/packages/isorropia/src/Isorropia_Utils.hpp index 3404dcdc1d83..ee50f47fd9b6 100644 --- a/packages/isorropia/src/Isorropia_Utils.hpp +++ b/packages/isorropia/src/Isorropia_Utils.hpp @@ -86,3 +86,10 @@ double cpu_time(); #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/Isorropia_Version.hpp b/packages/isorropia/src/Isorropia_Version.hpp index b57ef197b841..fb3c09047c01 100644 --- a/packages/isorropia/src/Isorropia_Version.hpp +++ b/packages/isorropia/src/Isorropia_Version.hpp @@ -53,3 +53,10 @@ namespace Isorropia { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_Epetra.hpp b/packages/isorropia/src/epetra/Isorropia_Epetra.hpp index 382464e8264e..26d55c44344e 100644 --- a/packages/isorropia/src/epetra/Isorropia_Epetra.hpp +++ b/packages/isorropia/src/epetra/Isorropia_Epetra.hpp @@ -748,3 +748,10 @@ double compute_imbalance(int nprocs, std::vector &offsets, #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraColorer.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraColorer.hpp index 4d4d5c09579b..b2a68f70e117 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraColorer.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraColorer.hpp @@ -200,3 +200,10 @@ class Colorer : public Isorropia::Colorer, public Isorropia::Epetra::Operator { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraCostDescriber.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraCostDescriber.hpp index a06bc77046a2..6d461808a573 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraCostDescriber.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraCostDescriber.hpp @@ -403,3 +403,10 @@ class CostDescriber : public Isorropia::CostDescriber { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraLevelScheduler.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraLevelScheduler.hpp index f43ac324c623..3508fa31a762 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraLevelScheduler.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraLevelScheduler.hpp @@ -110,3 +110,10 @@ class LevelScheduler : public Isorropia::LevelScheduler, public Isorropia::Epet #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraLibrary.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraLibrary.hpp index bf4fcbc56dd4..55742130767c 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraLibrary.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraLibrary.hpp @@ -205,3 +205,10 @@ class Library { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraMatcher.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraMatcher.hpp index 679f3fb82d10..a3d87a7dbda8 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraMatcher.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraMatcher.hpp @@ -217,3 +217,10 @@ class Matcher { } } #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraOperator.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraOperator.hpp index 5151175a35c2..173983f922fc 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraOperator.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraOperator.hpp @@ -441,3 +441,10 @@ class Operator : virtual public Isorropia::Operator { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraOrderer.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraOrderer.hpp index 4b2a82c53c70..4b5a526bf709 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraOrderer.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraOrderer.hpp @@ -113,3 +113,10 @@ class Orderer : public Isorropia::Orderer, public Isorropia::Epetra::Operator { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraPartitioner.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraPartitioner.hpp index ef6da48725cd..79df03721a4c 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraPartitioner.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraPartitioner.hpp @@ -389,3 +389,10 @@ class Partitioner : public Isorropia::Partitioner, public Isorropia::Epetra::Ope #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraPartitioner2D.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraPartitioner2D.hpp index 3375a524854e..b52cce5ef8a3 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraPartitioner2D.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraPartitioner2D.hpp @@ -187,3 +187,10 @@ class Partitioner2D : virtual public Isorropia::Partitioner2D, virtual public Is #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraProber.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraProber.hpp index 343788c34af4..4388b0f44cf4 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraProber.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraProber.hpp @@ -179,3 +179,10 @@ class Prober { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraRedistributor.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraRedistributor.hpp index eb14f6940be9..bcaad5bb9bbf 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraRedistributor.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraRedistributor.hpp @@ -337,3 +337,10 @@ class Redistributor : public Isorropia::Redistributor { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/Isorropia_EpetraZoltanLib.hpp b/packages/isorropia/src/epetra/Isorropia_EpetraZoltanLib.hpp index e32e379c6757..513bac7f98a5 100644 --- a/packages/isorropia/src/epetra/Isorropia_EpetraZoltanLib.hpp +++ b/packages/isorropia/src/epetra/Isorropia_EpetraZoltanLib.hpp @@ -164,3 +164,10 @@ class ZoltanLibClass : public Library { #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/zoltanLib/Isorropia_Zoltan_Repartition.hpp b/packages/isorropia/src/epetra/zoltanLib/Isorropia_Zoltan_Repartition.hpp index 42c8626b1825..5ed732dcc214 100644 --- a/packages/isorropia/src/epetra/zoltanLib/Isorropia_Zoltan_Repartition.hpp +++ b/packages/isorropia/src/epetra/zoltanLib/Isorropia_Zoltan_Repartition.hpp @@ -159,3 +159,10 @@ load_balance(MPI_Comm &comm, #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/src/epetra/zoltanLib/QueryObject.hpp b/packages/isorropia/src/epetra/zoltanLib/QueryObject.hpp index bf309c6e0e8d..3a1288d04b95 100644 --- a/packages/isorropia/src/epetra/zoltanLib/QueryObject.hpp +++ b/packages/isorropia/src/epetra/zoltanLib/QueryObject.hpp @@ -427,3 +427,10 @@ class QueryObject } //namespace Isorropia #endif //ISORROPIA_EPETRA_ZOLTAN_QUERYOBJECT_H + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/isorropia/test/utest/utst_serial.hpp b/packages/isorropia/test/utest/utst_serial.hpp index cb7e78217d85..d3ccdd25f1c5 100644 --- a/packages/isorropia/test/utest/utst_serial.hpp +++ b/packages/isorropia/test/utest/utst_serial.hpp @@ -44,3 +44,10 @@ void run_serial_utests(bool verbose); #endif + +#if defined(Isorropia_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Isorropia package is deprecated" +#endif +#endif + diff --git a/packages/kokkos-kernels/blas/tpls/KokkosBlas2_syr2_tpl_spec_decl_blas.hpp b/packages/kokkos-kernels/blas/tpls/KokkosBlas2_syr2_tpl_spec_decl_blas.hpp index 8561675c72f0..f22e800bc5fa 100644 --- a/packages/kokkos-kernels/blas/tpls/KokkosBlas2_syr2_tpl_spec_decl_blas.hpp +++ b/packages/kokkos-kernels/blas/tpls/KokkosBlas2_syr2_tpl_spec_decl_blas.hpp @@ -163,7 +163,7 @@ namespace Impl { ETI_SPEC_AVAIL>::syr2(space, trans, uplo, alpha, X, Y, A); \ } else { \ if (A_is_ll) { \ - HostBlas>::zher2( \ + HostBlas>::her2( \ uplo[0], N, alpha, \ reinterpret_cast*>(X.data()), one, \ reinterpret_cast*>(Y.data()), one, \ @@ -220,7 +220,7 @@ namespace Impl { ETI_SPEC_AVAIL>::syr2(space, trans, uplo, alpha, X, Y, A); \ } else { \ if (A_is_ll) { \ - HostBlas>::cher2( \ + HostBlas>::her2( \ uplo[0], N, alpha, \ reinterpret_cast*>(X.data()), one, \ reinterpret_cast*>(Y.data()), one, \ diff --git a/packages/kokkos-kernels/blas/tpls/KokkosBlas2_syr_tpl_spec_decl_blas.hpp b/packages/kokkos-kernels/blas/tpls/KokkosBlas2_syr_tpl_spec_decl_blas.hpp index 6b64fce2bc7c..fc8fb949d7ce 100644 --- a/packages/kokkos-kernels/blas/tpls/KokkosBlas2_syr_tpl_spec_decl_blas.hpp +++ b/packages/kokkos-kernels/blas/tpls/KokkosBlas2_syr_tpl_spec_decl_blas.hpp @@ -139,7 +139,7 @@ namespace Impl { space, trans, uplo, alpha, X, A); \ } else { \ if (A_is_ll) { \ - HostBlas>::zher( \ + HostBlas>::her( \ uplo[0], N, alpha.real(), \ reinterpret_cast*>(X.data()), one, \ reinterpret_cast*>(A.data()), LDA); \ @@ -188,7 +188,7 @@ namespace Impl { space, trans, uplo, alpha, X, A); \ } else { \ if (A_is_ll && (alpha.imag() == 0.)) { \ - HostBlas>::cher( \ + HostBlas>::her( \ uplo[0], N, alpha.real(), \ reinterpret_cast*>(X.data()), one, \ reinterpret_cast*>(A.data()), LDA); \ diff --git a/packages/kokkos-kernels/blas/tpls/KokkosBlas_Host_tpl.cpp b/packages/kokkos-kernels/blas/tpls/KokkosBlas_Host_tpl.cpp index 50aab57c7368..dc04ca7e6757 100644 --- a/packages/kokkos-kernels/blas/tpls/KokkosBlas_Host_tpl.cpp +++ b/packages/kokkos-kernels/blas/tpls/KokkosBlas_Host_tpl.cpp @@ -295,10 +295,10 @@ void F77_BLAS_MANGLE(dsyr, DSYR)(const char*, KK_INT*, const double*, void F77_BLAS_MANGLE(cher, CHER)(const char*, KK_INT*, const float*, const std::complex*, KK_INT*, - std::complex*, KK_INT*); + /* */ std::complex*, KK_INT*); void F77_BLAS_MANGLE(zher, ZHER)(const char*, KK_INT*, const double*, const std::complex*, KK_INT*, - std::complex*, KK_INT*); + /* */ std::complex*, KK_INT*); /// /// Syr2 @@ -322,12 +322,12 @@ void F77_BLAS_MANGLE(cher2, CHER2)(const char*, KK_INT*, const std::complex*, const std::complex*, KK_INT*, const std::complex*, KK_INT*, - std::complex*, KK_INT*); + /* */ std::complex*, KK_INT*); void F77_BLAS_MANGLE(zher2, ZHER2)(const char*, KK_INT*, const std::complex*, const std::complex*, KK_INT*, const std::complex*, KK_INT*, - std::complex*, KK_INT*); + /* */ std::complex*, KK_INT*); /// /// Trsv @@ -901,14 +901,14 @@ void HostBlas >::gerc( } template <> template <> -void HostBlas >::cher( +void HostBlas >::her( const char uplo, KK_INT n, const float alpha, const std::complex* x, KK_INT incx, std::complex* a, KK_INT lda) { F77_FUNC_CHER(&uplo, &n, &alpha, (const std::complex*)x, &incx, (std::complex*)a, &lda); } template <> -void HostBlas >::cher2( +void HostBlas >::her2( const char uplo, KK_INT n, const std::complex alpha, const std::complex* x, KK_INT incx, const std::complex* y, KK_INT incy, std::complex* a, KK_INT lda) { @@ -1069,15 +1069,17 @@ void HostBlas >::gerc( } template <> template <> -void HostBlas >::zher( - const char uplo, KK_INT n, const double alpha, - const std::complex* x, KK_INT incx, std::complex* a, - KK_INT lda) { +void HostBlas >::her(const char uplo, KK_INT n, + const double alpha, + const std::complex* x, + KK_INT incx, + std::complex* a, + KK_INT lda) { F77_FUNC_ZHER(&uplo, &n, &alpha, (const std::complex*)x, &incx, (std::complex*)a, &lda); } template <> -void HostBlas >::zher2( +void HostBlas >::her2( const char uplo, KK_INT n, const std::complex alpha, const std::complex* x, KK_INT incx, const std::complex* y, KK_INT incy, std::complex* a, KK_INT lda) { diff --git a/packages/kokkos-kernels/blas/tpls/KokkosBlas_Host_tpl.hpp b/packages/kokkos-kernels/blas/tpls/KokkosBlas_Host_tpl.hpp index 5fb7c1f624ff..d28f7a21866e 100644 --- a/packages/kokkos-kernels/blas/tpls/KokkosBlas_Host_tpl.hpp +++ b/packages/kokkos-kernels/blas/tpls/KokkosBlas_Host_tpl.hpp @@ -90,18 +90,11 @@ struct HostBlas { KK_INT incx, const T *y, KK_INT incy, T *a, KK_INT lda); template - static void cher(const char uplo, KK_INT n, const tAlpha alpha, const T *x, - KK_INT incx, T *a, KK_INT lda); - - template - static void zher(const char uplo, KK_INT n, const tAlpha alpha, const T *x, - KK_INT incx, T *a, KK_INT lda); - - static void cher2(const char uplo, KK_INT n, const T alpha, const T *x, - KK_INT incx, const T *y, KK_INT incy, T *a, KK_INT lda); + static void her(const char uplo, KK_INT n, const tAlpha alpha, const T *x, + KK_INT incx, T *a, KK_INT lda); - static void zher2(const char uplo, KK_INT n, const T alpha, const T *x, - KK_INT incx, const T *y, KK_INT incy, T *a, KK_INT lda); + static void her2(const char uplo, KK_INT n, const T alpha, const T *x, + KK_INT incx, const T *y, KK_INT incy, T *a, KK_INT lda); static void trsv(const char uplo, const char transa, const char diag, KK_INT m, const T *a, KK_INT lda, diff --git a/packages/ml/CMakeLists.txt b/packages/ml/CMakeLists.txt index 39b571c029ce..a30e8edb81a8 100644 --- a/packages/ml/CMakeLists.txt +++ b/packages/ml/CMakeLists.txt @@ -16,6 +16,8 @@ TRIBITS_PACKAGE(ML DISABLE_CIRCULAR_REF_DETECTION_FAILURE) # B) Set up package-specific options # +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() + IF(${PACKAGE_NAME}_ENABLE_SuperLU) IF(${PROJECT_NAME}_ENABLE_SuperLU5_API) diff --git a/packages/ml/cmake/ml_config.h.in b/packages/ml/cmake/ml_config.h.in index aa21cc9c9b95..c2b863a9146a 100644 --- a/packages/ml/cmake/ml_config.h.in +++ b/packages/ml/cmake/ml_config.h.in @@ -157,3 +157,5 @@ /* Turn on Teko smoothers, this is a circular dependency use at your own risk */ #cmakedefine HAVE_ML_TekoSmoothers + +#cmakedefine ML_SHOW_DEPRECATED_WARNINGS diff --git a/packages/ml/src/Coarsen/ml_agg_METIS.h b/packages/ml/src/Coarsen/ml_agg_METIS.h index a378dbdb240d..15b904129e83 100644 --- a/packages/ml/src/Coarsen/ml_agg_METIS.h +++ b/packages/ml/src/Coarsen/ml_agg_METIS.h @@ -69,3 +69,10 @@ extern "C" { #endif #endif /* #ifndef __MLAGGMETIS__ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_agg_ParMETIS.h b/packages/ml/src/Coarsen/ml_agg_ParMETIS.h index a4ff5a9dd025..adc11111f327 100644 --- a/packages/ml/src/Coarsen/ml_agg_ParMETIS.h +++ b/packages/ml/src/Coarsen/ml_agg_ParMETIS.h @@ -54,3 +54,10 @@ extern "C" { #endif #endif /* #ifndef __MLAGGPARMETIS__ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_agg_VBMETIS.h b/packages/ml/src/Coarsen/ml_agg_VBMETIS.h index 4ac196417225..e7d212e1e73c 100644 --- a/packages/ml/src/Coarsen/ml_agg_VBMETIS.h +++ b/packages/ml/src/Coarsen/ml_agg_VBMETIS.h @@ -96,3 +96,10 @@ int ML_amalg_drop_getrow_VBlocks(ML_Operator *data, int N_requested_rows, #endif #endif /* #ifndef __MLAGGVBMETIS__ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_agg_Zoltan.h b/packages/ml/src/Coarsen/ml_agg_Zoltan.h index 82ee4aa9a0b5..6a3da7f04746 100644 --- a/packages/ml/src/Coarsen/ml_agg_Zoltan.h +++ b/packages/ml/src/Coarsen/ml_agg_Zoltan.h @@ -43,3 +43,10 @@ extern "C" { #endif #endif /* #ifndef ML_AGG_ZOLTAN_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_agg_genP.h b/packages/ml/src/Coarsen/ml_agg_genP.h index e83db1cbe414..bb61560d21b2 100644 --- a/packages/ml/src/Coarsen/ml_agg_genP.h +++ b/packages/ml/src/Coarsen/ml_agg_genP.h @@ -151,3 +151,10 @@ extern int ML_compute_line_info(int LayerId[], int VertLineId[], #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_agg_min_energy.h b/packages/ml/src/Coarsen/ml_agg_min_energy.h index a162d7231f09..bd8d128fe971 100644 --- a/packages/ml/src/Coarsen/ml_agg_min_energy.h +++ b/packages/ml/src/Coarsen/ml_agg_min_energy.h @@ -47,3 +47,10 @@ int ML_AGG_Gen_Prolongator_MandelMinEnergy(ML *ml,int level, int clevel, void *d #endif #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_agg_reitzinger.h b/packages/ml/src/Coarsen/ml_agg_reitzinger.h index b5b39101c6ea..ef58842c3672 100644 --- a/packages/ml/src/Coarsen/ml_agg_reitzinger.h +++ b/packages/ml/src/Coarsen/ml_agg_reitzinger.h @@ -97,3 +97,10 @@ void ML_Reitzinger_CheckCommutingProperty(ML *ml_nodes, ML *ml_edges, + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_agg_user.h b/packages/ml/src/Coarsen/ml_agg_user.h index 2aacc4035d33..418404faa5e0 100644 --- a/packages/ml/src/Coarsen/ml_agg_user.h +++ b/packages/ml/src/Coarsen/ml_agg_user.h @@ -31,3 +31,10 @@ extern int ML_Aggregate_CoarsenUser( ML_Aggregate *ml_ag, #endif #endif /* #ifndef ML_AGG_USER_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_aggregate.h b/packages/ml/src/Coarsen/ml_aggregate.h index 6d7e2f8639ff..f372ea74846d 100644 --- a/packages/ml/src/Coarsen/ml_aggregate.h +++ b/packages/ml/src/Coarsen/ml_aggregate.h @@ -453,3 +453,10 @@ extern int ML_Aggregate_VizAndStats_Clean( ML *ml); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_amg.h b/packages/ml/src/Coarsen/ml_amg.h index 45f6feaa6818..23e4e6e5aa3e 100644 --- a/packages/ml/src/Coarsen/ml_amg.h +++ b/packages/ml/src/Coarsen/ml_amg.h @@ -222,3 +222,10 @@ int ML_AMG_Identity_Getrows(ML_Operator *data, int N_requested_rows, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_amg_genP.h b/packages/ml/src/Coarsen/ml_amg_genP.h index 7ca1616bfdea..afa028d6be79 100644 --- a/packages/ml/src/Coarsen/ml_amg_genP.h +++ b/packages/ml/src/Coarsen/ml_amg_genP.h @@ -57,3 +57,10 @@ extern int ML_AMG_Identity_Getrows(ML_Operator *data, int N_requested_rows, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_check.h b/packages/ml/src/Coarsen/ml_check.h index 2814da384401..9c598ffb3545 100644 --- a/packages/ml/src/Coarsen/ml_check.h +++ b/packages/ml/src/Coarsen/ml_check.h @@ -29,3 +29,10 @@ extern int ML_Reitzinger_Check_Hierarchy(ML *ml, ML_Operator **Tmat_array, int i #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_ggraph.h b/packages/ml/src/Coarsen/ml_ggraph.h index 165ad1da3e0b..8f269cab1778 100644 --- a/packages/ml/src/Coarsen/ml_ggraph.h +++ b/packages/ml/src/Coarsen/ml_ggraph.h @@ -77,3 +77,10 @@ extern int ML_GGraph_LabelVertices(int, int *, int, char *, char *, int, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_parmetis_constants.h b/packages/ml/src/Coarsen/ml_parmetis_constants.h index d6711b917efa..9aaaf54b0d9a 100644 --- a/packages/ml/src/Coarsen/ml_parmetis_constants.h +++ b/packages/ml/src/Coarsen/ml_parmetis_constants.h @@ -39,3 +39,10 @@ #endif #endif /*ifndef ML_PARMETIS_CONSTANTS_H*/ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_qr_fix.h b/packages/ml/src/Coarsen/ml_qr_fix.h index af10f76c54ff..d4e8b2597b6a 100644 --- a/packages/ml/src/Coarsen/ml_qr_fix.h +++ b/packages/ml/src/Coarsen/ml_qr_fix.h @@ -80,3 +80,10 @@ extern "C" { #endif #endif /*ifndef ML_QR_FIX_H*/ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Coarsen/ml_qr_fix.hpp b/packages/ml/src/Coarsen/ml_qr_fix.hpp index c15e5ac787a5..3ee2ef5fa176 100644 --- a/packages/ml/src/Coarsen/ml_qr_fix.hpp +++ b/packages/ml/src/Coarsen/ml_qr_fix.hpp @@ -23,3 +23,10 @@ struct ML_qr_fix_struct { typedef struct ML_qr_fix_struct ML_qr_fix; #endif //ifndef ML_QR_FIX_HPP + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Comm/ml_comm.h b/packages/ml/src/Comm/ml_comm.h index b993cef2db8c..c2b570f33c82 100644 --- a/packages/ml/src/Comm/ml_comm.h +++ b/packages/ml/src/Comm/ml_comm.h @@ -155,3 +155,10 @@ extern void ML_Comm_ErrorHandler(USR_COMM*, int*,...); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Comm/ml_comminfoagx.h b/packages/ml/src/Comm/ml_comminfoagx.h index 42d637fb0437..0dbdc7f14b1d 100644 --- a/packages/ml/src/Comm/ml_comminfoagx.h +++ b/packages/ml/src/Comm/ml_comminfoagx.h @@ -82,3 +82,10 @@ extern int ML_CommInfoAGX_Print(ML_CommInfoAGX *); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Comm/ml_comminfoop.h b/packages/ml/src/Comm/ml_comminfoop.h index 818956ea1e17..fb19e3682043 100644 --- a/packages/ml/src/Comm/ml_comminfoop.h +++ b/packages/ml/src/Comm/ml_comminfoop.h @@ -165,3 +165,10 @@ extern int ML_Comm_Envelope_Increment_Tag(ML_Comm_Envelope*); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/FEGrid/ml_bdrypts.h b/packages/ml/src/FEGrid/ml_bdrypts.h index fe05203e7953..c648458f92f4 100644 --- a/packages/ml/src/FEGrid/ml_bdrypts.h +++ b/packages/ml/src/FEGrid/ml_bdrypts.h @@ -71,3 +71,10 @@ extern int ML_BdryPts_ApplyZero_Dirichlet_Eqn(ML_BdryPts *, double *); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/FEGrid/ml_elementagx.h b/packages/ml/src/FEGrid/ml_elementagx.h index fd74b269aa79..34e5f10e0d13 100644 --- a/packages/ml/src/FEGrid/ml_elementagx.h +++ b/packages/ml/src/FEGrid/ml_elementagx.h @@ -66,3 +66,10 @@ extern int ML_ElementAGX_ComposeCandidates #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/FEGrid/ml_grid.h b/packages/ml/src/FEGrid/ml_grid.h index 11286739f27e..bb21cbb2ef18 100644 --- a/packages/ml/src/FEGrid/ml_grid.h +++ b/packages/ml/src/FEGrid/ml_grid.h @@ -60,3 +60,10 @@ extern int ML_Grid_Create_GridFunc( ML_Grid * ); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/FEGrid/ml_gridagx.h b/packages/ml/src/FEGrid/ml_gridagx.h index 2e1f810d40e2..73ffd174c264 100644 --- a/packages/ml/src/FEGrid/ml_gridagx.h +++ b/packages/ml/src/FEGrid/ml_gridagx.h @@ -95,3 +95,10 @@ extern int ML_GridAGX_Load_AllVertCoordinates(ML_GridAGX*,int,double*); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/FEGrid/ml_gridfunc.h b/packages/ml/src/FEGrid/ml_gridfunc.h index 4c53c7a3db7d..37d4883c8dba 100644 --- a/packages/ml/src/FEGrid/ml_gridfunc.h +++ b/packages/ml/src/FEGrid/ml_gridfunc.h @@ -91,3 +91,10 @@ int ML_compute_basis_coefficients2D(void *grid, double *coord, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/FEGrid/ml_mapper.h b/packages/ml/src/FEGrid/ml_mapper.h index 34d675d151f3..001d7140d4d4 100644 --- a/packages/ml/src/FEGrid/ml_mapper.h +++ b/packages/ml/src/FEGrid/ml_mapper.h @@ -75,3 +75,10 @@ extern int ML_Mapper_Apply(ML_Mapper *, Epetra_MultiVector & , Epetra_MultiVecto #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/FEGrid/ml_pde.h b/packages/ml/src/FEGrid/ml_pde.h index 63d8b7541ba3..847d96e5d4d1 100644 --- a/packages/ml/src/FEGrid/ml_pde.h +++ b/packages/ml/src/FEGrid/ml_pde.h @@ -32,3 +32,10 @@ extern int ML_PDE_GenMat(MLI_Solver*,int); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/FEGrid/ml_setup.h b/packages/ml/src/FEGrid/ml_setup.h index 43e6d2fc156d..f0702c46e558 100644 --- a/packages/ml/src/FEGrid/ml_setup.h +++ b/packages/ml/src/FEGrid/ml_setup.h @@ -71,3 +71,10 @@ void ML_construct_RP1( void *fgrid, #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Include/ml_common.h b/packages/ml/src/Include/ml_common.h index 0453ec0b0a51..2bc7f96848f0 100644 --- a/packages/ml/src/Include/ml_common.h +++ b/packages/ml/src/Include/ml_common.h @@ -183,3 +183,10 @@ #endif /*ifndef TRILINOS_NO_CONFIG_H*/ #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Include/ml_defs.h b/packages/ml/src/Include/ml_defs.h index 5d54b39a8f65..e34eac0ee6e6 100644 --- a/packages/ml/src/Include/ml_defs.h +++ b/packages/ml/src/Include/ml_defs.h @@ -194,3 +194,10 @@ typedef ML_BIG_INT ml_big_int; #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Include/ml_include.h b/packages/ml/src/Include/ml_include.h index ae28431710b1..7a9e2d637b2e 100644 --- a/packages/ml/src/Include/ml_include.h +++ b/packages/ml/src/Include/ml_include.h @@ -50,3 +50,10 @@ #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Krylov/ml_bicgstabl.h b/packages/ml/src/Krylov/ml_bicgstabl.h index 826c32f87b10..f89ca92e9d6d 100644 --- a/packages/ml/src/Krylov/ml_bicgstabl.h +++ b/packages/ml/src/Krylov/ml_bicgstabl.h @@ -32,3 +32,10 @@ extern int ML_BICGSTABL_Solve(ML_Krylov *,int,double *rhs,double *sol); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Krylov/ml_cg.h b/packages/ml/src/Krylov/ml_cg.h index 355ee029d4cf..6f61b36f1fd3 100644 --- a/packages/ml/src/Krylov/ml_cg.h +++ b/packages/ml/src/Krylov/ml_cg.h @@ -37,3 +37,10 @@ extern int ML_SubspaceIteration_ComputeEigenvalues(ML_Krylov *data, #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Krylov/ml_gmres.h b/packages/ml/src/Krylov/ml_gmres.h index a118cff5902f..ec5805010777 100644 --- a/packages/ml/src/Krylov/ml_gmres.h +++ b/packages/ml/src/Krylov/ml_gmres.h @@ -31,3 +31,10 @@ extern int ML_GMRES_Solve(ML_Krylov *,int length,double *rhs,double *sol); #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Krylov/ml_krylov.h b/packages/ml/src/Krylov/ml_krylov.h index f9aaaf932a39..b330bed21b34 100644 --- a/packages/ml/src/Krylov/ml_krylov.h +++ b/packages/ml/src/Krylov/ml_krylov.h @@ -106,3 +106,10 @@ extern int ML_DiagScale_Wrapper(void *, int, double *, int, double*); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/LevelWrap/ml_LevelWrap.h b/packages/ml/src/LevelWrap/ml_LevelWrap.h index 69cd7737dc62..259a016d3445 100644 --- a/packages/ml/src/LevelWrap/ml_LevelWrap.h +++ b/packages/ml/src/LevelWrap/ml_LevelWrap.h @@ -199,3 +199,10 @@ namespace ML_Epetra #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI.h b/packages/ml/src/MLAPI/MLAPI.h index 97185f2b076c..be5cdf915152 100644 --- a/packages/ml/src/MLAPI/MLAPI.h +++ b/packages/ml/src/MLAPI/MLAPI.h @@ -26,3 +26,10 @@ #include "MLAPI_BaseLinearCombination.h" #include "MLAPI_LinearCombinations.h" #include "MLAPI_Defaults.h" + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Aggregation.h b/packages/ml/src/MLAPI/MLAPI_Aggregation.h index 5a37f3dedc81..f958c51aa477 100644 --- a/packages/ml/src/MLAPI/MLAPI_Aggregation.h +++ b/packages/ml/src/MLAPI/MLAPI_Aggregation.h @@ -129,3 +129,10 @@ int GetGlobalAggregates(Epetra_RowMatrix& A, Teuchos::ParameterList& List, } // namespace MLAPI #endif // MLAPI_AGGREGATION_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_BaseLinearCombination.h b/packages/ml/src/MLAPI/MLAPI_BaseLinearCombination.h index dddcf7f8c9d8..d247ad034480 100644 --- a/packages/ml/src/MLAPI/MLAPI_BaseLinearCombination.h +++ b/packages/ml/src/MLAPI/MLAPI_BaseLinearCombination.h @@ -37,3 +37,10 @@ class BaseLinearCombination } // namespace MLAPI #endif // ifdef ML_BASELINEARCOMBINATION_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_BaseObject.h b/packages/ml/src/MLAPI/MLAPI_BaseObject.h index 5aa0a425246d..f0fac281fdd9 100644 --- a/packages/ml/src/MLAPI/MLAPI_BaseObject.h +++ b/packages/ml/src/MLAPI/MLAPI_BaseObject.h @@ -81,3 +81,10 @@ std::ostream& operator<< (std::ostream& os, const BaseObject& obj); } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_BaseOperator.h b/packages/ml/src/MLAPI/MLAPI_BaseOperator.h index 76853ef5e545..51c2c93a7ea4 100644 --- a/packages/ml/src/MLAPI/MLAPI_BaseOperator.h +++ b/packages/ml/src/MLAPI/MLAPI_BaseOperator.h @@ -53,3 +53,10 @@ class BaseOperator : public BaseObject { } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_CompObject.h b/packages/ml/src/MLAPI/MLAPI_CompObject.h index 1695d0d68957..5bafdcf021ca 100644 --- a/packages/ml/src/MLAPI/MLAPI_CompObject.h +++ b/packages/ml/src/MLAPI/MLAPI_CompObject.h @@ -68,3 +68,10 @@ class CompObject { } // namespace MLPI #endif // MLAPI_COMPOBJECT_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Defaults.h b/packages/ml/src/MLAPI/MLAPI_Defaults.h index 96e821dee49f..9e07d22fe3b5 100644 --- a/packages/ml/src/MLAPI/MLAPI_Defaults.h +++ b/packages/ml/src/MLAPI/MLAPI_Defaults.h @@ -30,3 +30,10 @@ void SetDefaults(Teuchos::ParameterList& List); } // namespace MLAPI #endif // MLAPI_DEFAULTS_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_DistributedMatrix.h b/packages/ml/src/MLAPI/MLAPI_DistributedMatrix.h index f194286f4d1e..980ae384a29b 100644 --- a/packages/ml/src/MLAPI/MLAPI_DistributedMatrix.h +++ b/packages/ml/src/MLAPI/MLAPI_DistributedMatrix.h @@ -375,3 +375,10 @@ class DistributedMatrix : public Epetra_RowMatrix, public Operator { } // namespace MLAPI #endif // ifndef MLAPI_DISTRIBUTEDMATRIX_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Eig.h b/packages/ml/src/MLAPI/MLAPI_Eig.h index b97ccecfabaf..8fd115565888 100644 --- a/packages/ml/src/MLAPI/MLAPI_Eig.h +++ b/packages/ml/src/MLAPI/MLAPI_Eig.h @@ -43,3 +43,10 @@ void Eigs(const Operator& A, int NumEigenvalues, } // namespace MLAPI #endif // MLAPI_EIG_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_EpetraBaseOperator.h b/packages/ml/src/MLAPI/MLAPI_EpetraBaseOperator.h index 6b1218010344..68010375894c 100644 --- a/packages/ml/src/MLAPI/MLAPI_EpetraBaseOperator.h +++ b/packages/ml/src/MLAPI/MLAPI_EpetraBaseOperator.h @@ -178,3 +178,10 @@ class EpetraBaseOperator : public Epetra_Operator { } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Error.h b/packages/ml/src/MLAPI/MLAPI_Error.h index 304659455b1f..7268756786e7 100644 --- a/packages/ml/src/MLAPI/MLAPI_Error.h +++ b/packages/ml/src/MLAPI/MLAPI_Error.h @@ -63,3 +63,10 @@ inline void StackPrint() {std::cout << "Compile with -DMLAPI_CHECK to get the fu #endif // ndef ML_THROW #endif // MLAPI_ERROR_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Expressions.h b/packages/ml/src/MLAPI/MLAPI_Expressions.h index 6e914ff33bda..fb04dd7a4b7e 100644 --- a/packages/ml/src/MLAPI/MLAPI_Expressions.h +++ b/packages/ml/src/MLAPI/MLAPI_Expressions.h @@ -265,3 +265,10 @@ double operator* (const BaseLinearCombination& x, const BaseLinearCombination& y } // namespace MLAPI #endif // if ML_EXPRESSIONS_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Gallery.h b/packages/ml/src/MLAPI/MLAPI_Gallery.h index bd5c3ce6b0e2..db59c5424198 100644 --- a/packages/ml/src/MLAPI/MLAPI_Gallery.h +++ b/packages/ml/src/MLAPI/MLAPI_Gallery.h @@ -81,3 +81,10 @@ namespace MLAPI { } #endif // MLAPI_GALLERY_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_InverseOperator.h b/packages/ml/src/MLAPI/MLAPI_InverseOperator.h index f34702d2ceec..f133ccc79b95 100644 --- a/packages/ml/src/MLAPI/MLAPI_InverseOperator.h +++ b/packages/ml/src/MLAPI/MLAPI_InverseOperator.h @@ -166,3 +166,10 @@ class InverseOperator : public BaseOperator, public CompObject, public TimeObjec } // namespace MLAPI #endif // ML_INVERSEOPERATOR_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Krylov.h b/packages/ml/src/MLAPI/MLAPI_Krylov.h index 83b0fdce97fc..becccf1e55ed 100644 --- a/packages/ml/src/MLAPI/MLAPI_Krylov.h +++ b/packages/ml/src/MLAPI/MLAPI_Krylov.h @@ -44,3 +44,10 @@ void Krylov(const Operator& A, const MultiVector& LHS, } // namespace MLAPI #endif // ifdef MLAPI_KRYLOV + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_LinearCombinations.h b/packages/ml/src/MLAPI/MLAPI_LinearCombinations.h index 93fcfe53f5ef..de25ca6bdd48 100644 --- a/packages/ml/src/MLAPI/MLAPI_LinearCombinations.h +++ b/packages/ml/src/MLAPI/MLAPI_LinearCombinations.h @@ -243,3 +243,10 @@ class Residual : public BaseLinearCombination } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_LoadBalanceInverseOperator.h b/packages/ml/src/MLAPI/MLAPI_LoadBalanceInverseOperator.h index 717c4fba3562..936071984602 100644 --- a/packages/ml/src/MLAPI/MLAPI_LoadBalanceInverseOperator.h +++ b/packages/ml/src/MLAPI/MLAPI_LoadBalanceInverseOperator.h @@ -149,3 +149,10 @@ class LoadBalanceInverseOperator : public InverseOperator { } // namespace MLAPI #endif // ML_INVERSEOPERATOR_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_LoadBalanceOperator.h b/packages/ml/src/MLAPI/MLAPI_LoadBalanceOperator.h index 3d09a2d1cfb7..169549bf58f8 100644 --- a/packages/ml/src/MLAPI/MLAPI_LoadBalanceOperator.h +++ b/packages/ml/src/MLAPI/MLAPI_LoadBalanceOperator.h @@ -556,3 +556,10 @@ class LoadBalanceOperator : public Operator { } // namespace MLAPI #endif // ML_OPERATOR_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_MATLABStream.h b/packages/ml/src/MLAPI/MLAPI_MATLABStream.h index 42e14509e899..39c406974050 100644 --- a/packages/ml/src/MLAPI/MLAPI_MATLABStream.h +++ b/packages/ml/src/MLAPI/MLAPI_MATLABStream.h @@ -273,3 +273,10 @@ class MATLABStream } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_MultiLevelAdaptiveSA.h b/packages/ml/src/MLAPI/MLAPI_MultiLevelAdaptiveSA.h index e77a860aa64f..a6cbfa7dd0d4 100644 --- a/packages/ml/src/MLAPI/MLAPI_MultiLevelAdaptiveSA.h +++ b/packages/ml/src/MLAPI/MLAPI_MultiLevelAdaptiveSA.h @@ -929,3 +929,10 @@ class MultiLevelAdaptiveSA : public BaseOperator, public CompObject, public Time } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_MultiLevelSA.h b/packages/ml/src/MLAPI/MLAPI_MultiLevelSA.h index 0382fe4c4802..f47dd8cf28a0 100644 --- a/packages/ml/src/MLAPI/MLAPI_MultiLevelSA.h +++ b/packages/ml/src/MLAPI/MLAPI_MultiLevelSA.h @@ -397,3 +397,10 @@ class MultiLevelSA : public BaseOperator, public CompObject, public TimeObject { } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_MultiVector.h b/packages/ml/src/MLAPI/MLAPI_MultiVector.h index cc70b9318e35..0d83bd753024 100644 --- a/packages/ml/src/MLAPI/MLAPI_MultiVector.h +++ b/packages/ml/src/MLAPI/MLAPI_MultiVector.h @@ -985,3 +985,10 @@ class MultiVector : public BaseObject, public CompObject, public TimeObject { } // namespace MLAPI #endif // if ML_MULTIVECTOR_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_MultiVector_Utils.h b/packages/ml/src/MLAPI/MLAPI_MultiVector_Utils.h index fb2d14a162ee..d93621d2fbe8 100644 --- a/packages/ml/src/MLAPI/MLAPI_MultiVector_Utils.h +++ b/packages/ml/src/MLAPI/MLAPI_MultiVector_Utils.h @@ -45,3 +45,10 @@ MultiVector Redistribute(const MultiVector& y, const int NumEquations); } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Operator.h b/packages/ml/src/MLAPI/MLAPI_Operator.h index da4964d89edf..73e0e55daaf6 100644 --- a/packages/ml/src/MLAPI/MLAPI_Operator.h +++ b/packages/ml/src/MLAPI/MLAPI_Operator.h @@ -499,3 +499,10 @@ class Operator : public BaseOperator, public CompObject, public TimeObject { } // namespace MLAPI #endif // ML_OPERATOR_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Operator_Box.h b/packages/ml/src/MLAPI/MLAPI_Operator_Box.h index 2c6483985bac..453127320a88 100644 --- a/packages/ml/src/MLAPI/MLAPI_Operator_Box.h +++ b/packages/ml/src/MLAPI/MLAPI_Operator_Box.h @@ -64,3 +64,10 @@ class ML_Operator_Box { } // namespace MLAPI #endif // MLAPI_OPERATOR_BOX_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Operator_Utils.h b/packages/ml/src/MLAPI/MLAPI_Operator_Utils.h index f98495ce0939..c78314bcb0fc 100644 --- a/packages/ml/src/MLAPI/MLAPI_Operator_Utils.h +++ b/packages/ml/src/MLAPI/MLAPI_Operator_Utils.h @@ -82,3 +82,10 @@ Operator Duplicate(const Operator& A); } // namespace MLAPI #endif // ML_OPERATOR_UTILS_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_SAMIS.h b/packages/ml/src/MLAPI/MLAPI_SAMIS.h index 87b62b99b5d2..3c36df0c1253 100644 --- a/packages/ml/src/MLAPI/MLAPI_SAMIS.h +++ b/packages/ml/src/MLAPI/MLAPI_SAMIS.h @@ -41,3 +41,10 @@ class Operator; } // namespace MLAPI #endif // MLAPI_SAMIS_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_SerialMatrix.h b/packages/ml/src/MLAPI/MLAPI_SerialMatrix.h index 0af9042c04e2..855f86c1ae0d 100644 --- a/packages/ml/src/MLAPI/MLAPI_SerialMatrix.h +++ b/packages/ml/src/MLAPI/MLAPI_SerialMatrix.h @@ -435,3 +435,10 @@ class SerialMatrix : public Operator } // namespace MLAPI #endif // ifndef MLAPI_SERIALMATRIX_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Space.h b/packages/ml/src/MLAPI/MLAPI_Space.h index 2204f9fb1200..34cc81e0a4e7 100644 --- a/packages/ml/src/MLAPI/MLAPI_Space.h +++ b/packages/ml/src/MLAPI/MLAPI_Space.h @@ -352,3 +352,10 @@ class Space : public BaseObject { } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_TimeObject.h b/packages/ml/src/MLAPI/MLAPI_TimeObject.h index 40f6597455ec..40f0e4dc36c8 100644 --- a/packages/ml/src/MLAPI/MLAPI_TimeObject.h +++ b/packages/ml/src/MLAPI/MLAPI_TimeObject.h @@ -73,3 +73,10 @@ class TimeObject { } // namespace MLPI #endif // MLAPI_TIMEOBJECT_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MLAPI/MLAPI_Workspace.h b/packages/ml/src/MLAPI/MLAPI_Workspace.h index 41c888acf60c..0adbe07793ed 100644 --- a/packages/ml/src/MLAPI/MLAPI_Workspace.h +++ b/packages/ml/src/MLAPI/MLAPI_Workspace.h @@ -74,3 +74,10 @@ int GetMatrixType(); } // namespace MLAPI #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Main/ml_1level.h b/packages/ml/src/Main/ml_1level.h index ee704f2d00b6..bf0fb7bdf0bf 100644 --- a/packages/ml/src/Main/ml_1level.h +++ b/packages/ml/src/Main/ml_1level.h @@ -60,3 +60,10 @@ struct ML_1Level_Struct #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Main/ml_ggb.h b/packages/ml/src/Main/ml_ggb.h index 9ba76542ca76..c6a903d5de10 100644 --- a/packages/ml/src/Main/ml_ggb.h +++ b/packages/ml/src/Main/ml_ggb.h @@ -99,3 +99,10 @@ void PREFIX PDNAUPD_F77(int *, int *, char *, int *, char *, int *, double *, do #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Main/ml_seg_precond.h b/packages/ml/src/Main/ml_seg_precond.h index 24a2072c62b9..29f9833ad58b 100644 --- a/packages/ml/src/Main/ml_seg_precond.h +++ b/packages/ml/src/Main/ml_seg_precond.h @@ -224,3 +224,10 @@ extern double ML_Cycle_MGV(ML_1Level *curr, double *sol, double *rhs, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Main/ml_struct.h b/packages/ml/src/Main/ml_struct.h index b0b9ca350ea3..aa09b0774655 100755 --- a/packages/ml/src/Main/ml_struct.h +++ b/packages/ml/src/Main/ml_struct.h @@ -425,3 +425,10 @@ extern int ML_Get_Label( ML *ml, char *label); + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Main/ml_viz_stats.h b/packages/ml/src/Main/ml_viz_stats.h index 9d7de8704618..084628438011 100644 --- a/packages/ml/src/Main/ml_viz_stats.h +++ b/packages/ml/src/Main/ml_viz_stats.h @@ -35,3 +35,10 @@ typedef struct ML_Aggregate_Viz_Stats_Struct /*ms*/ #endif /* #ifndef __MLAGGMETIS__ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Main/mli_solver.h b/packages/ml/src/Main/mli_solver.h index b975e1aef05a..f0e265c8d0f4 100644 --- a/packages/ml/src/Main/mli_solver.h +++ b/packages/ml/src/Main/mli_solver.h @@ -135,3 +135,10 @@ extern int MLI_Solver_Construct_LocalCSRMatrix(int nrows, int *mat_ia, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MatrixFree/ml_ElementByElement_SingleElement.h b/packages/ml/src/MatrixFree/ml_ElementByElement_SingleElement.h index 7edf090e97cc..366198dcee6c 100644 --- a/packages/ml/src/MatrixFree/ml_ElementByElement_SingleElement.h +++ b/packages/ml/src/MatrixFree/ml_ElementByElement_SingleElement.h @@ -293,3 +293,10 @@ class ElementByElement_SingleElement: public Epetra_Operator #endif // HAVE_ML_EPETRA #endif // ML_ELEMENT_BY_ELEMENT_SINGLE_ELEMENT_H + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/MatrixFree/ml_MatrixFreePreconditioner.h b/packages/ml/src/MatrixFree/ml_MatrixFreePreconditioner.h index c562a8eace14..e069b574816f 100644 --- a/packages/ml/src/MatrixFree/ml_MatrixFreePreconditioner.h +++ b/packages/ml/src/MatrixFree/ml_MatrixFreePreconditioner.h @@ -316,3 +316,10 @@ class MatrixFreePreconditioner : public Epetra_Operator #endif // HAVE_ML_EPETRA #endif // ML_MATRIX_FREE_PRECONDITIONER + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Operator/ml_mat_formats.h b/packages/ml/src/Operator/ml_mat_formats.h index 0cd12543004e..fee19fde7c6c 100644 --- a/packages/ml/src/Operator/ml_mat_formats.h +++ b/packages/ml/src/Operator/ml_mat_formats.h @@ -161,3 +161,10 @@ extern int ML_Matrix_DCSR_Matvec(ML_Operator *,int,double*,int,double*); #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Operator/ml_op_utils.h b/packages/ml/src/Operator/ml_op_utils.h index 5cb3b2d8b01b..9f11b2b49968 100644 --- a/packages/ml/src/Operator/ml_op_utils.h +++ b/packages/ml/src/Operator/ml_op_utils.h @@ -150,3 +150,10 @@ extern void ML_Operator_Copy_Statistics(ML_Operator *source, ML_Operator *target #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Operator/ml_operator.h b/packages/ml/src/Operator/ml_operator.h index f1db93649e34..e357e089bb0e 100644 --- a/packages/ml/src/Operator/ml_operator.h +++ b/packages/ml/src/Operator/ml_operator.h @@ -387,3 +387,10 @@ extern int ML_Epetra_CRSinsert(ML_Operator *, int, int *, double *, int); #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Operator/ml_operator_blockmat.h b/packages/ml/src/Operator/ml_operator_blockmat.h index a3f78a9a35fc..e01bf4ec7379 100644 --- a/packages/ml/src/Operator/ml_operator_blockmat.h +++ b/packages/ml/src/Operator/ml_operator_blockmat.h @@ -61,3 +61,10 @@ extern int ML_Operator_blockmat_set_M_mat_destroy(ML_Operator *blockmat, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Operator/ml_operatoragx.h b/packages/ml/src/Operator/ml_operatoragx.h index 17ac400db547..bdf1a3d86d1f 100644 --- a/packages/ml/src/Operator/ml_operatoragx.h +++ b/packages/ml/src/Operator/ml_operatoragx.h @@ -89,3 +89,10 @@ extern int ML_OperatorAGX_Gen_ComminfoOp(ML_OperatorAGX *vop, ML_Operator *Rmat, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Operator/ml_rap.h b/packages/ml/src/Operator/ml_rap.h index b4db7fa3a9d3..06035ee8a559 100644 --- a/packages/ml/src/Operator/ml_rap.h +++ b/packages/ml/src/Operator/ml_rap.h @@ -138,3 +138,10 @@ extern int ML_determine_Bblkrows(int start, int *end, ML_Operator *Amatrix, #define ML_TRUE 1 #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/RefMaxwell/ml_EdgeMatrixFreePreconditioner.h b/packages/ml/src/RefMaxwell/ml_EdgeMatrixFreePreconditioner.h index 9f3743891b95..a98dbee92090 100644 --- a/packages/ml/src/RefMaxwell/ml_EdgeMatrixFreePreconditioner.h +++ b/packages/ml/src/RefMaxwell/ml_EdgeMatrixFreePreconditioner.h @@ -233,3 +233,10 @@ namespace ML_Epetra #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/RefMaxwell/ml_FaceMatrixFreePreconditioner.h b/packages/ml/src/RefMaxwell/ml_FaceMatrixFreePreconditioner.h index 63755c4c6d8a..40dda475f6a0 100644 --- a/packages/ml/src/RefMaxwell/ml_FaceMatrixFreePreconditioner.h +++ b/packages/ml/src/RefMaxwell/ml_FaceMatrixFreePreconditioner.h @@ -233,3 +233,10 @@ namespace ML_Epetra #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/RefMaxwell/ml_GradDiv.h b/packages/ml/src/RefMaxwell/ml_GradDiv.h index 5578ed043bf6..c34a75d0ac80 100644 --- a/packages/ml/src/RefMaxwell/ml_GradDiv.h +++ b/packages/ml/src/RefMaxwell/ml_GradDiv.h @@ -245,3 +245,10 @@ namespace ML_Epetra #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/RefMaxwell/ml_RefMaxwell.h b/packages/ml/src/RefMaxwell/ml_RefMaxwell.h index cdacb0986c95..1ddf924c9bd2 100644 --- a/packages/ml/src/RefMaxwell/ml_RefMaxwell.h +++ b/packages/ml/src/RefMaxwell/ml_RefMaxwell.h @@ -316,3 +316,10 @@ namespace ML_Epetra #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/RefMaxwell/ml_RefMaxwell_11_Operator.h b/packages/ml/src/RefMaxwell/ml_RefMaxwell_11_Operator.h index 12bd9016e755..c6d828b103fc 100644 --- a/packages/ml/src/RefMaxwell/ml_RefMaxwell_11_Operator.h +++ b/packages/ml/src/RefMaxwell/ml_RefMaxwell_11_Operator.h @@ -164,3 +164,10 @@ class ML_RefMaxwell_11_Operator: public Epetra_Operator_With_MatMat{ }//end namespace #endif #endif /*ML_REFMAXWELL_11_OPERATOR_H*/ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/RefMaxwell/ml_RefMaxwell_Utils.h b/packages/ml/src/RefMaxwell/ml_RefMaxwell_Utils.h index 86e713f12f44..54dcde01a8dc 100644 --- a/packages/ml/src/RefMaxwell/ml_RefMaxwell_Utils.h +++ b/packages/ml/src/RefMaxwell/ml_RefMaxwell_Utils.h @@ -50,3 +50,10 @@ namespace ML_Epetra #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Smoother/ml_csolve.h b/packages/ml/src/Smoother/ml_csolve.h index dae88ee2fddd..a5b45fcb4b51 100644 --- a/packages/ml/src/Smoother/ml_csolve.h +++ b/packages/ml/src/Smoother/ml_csolve.h @@ -96,3 +96,10 @@ extern int ML_CSolve_Clean_Aggr(void *, ML_CSolveFunc *); #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Smoother/ml_mls.h b/packages/ml/src/Smoother/ml_mls.h index 4702996d3065..47579e3bbcc0 100644 --- a/packages/ml/src/Smoother/ml_mls.h +++ b/packages/ml/src/Smoother/ml_mls.h @@ -61,3 +61,10 @@ int ML_MLS_SPrime_Apply(void *sm,int inlen,double x[],int outlen, double rhs[]); #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Smoother/ml_smoother.h b/packages/ml/src/Smoother/ml_smoother.h index 05421acc493f..db029647bc0f 100644 --- a/packages/ml/src/Smoother/ml_smoother.h +++ b/packages/ml/src/Smoother/ml_smoother.h @@ -399,3 +399,10 @@ extern int DinvA(ML_Operator *data, int in, double p[], int out, double ap[]); #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Smoother/ml_solver.h b/packages/ml/src/Smoother/ml_solver.h index da3c5d7252eb..f03704ddff78 100644 --- a/packages/ml/src/Smoother/ml_solver.h +++ b/packages/ml/src/Smoother/ml_solver.h @@ -66,3 +66,10 @@ int ML_Solver_Check( ML_Solver *sol ); } #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Smoother/ml_superlu.h b/packages/ml/src/Smoother/ml_superlu.h index 676e97880a30..a2ff691edbb9 100644 --- a/packages/ml/src/Smoother/ml_superlu.h +++ b/packages/ml/src/Smoother/ml_superlu.h @@ -71,3 +71,10 @@ extern void ML_SuperLU_Set_Tile( int nprocs, int* tsz, int* stile, #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Smoother/ml_xxt.h b/packages/ml/src/Smoother/ml_xxt.h index be7d1f59e5de..8567a3e097b3 100644 --- a/packages/ml/src/Smoother/ml_xxt.h +++ b/packages/ml/src/Smoother/ml_xxt.h @@ -20,3 +20,10 @@ extern void ML_subexchange_bdry(double x[], ML_CommInfoOP *comm_info, int start_location, int total_send, ML_Comm *comm, int mask); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Smoother/ml_xyt.h b/packages/ml/src/Smoother/ml_xyt.h index 499f21a58451..cc178d8e3b23 100644 --- a/packages/ml/src/Smoother/ml_xyt.h +++ b/packages/ml/src/Smoother/ml_xyt.h @@ -49,3 +49,10 @@ extern int ML_Comm_subGappendInt(ML_Comm *com_ptr, int *vals, int *cur_length, #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/Epetra_Multi_CrsMatrix.h b/packages/ml/src/Utils/Epetra_Multi_CrsMatrix.h index b98d023461e9..92827ff428d5 100644 --- a/packages/ml/src/Utils/Epetra_Multi_CrsMatrix.h +++ b/packages/ml/src/Utils/Epetra_Multi_CrsMatrix.h @@ -149,3 +149,10 @@ class Epetra_Multi_CrsMatrix: public Epetra_Operator_With_MatMat{ #endif #endif /*ML_EPETRA_MULTI_CRS_MATRIX_H*/ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/Epetra_Operator_With_MatMat.h b/packages/ml/src/Utils/Epetra_Operator_With_MatMat.h index e6389b9433c4..93227033dcf3 100644 --- a/packages/ml/src/Utils/Epetra_Operator_With_MatMat.h +++ b/packages/ml/src/Utils/Epetra_Operator_With_MatMat.h @@ -53,3 +53,10 @@ class Epetra_Operator_With_MatMat: public Epetra_Operator { #endif #endif /* EPETRA_OPERATOR_WITH_MATMAT_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/jostle.h b/packages/ml/src/Utils/jostle.h index 3342b5e80fe4..0e981a82229b 100644 --- a/packages/ml/src/Utils/jostle.h +++ b/packages/ml/src/Utils/jostle.h @@ -16,3 +16,10 @@ extern int jostle_cut(void); extern double jostle_bal(void); extern double jostle_tim(void); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_DD_prec.h b/packages/ml/src/Utils/ml_DD_prec.h index 02f599b4d800..eb5f1419b888 100644 --- a/packages/ml/src/Utils/ml_DD_prec.h +++ b/packages/ml/src/Utils/ml_DD_prec.h @@ -41,3 +41,10 @@ int ML_Aggregate_Stats_ComputeCoordinates( ML *ml, ML_Aggregate *ag, #endif /* ifdef ML_DD_PREC_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_FilterType.h b/packages/ml/src/Utils/ml_FilterType.h index 007949349914..d44ba2de1a8e 100644 --- a/packages/ml/src/Utils/ml_FilterType.h +++ b/packages/ml/src/Utils/ml_FilterType.h @@ -32,3 +32,10 @@ enum FilterType { } // namespace ML_Epetra #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_Ifpack_ML.h b/packages/ml/src/Utils/ml_Ifpack_ML.h index a9918433d225..f5e788f08dec 100644 --- a/packages/ml/src/Utils/ml_Ifpack_ML.h +++ b/packages/ml/src/Utils/ml_Ifpack_ML.h @@ -262,3 +262,10 @@ class Ifpack_ML : public Ifpack_Preconditioner { #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_MultiLevelOperator.h b/packages/ml/src/Utils/ml_MultiLevelOperator.h index 6cf82774eb01..c4557ae5fdcb 100644 --- a/packages/ml/src/Utils/ml_MultiLevelOperator.h +++ b/packages/ml/src/Utils/ml_MultiLevelOperator.h @@ -209,3 +209,10 @@ class MultiLevelOperator: public virtual Epetra_Operator { #endif /* ML_MULTILEVELOPERATOR_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_MultiLevelPreconditioner.h b/packages/ml/src/Utils/ml_MultiLevelPreconditioner.h index f0a25f399410..0a9a7c07f481 100644 --- a/packages/ml/src/Utils/ml_MultiLevelPreconditioner.h +++ b/packages/ml/src/Utils/ml_MultiLevelPreconditioner.h @@ -1350,3 +1350,10 @@ extern int buildCompressedA(MLVec& inputRowPtr, MLVec& inputCols, #endif /* defined HAVE_ML_EPETRA and HAVE_ML_TEUCHOS */ #endif /* define ML_MULTILEVELPRECONDITIONER_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_Preconditioner.h b/packages/ml/src/Utils/ml_Preconditioner.h index 0078c70da130..5fedb50d5888 100644 --- a/packages/ml/src/Utils/ml_Preconditioner.h +++ b/packages/ml/src/Utils/ml_Preconditioner.h @@ -165,3 +165,10 @@ namespace ML_Epetra #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_RowMatrix.h b/packages/ml/src/Utils/ml_RowMatrix.h index 7b612d57becb..928187589d35 100644 --- a/packages/ml/src/Utils/ml_RowMatrix.h +++ b/packages/ml/src/Utils/ml_RowMatrix.h @@ -389,3 +389,10 @@ class RowMatrix : public virtual Epetra_RowMatrix { #endif /* HAVE_ML_EPETRA */ #endif /* ML_ROWMATRIX_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_ValidateParameters.h b/packages/ml/src/Utils/ml_ValidateParameters.h index 797abd1d30dd..f5008ad8bb73 100644 --- a/packages/ml/src/Utils/ml_ValidateParameters.h +++ b/packages/ml/src/Utils/ml_ValidateParameters.h @@ -48,3 +48,10 @@ namespace ML_Epetra } #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_agg_info.h b/packages/ml/src/Utils/ml_agg_info.h index ad37f164841a..3a5d4490a382 100644 --- a/packages/ml/src/Utils/ml_agg_info.h +++ b/packages/ml/src/Utils/ml_agg_info.h @@ -79,3 +79,10 @@ extern "C" { #endif #endif /* #ifndef __MLAGGMETIS__ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_amesos.h b/packages/ml/src/Utils/ml_amesos.h index 06b8f88964c0..a7189a722be6 100644 --- a/packages/ml/src/Utils/ml_amesos.h +++ b/packages/ml/src/Utils/ml_amesos.h @@ -72,3 +72,10 @@ int ML_Gen_Smoother_Amesos(ML *ml, int nl, int AmesosSolver, #endif #endif /* #ifndef __ML_AMESOS_H__ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_amesos_wrap.h b/packages/ml/src/Utils/ml_amesos_wrap.h index 6a1cd68561db..b74655283a95 100644 --- a/packages/ml/src/Utils/ml_amesos_wrap.h +++ b/packages/ml/src/Utils/ml_amesos_wrap.h @@ -99,3 +99,10 @@ extern "C" { #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_anasazi.h b/packages/ml/src/Utils/ml_anasazi.h index 058520715fd8..efffcdb13ced 100644 --- a/packages/ml/src/Utils/ml_anasazi.h +++ b/packages/ml/src/Utils/ml_anasazi.h @@ -130,3 +130,10 @@ extern "C" #endif #endif /* #ifndef _ML_ANASAZI_H_ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_aztec_lapack.h b/packages/ml/src/Utils/ml_aztec_lapack.h index f35f8ac79500..f11f8552d447 100644 --- a/packages/ml/src/Utils/ml_aztec_lapack.h +++ b/packages/ml/src/Utils/ml_aztec_lapack.h @@ -51,3 +51,10 @@ #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_aztec_utils.h b/packages/ml/src/Utils/ml_aztec_utils.h index 1c4a299894f4..cec1809d44d4 100644 --- a/packages/ml/src/Utils/ml_aztec_utils.h +++ b/packages/ml/src/Utils/ml_aztec_utils.h @@ -300,3 +300,10 @@ void AZ_ML_Build_NodalCoordinates( int N, int N_update, int N_external, #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_eigf2c.h b/packages/ml/src/Utils/ml_eigf2c.h index b4294a3c1a68..a1b93b2a4a00 100644 --- a/packages/ml/src/Utils/ml_eigf2c.h +++ b/packages/ml/src/Utils/ml_eigf2c.h @@ -76,3 +76,10 @@ extern void PREFIX PDNEUPD_F77(int *, #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_epetra.h b/packages/ml/src/Utils/ml_epetra.h index a8d470ca77aa..897257cc810e 100644 --- a/packages/ml/src/Utils/ml_epetra.h +++ b/packages/ml/src/Utils/ml_epetra.h @@ -36,3 +36,10 @@ exit(ml_err); } #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_epetra_operator.h b/packages/ml/src/Utils/ml_epetra_operator.h index 107d20a3ed68..c0f94149a224 100644 --- a/packages/ml/src/Utils/ml_epetra_operator.h +++ b/packages/ml/src/Utils/ml_epetra_operator.h @@ -13,3 +13,10 @@ #include "ml_MultiLevelOperator.h" #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_epetra_preconditioner.h b/packages/ml/src/Utils/ml_epetra_preconditioner.h index c5aab13bc4d1..15bcb96b4a2d 100644 --- a/packages/ml/src/Utils/ml_epetra_preconditioner.h +++ b/packages/ml/src/Utils/ml_epetra_preconditioner.h @@ -13,3 +13,10 @@ #include "ml_MultiLevelPreconditioner.h" #endif /* _ML_EPETRA_PRECONDITIONER_H_ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_epetra_utils.h b/packages/ml/src/Utils/ml_epetra_utils.h index 36fe4cd1207d..3c3705b5edfc 100644 --- a/packages/ml/src/Utils/ml_epetra_utils.h +++ b/packages/ml/src/Utils/ml_epetra_utils.h @@ -374,3 +374,10 @@ bool Epetra_ML_writegidviz(char* filename, int label, void ML_BreakForDebugger(const Epetra_Comm& comm); #endif /* _ML_EPETRA_UTILS_H_ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_ifpack.h b/packages/ml/src/Utils/ml_ifpack.h index 33701f2022c7..e76517d3a220 100644 --- a/packages/ml/src/Utils/ml_ifpack.h +++ b/packages/ml/src/Utils/ml_ifpack.h @@ -43,3 +43,10 @@ void ML_Ifpack_Destroy(void * Ifpack_Handle); #endif #endif /* #ifndef ML_IFPACK_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_ifpack_epetra_wrap.h b/packages/ml/src/Utils/ml_ifpack_epetra_wrap.h index afa3dde347a6..aaf85c532325 100644 --- a/packages/ml/src/Utils/ml_ifpack_epetra_wrap.h +++ b/packages/ml/src/Utils/ml_ifpack_epetra_wrap.h @@ -33,3 +33,10 @@ namespace ML_Epetra { } #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_ifpack_wrap.h b/packages/ml/src/Utils/ml_ifpack_wrap.h index c64c05be85bd..f146c179d502 100644 --- a/packages/ml/src/Utils/ml_ifpack_wrap.h +++ b/packages/ml/src/Utils/ml_ifpack_wrap.h @@ -46,3 +46,10 @@ int ML_Gen_Smoother_Ifpack(ML *ml, const char* Type, int Overlap, #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_intlist.h b/packages/ml/src/Utils/ml_intlist.h index ee04d8493665..58f066733e4b 100644 --- a/packages/ml/src/Utils/ml_intlist.h +++ b/packages/ml/src/Utils/ml_intlist.h @@ -61,3 +61,10 @@ extern int ML_IntList_Print(ML_IntList *); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_lapack.h b/packages/ml/src/Utils/ml_lapack.h index d351344c0c97..3f442bc8cb25 100644 --- a/packages/ml/src/Utils/ml_lapack.h +++ b/packages/ml/src/Utils/ml_lapack.h @@ -679,3 +679,10 @@ void PREFIX XERBLA_F77(ml_fcd, int *info); #endif #endif /* ML_BLAS_LAPACK_WRAPPERS_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_memory.h b/packages/ml/src/Utils/ml_memory.h index e27c047c17ce..d3105aaa62ad 100644 --- a/packages/ml/src/Utils/ml_memory.h +++ b/packages/ml/src/Utils/ml_memory.h @@ -89,3 +89,10 @@ extern int ML_MaxMemorySize(); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_petsc.h b/packages/ml/src/Utils/ml_petsc.h index af45dcfef509..374e940b2e9a 100644 --- a/packages/ml/src/Utils/ml_petsc.h +++ b/packages/ml/src/Utils/ml_petsc.h @@ -29,3 +29,10 @@ typedef KSP ML_PetscKSP; #endif /*ifdef HAVE_ML_PETSC*/ #endif /* define ML_PETSC_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_rbm.h b/packages/ml/src/Utils/ml_rbm.h index c762f0a1c26e..51e3f54685cf 100644 --- a/packages/ml/src/Utils/ml_rbm.h +++ b/packages/ml/src/Utils/ml_rbm.h @@ -33,3 +33,10 @@ extern int ML_Coord2RBM(int Nnodes, double x[], double y[], double z[], double r #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_read_utils.h b/packages/ml/src/Utils/ml_read_utils.h index e58b6a1168d6..318ffde317ca 100644 --- a/packages/ml/src/Utils/ml_read_utils.h +++ b/packages/ml/src/Utils/ml_read_utils.h @@ -61,3 +61,10 @@ extern int ML_strcmp(char *input, char *string); #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_self.h b/packages/ml/src/Utils/ml_self.h index 518f4eb13872..fec04997a824 100644 --- a/packages/ml/src/Utils/ml_self.h +++ b/packages/ml/src/Utils/ml_self.h @@ -34,3 +34,10 @@ extern void ML_Self_Destroy(void * Self_Handle); #endif #endif /* #ifndef ML_SELF_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_self_wrap.h b/packages/ml/src/Utils/ml_self_wrap.h index ca6307517278..f3c0952f820f 100644 --- a/packages/ml/src/Utils/ml_self_wrap.h +++ b/packages/ml/src/Utils/ml_self_wrap.h @@ -36,3 +36,10 @@ int ML_Gen_Smoother_Self(ML *ml, int Overlap, int nl, int pre_or_post, #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_superlu_lapack.h b/packages/ml/src/Utils/ml_superlu_lapack.h index 9d5fa41939ba..fe473b4392f7 100644 --- a/packages/ml/src/Utils/ml_superlu_lapack.h +++ b/packages/ml/src/Utils/ml_superlu_lapack.h @@ -18,3 +18,10 @@ #endif #endif #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_twogrid_analysis.h b/packages/ml/src/Utils/ml_twogrid_analysis.h index bd7917ed6921..7e050d932b38 100644 --- a/packages/ml/src/Utils/ml_twogrid_analysis.h +++ b/packages/ml/src/Utils/ml_twogrid_analysis.h @@ -48,3 +48,10 @@ double ML_GetTwoLevelConvergenceFactor(ML *ml, double *approx_soln, #endif /*ifdef __MLTWOGRID__*/ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_utils.h b/packages/ml/src/Utils/ml_utils.h index ae4b68820bc6..a54f3dd2dc29 100644 --- a/packages/ml/src/Utils/ml_utils.h +++ b/packages/ml/src/Utils/ml_utils.h @@ -248,3 +248,10 @@ std::cout << "--- Leaving: #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_vampir.h b/packages/ml/src/Utils/ml_vampir.h index 2b1120b37959..0fbc812f971a 100644 --- a/packages/ml/src/Utils/ml_vampir.h +++ b/packages/ml/src/Utils/ml_vampir.h @@ -41,3 +41,10 @@ extern void ML_Vampir_Setup(void); #endif /*ifdef ML_VAMPIR*/ #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_vec.h b/packages/ml/src/Utils/ml_vec.h index ea3d86882e7e..d649bebeffc3 100644 --- a/packages/ml/src/Utils/ml_vec.h +++ b/packages/ml/src/Utils/ml_vec.h @@ -73,3 +73,10 @@ extern int ML_DVector_Print(int length, double *data, char *label, ML_Comm *comm #endif + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_viz_opendx.h b/packages/ml/src/Utils/ml_viz_opendx.h index 1fb272fb8709..b27af0c5e65d 100644 --- a/packages/ml/src/Utils/ml_viz_opendx.h +++ b/packages/ml/src/Utils/ml_viz_opendx.h @@ -33,3 +33,10 @@ extern "C" { #endif #endif /* #ifndef __MLVIZOPENDX__ */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_viz_vtk.h b/packages/ml/src/Utils/ml_viz_vtk.h index 1fabe6eeae02..d304fdc032f8 100644 --- a/packages/ml/src/Utils/ml_viz_vtk.h +++ b/packages/ml/src/Utils/ml_viz_vtk.h @@ -28,3 +28,10 @@ int ML_PlotVTK(int Npoints, double* x, double* y, double* z, #endif /* #ifndef ML_VIZ_VTK_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/ml/src/Utils/ml_viz_xyz.h b/packages/ml/src/Utils/ml_viz_xyz.h index b0e1a38e529e..6a06c3606f41 100644 --- a/packages/ml/src/Utils/ml_viz_xyz.h +++ b/packages/ml/src/Utils/ml_viz_xyz.h @@ -31,3 +31,10 @@ int ML_PlotXYZ(int Npoints, double* x, double* y, double* z, #endif /* #ifndef ML_VIZ_XYZ_H */ + +#if defined(ML_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ML package is deprecated" +#endif +#endif + diff --git a/packages/new_package/README b/packages/new_package/README index 83873f500357..2e90d893c77b 100644 --- a/packages/new_package/README +++ b/packages/new_package/README @@ -24,6 +24,16 @@ # # ************************************************************************ +******************************************************************** +**************************** NOTICE ******************************** +******************************************************************** +* +* This New Package method is no longer supported. Please see the +* following Wiki page for adding a new package: +* https://github.com/trilinos/Trilinos/wiki/Adding-a-New-Package +* +******************************************************************** + Useful Terminology: new package - A package to be added to the Trilinos Autotools configure/build process. diff --git a/packages/pliris/CMakeLists.txt b/packages/pliris/CMakeLists.txt index 2f4ef687dd65..92af1c1919b2 100644 --- a/packages/pliris/CMakeLists.txt +++ b/packages/pliris/CMakeLists.txt @@ -10,6 +10,8 @@ TRIBITS_PACKAGE(Pliris) # B) Set up package-specific options # +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() + TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_ZCPLX ZCPLX "Enable double precision complex functionality." diff --git a/packages/pliris/cmake/Pliris_config.h.in b/packages/pliris/cmake/Pliris_config.h.in index 951af5da0d51..982351640056 100644 --- a/packages/pliris/cmake/Pliris_config.h.in +++ b/packages/pliris/cmake/Pliris_config.h.in @@ -38,3 +38,6 @@ /* Define to rpl_malloc if the replacement function should be used. */ #cmakedefine malloc + +#cmakedefine Pliris_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/pliris/src/BLAS_prototypes.h b/packages/pliris/src/BLAS_prototypes.h index 58c1c776bc25..bc3f4bb1557c 100644 --- a/packages/pliris/src/BLAS_prototypes.h +++ b/packages/pliris/src/BLAS_prototypes.h @@ -142,3 +142,10 @@ double ddot(int n, double *dx, int incx, double *dy, int incy); dcomplex zdotu(int n, dcomplex *sx, int incx, dcomplex *sy, int incy); #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/Pliris.h b/packages/pliris/src/Pliris.h index 7f45bef57aa0..fb304a96aa3c 100644 --- a/packages/pliris/src/Pliris.h +++ b/packages/pliris/src/Pliris.h @@ -229,3 +229,10 @@ class Pliris { #endif /* _PLIRIS_H_ */ + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/PlirisVersion.h b/packages/pliris/src/PlirisVersion.h index 23221812ab55..2548dccbf138 100644 --- a/packages/pliris/src/PlirisVersion.h +++ b/packages/pliris/src/PlirisVersion.h @@ -49,3 +49,10 @@ string Pliris_Version(); #endif // PLIRIS_VERSION_HPP + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/Pliris_ConfigDefs.h b/packages/pliris/src/Pliris_ConfigDefs.h index 1eaf7c6fb212..1fadacbcf97a 100644 --- a/packages/pliris/src/Pliris_ConfigDefs.h +++ b/packages/pliris/src/Pliris_ConfigDefs.h @@ -91,3 +91,10 @@ using std::string; #endif // PLIRIS_CONFIGDEFS_H + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/block.h b/packages/pliris/src/block.h index 17f80b73cdbf..1a0d909df0c6 100644 --- a/packages/pliris/src/block.h +++ b/packages/pliris/src/block.h @@ -51,3 +51,10 @@ #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/cblassp.h b/packages/pliris/src/cblassp.h index 5b17cc634dd2..6e0257a99094 100644 --- a/packages/pliris/src/cblassp.h +++ b/packages/pliris/src/cblassp.h @@ -60,3 +60,10 @@ #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/clean_code.h b/packages/pliris/src/clean_code.h index 592dbda22ee2..69f1c4af661f 100644 --- a/packages/pliris/src/clean_code.h +++ b/packages/pliris/src/clean_code.h @@ -54,3 +54,10 @@ void cleancode_ ( ) ; } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/dblassp.h b/packages/pliris/src/dblassp.h index 4a2e93cba629..af656888f9d3 100644 --- a/packages/pliris/src/dblassp.h +++ b/packages/pliris/src/dblassp.h @@ -62,3 +62,10 @@ + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/defines.h b/packages/pliris/src/defines.h index 1a44735b7f8a..f8e09808ace6 100644 --- a/packages/pliris/src/defines.h +++ b/packages/pliris/src/defines.h @@ -198,3 +198,10 @@ #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/distribute.h b/packages/pliris/src/distribute.h index 44abde2d3086..78b12cac8f39 100644 --- a/packages/pliris/src/distribute.h +++ b/packages/pliris/src/distribute.h @@ -67,3 +67,10 @@ void distmat_( #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/exchange_pivots.h b/packages/pliris/src/exchange_pivots.h index 478d0a9b1214..98c87f08bd16 100644 --- a/packages/pliris/src/exchange_pivots.h +++ b/packages/pliris/src/exchange_pivots.h @@ -55,3 +55,10 @@ void exchange_pivots(int *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/extern_vars.h b/packages/pliris/src/extern_vars.h index c86de54b786a..e094a6095e2b 100644 --- a/packages/pliris/src/extern_vars.h +++ b/packages/pliris/src/extern_vars.h @@ -92,3 +92,10 @@ extern MPI_Comm row_comm,col_comm; + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/factor.h b/packages/pliris/src/factor.h index 1fb594db5e76..337200581bdb 100644 --- a/packages/pliris/src/factor.h +++ b/packages/pliris/src/factor.h @@ -57,3 +57,10 @@ void factor(DATA_TYPE *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/forward.h b/packages/pliris/src/forward.h index d6a2b74e5dcb..adf1f0fd8b53 100644 --- a/packages/pliris/src/forward.h +++ b/packages/pliris/src/forward.h @@ -56,3 +56,10 @@ void forward(DATA_TYPE *, DATA_TYPE *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/forwardall.h b/packages/pliris/src/forwardall.h index 45b012ed3be7..262019dbbd8b 100644 --- a/packages/pliris/src/forwardall.h +++ b/packages/pliris/src/forwardall.h @@ -58,3 +58,10 @@ void forwardall(DATA_TYPE *, int *, DATA_TYPE *, } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/init.h b/packages/pliris/src/init.h index 5d3d0d6bb505..28a1ce081d26 100644 --- a/packages/pliris/src/init.h +++ b/packages/pliris/src/init.h @@ -62,3 +62,10 @@ void mat_vec(DATA_TYPE *, int , DATA_TYPE *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/macros.h b/packages/pliris/src/macros.h index 0438dfd6484a..3686ad34900c 100644 --- a/packages/pliris/src/macros.h +++ b/packages/pliris/src/macros.h @@ -62,3 +62,10 @@ #define proc_num(R,C) ((R)*nprocs_row + (C)) #define mac_send_msg(D,B,S,T) MPI_Send(B,S,MPI_CHAR,D,T,MPI_COMM_WORLD) + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/mytime.h b/packages/pliris/src/mytime.h index d4cece752582..fd0bb5de476d 100644 --- a/packages/pliris/src/mytime.h +++ b/packages/pliris/src/mytime.h @@ -55,3 +55,10 @@ void showtime(char *, double *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/pcomm.h b/packages/pliris/src/pcomm.h index b18f05d33bbc..ccef4f2695bd 100644 --- a/packages/pliris/src/pcomm.h +++ b/packages/pliris/src/pcomm.h @@ -56,3 +56,10 @@ double max_all(double , int ); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/perm1.h b/packages/pliris/src/perm1.h index 10ea171e2b3e..c62506866b44 100644 --- a/packages/pliris/src/perm1.h +++ b/packages/pliris/src/perm1.h @@ -57,3 +57,10 @@ void perm1_(DATA_TYPE *, int *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/permute.h b/packages/pliris/src/permute.h index 076efdddf264..2da52f79757f 100644 --- a/packages/pliris/src/permute.h +++ b/packages/pliris/src/permute.h @@ -56,3 +56,10 @@ extern "C" { } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/permute_mat.h b/packages/pliris/src/permute_mat.h index 60287b4ffaca..00366ca6cb7d 100644 --- a/packages/pliris/src/permute_mat.h +++ b/packages/pliris/src/permute_mat.h @@ -55,3 +55,10 @@ void permute_mat(DATA_TYPE *,int *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/permute_rhs.h b/packages/pliris/src/permute_rhs.h index 4ee95a09baf1..bbd0c151c17f 100644 --- a/packages/pliris/src/permute_rhs.h +++ b/packages/pliris/src/permute_rhs.h @@ -55,3 +55,10 @@ void permute_rhs(DATA_TYPE *,int *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/sblassp.h b/packages/pliris/src/sblassp.h index ba6301cc3c0e..328fe8be6e83 100644 --- a/packages/pliris/src/sblassp.h +++ b/packages/pliris/src/sblassp.h @@ -62,3 +62,10 @@ + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/solve.h b/packages/pliris/src/solve.h index 107275071a51..419f6e3e30b0 100644 --- a/packages/pliris/src/solve.h +++ b/packages/pliris/src/solve.h @@ -58,3 +58,10 @@ void back_solve6(DATA_TYPE *, DATA_TYPE *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/vars.h b/packages/pliris/src/vars.h index acaecd0e3dbe..cfbb4b9c723e 100644 --- a/packages/pliris/src/vars.h +++ b/packages/pliris/src/vars.h @@ -99,3 +99,10 @@ MPI_Comm row_comm,col_comm; /* volatile int MSPLIT; ZGEMM splitting parameter */ #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/x_factor.h b/packages/pliris/src/x_factor.h index 9cb089f1bcd6..8ab25ca4cfb7 100644 --- a/packages/pliris/src/x_factor.h +++ b/packages/pliris/src/x_factor.h @@ -57,3 +57,10 @@ void X_FACTOR_ (DATA_TYPE *, int *,int *, int *, double *); } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/x_solve.h b/packages/pliris/src/x_solve.h index 024b91290d1c..5d14053bd19d 100644 --- a/packages/pliris/src/x_solve.h +++ b/packages/pliris/src/x_solve.h @@ -62,3 +62,10 @@ void X_SOLVE_ (DATA_TYPE *, /* Matrix input*/ } #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/xlu_solve.h b/packages/pliris/src/xlu_solve.h index bbabc5145e19..356ff6f07fba 100644 --- a/packages/pliris/src/xlu_solve.h +++ b/packages/pliris/src/xlu_solve.h @@ -65,3 +65,10 @@ double seconds_(double *); #endif #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/pliris/src/zblassp.h b/packages/pliris/src/zblassp.h index db74db083986..f727bbb88163 100644 --- a/packages/pliris/src/zblassp.h +++ b/packages/pliris/src/zblassp.h @@ -60,3 +60,10 @@ #endif + +#if defined(Pliris_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Pliris package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/CMakeLists.txt b/packages/shylu/shylu_dd/core/CMakeLists.txt index 31a16d11f2db..8d042d0b475d 100644 --- a/packages/shylu/shylu_dd/core/CMakeLists.txt +++ b/packages/shylu/shylu_dd/core/CMakeLists.txt @@ -1,5 +1,7 @@ TRIBITS_SUBPACKAGE(Core) +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() + ADD_SUBDIRECTORY(src) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/shylu/shylu_dd/core/cmake/ShyLU_DDCore_config.h.in b/packages/shylu/shylu_dd/core/cmake/ShyLU_DDCore_config.h.in index 55d6a16fca5f..fb3035c500b4 100644 --- a/packages/shylu/shylu_dd/core/cmake/ShyLU_DDCore_config.h.in +++ b/packages/shylu/shylu_dd/core/cmake/ShyLU_DDCore_config.h.in @@ -11,3 +11,6 @@ #cmakedefine HAVE_SHYLU_DDCORE_AMESOS2 + +#cmakedefine ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/shylu/shylu_dd/core/src/epetra/IQRSolver.h b/packages/shylu/shylu_dd/core/src/epetra/IQRSolver.h index 23337274846a..8a6437c147e4 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/IQRSolver.h +++ b/packages/shylu/shylu_dd/core/src/epetra/IQRSolver.h @@ -106,3 +106,10 @@ class IQRSolver { } /* namespace IQR */ #endif /* IQRSOLVER_H_ */ + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/Ifpack_ShyLU.h b/packages/shylu/shylu_dd/core/src/epetra/Ifpack_ShyLU.h index 03f9b5aab303..ea64309033e8 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/Ifpack_ShyLU.h +++ b/packages/shylu/shylu_dd/core/src/epetra/Ifpack_ShyLU.h @@ -373,3 +373,10 @@ int JustTryIt() ; }; #endif /* IFPACK_SHYLU_H */ + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu.h b/packages/shylu/shylu_dd/core/src/epetra/shylu.h index eabb1cf630d3..33ca59836247 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu.h @@ -223,3 +223,10 @@ Teuchos::RCP computeSchur_GuidedProbing Epetra_Map *localDRowMap ); #endif // SHYLU_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_amesos_schur_operator.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_amesos_schur_operator.h index bf1878f23557..96b437c09f84 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_amesos_schur_operator.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_amesos_schur_operator.h @@ -324,3 +324,10 @@ class AmesosSchurOperator: public Epetra_Operator }; #endif /* IFPACK_AMESOS2_H */ + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_config.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_config.h index 946e2a63abbc..70ce5e9046dd 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_config.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_config.h @@ -68,3 +68,10 @@ typedef struct } shylu_config; #endif // SHYLU_CONFIG_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface.hpp b/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface.hpp index dad00b063afc..9cf9196b9c06 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface.hpp +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface.hpp @@ -54,3 +54,10 @@ #include "shylu_directsolver_interface_def.hpp" #endif + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface_decl.hpp b/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface_decl.hpp index 9c9fa50b0d16..5d4669759787 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface_decl.hpp +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface_decl.hpp @@ -145,3 +145,10 @@ class DirectSolverInterface }// end namespace #endif //end header if + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface_def.hpp b/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface_def.hpp index 730a0ae34ac0..aa2221893ad9 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface_def.hpp +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_directsolver_interface_def.hpp @@ -267,3 +267,10 @@ int DirectSolverInterface::solveAmesos2(Vector* b, Vector* x) }// end namespace #endif // end header if + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_internal.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_internal.h index a70e329fb69d..d68d7cc22689 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_internal.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_internal.h @@ -64,3 +64,10 @@ int extract_matrices ); #endif //SHYLU_INTERNAL_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_internal_gmres.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_internal_gmres.h index f0ce884fb5e0..e3cfe7493ab7 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_internal_gmres.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_internal_gmres.h @@ -202,3 +202,10 @@ int GMRES(const Operator &A, MultiVector &x, const MultiVector &b, } // namespace IQR #endif // IQR_GMRES_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_internal_gmres_tools.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_internal_gmres_tools.h index 75693b65a27d..073e60ee90ca 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_internal_gmres_tools.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_internal_gmres_tools.h @@ -254,3 +254,10 @@ int GMRESManager< Map, MultiVector, } // namespace IQR #endif // IQR_GMRES_TOOLS_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_local_schur_operator.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_local_schur_operator.h index 50cf67bbfc7b..a0eaf1684c48 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_local_schur_operator.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_local_schur_operator.h @@ -133,3 +133,10 @@ class ShyLU_Local_Schur_Operator : public virtual Epetra_Operator }; #endif // SHYLU_LOCAL_SCHUR_OPERATOR_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface.hpp b/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface.hpp index 393a63588fb5..fdff5626ce1f 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface.hpp +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface.hpp @@ -5,3 +5,10 @@ #include "shylu_partition_interface_def.hpp" #endif + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface_decl.hpp b/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface_decl.hpp index 2c44f38b11a1..2b35f0412039 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface_decl.hpp +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface_decl.hpp @@ -129,3 +129,10 @@ class PartitionInterface + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface_def.hpp b/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface_def.hpp index 50c08b6dff37..2270aeb52fa2 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface_def.hpp +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_partition_interface_def.hpp @@ -230,3 +230,10 @@ Epetra_MultiVector* PartitionInterface::re } #endif + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_probing_operator.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_probing_operator.h index 44820e3e99ff..0eb88d1e09f0 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_probing_operator.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_probing_operator.h @@ -125,3 +125,10 @@ class ShyLU_Probing_Operator : public virtual Epetra_Operator }; #endif // SHYLU_PROBING_OPERATOR_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_symbolic.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_symbolic.h index 64729ceed2eb..785c664059f9 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_symbolic.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_symbolic.h @@ -76,3 +76,10 @@ typedef struct #endif // SHYLU_SYMBOLIC_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/epetra/shylu_util.h b/packages/shylu/shylu_dd/core/src/epetra/shylu_util.h index 5a42c2564e90..4a34134c65f6 100644 --- a/packages/shylu/shylu_dd/core/src/epetra/shylu_util.h +++ b/packages/shylu/shylu_dd/core/src/epetra/shylu_util.h @@ -122,3 +122,10 @@ void findBlockElems(Epetra_CrsMatrix *A, int nrows, int *rows, int *gvals, #endif #endif //SHYLU_UTIL_H + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface.hpp b/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface.hpp index 27220f918e6f..05bdab8ef2c6 100644 --- a/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface.hpp +++ b/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface.hpp @@ -5,3 +5,10 @@ #include "shylu_iterativesolver_interface_def.hpp" #endif //end ifndef shylu_iterativesolver_interface_hpp + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface_decl.hpp b/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface_decl.hpp index 9c849d2ebaf4..23c27aa6dc59 100644 --- a/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface_decl.hpp +++ b/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface_decl.hpp @@ -110,3 +110,10 @@ namespace ShyLU }//end namespace ShyLU #endif + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface_def.hpp b/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface_def.hpp index 3c5464a1c13d..20cf2271945c 100644 --- a/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface_def.hpp +++ b/packages/shylu/shylu_dd/core/src/interfaces/shylu_iterativesolver_interface_def.hpp @@ -227,3 +227,10 @@ namespace ShyLU }//end namespace shylu #endif //end ifdef shylu_interative_fie + +#if defined(ShyLU_DDCore_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ShyLU_DDCore package is deprecated" +#endif +#endif + diff --git a/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/main.cpp b/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/main.cpp index bc425df47412..9e9da645069c 100644 --- a/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/main.cpp +++ b/packages/shylu/shylu_dd/frosch/test/Thyra_Xpetra_Elasticity/main.cpp @@ -279,6 +279,10 @@ int main(int argc, char *argv[]) StackedTimer::OutputOptions options; options.output_fraction = options.output_histogram = options.output_minmax = true; stackedTimer->report(*out,CommWorld,options); + std::string watchrProblemName = std::string("FROSch Elasticity ") + std::to_string(Comm->getSize()) + " ranks"; + auto xmlOut = stackedTimer->reportWatchrXML(watchrProblemName, Comm); + if (xmlOut.length()) + std::cout << "\nAlso created Watchr performance report " << xmlOut << '\n'; return(EXIT_SUCCESS); diff --git a/packages/teuchos/parameterlist/src/Teuchos_ParameterList.cpp b/packages/teuchos/parameterlist/src/Teuchos_ParameterList.cpp index 25f1d18f6260..285af85ff515 100644 --- a/packages/teuchos/parameterlist/src/Teuchos_ParameterList.cpp +++ b/packages/teuchos/parameterlist/src/Teuchos_ParameterList.cpp @@ -519,6 +519,7 @@ void ParameterList::modifyParameterList(ParameterList & valid_pl, RCP modifier; if (nonnull(modifier = valid_pl.getModifier())) { modifier->modify(*this, valid_pl); + this->setModifier(modifier); } ConstIterator itr; for (itr = valid_pl.begin(); itr != valid_pl.end(); ++itr){ diff --git a/packages/teuchos/parameterlist/test/ParameterList/ParameterList_UnitTests.cpp b/packages/teuchos/parameterlist/test/ParameterList/ParameterList_UnitTests.cpp index cdead39cbfca..c57b924f8b0f 100644 --- a/packages/teuchos/parameterlist/test/ParameterList/ParameterList_UnitTests.cpp +++ b/packages/teuchos/parameterlist/test/ParameterList/ParameterList_UnitTests.cpp @@ -977,6 +977,20 @@ TEUCHOS_UNIT_TEST( ParameterList, simpleModifierModifyReconcile ) } +TEUCHOS_UNIT_TEST( ParameterList, modify_CopiesModifiers ) { + RCP mod_top = rcp(new ParameterListModifier("Modifier Top")); + RCP mod_A = rcp(new ParameterListModifier("Modifier A")); + RCP mod_B = rcp(new ParameterListModifier("Modifier B")); + ParameterList input{"Plist"}, valid{"Plist", mod_top}; + input.sublist("A").sublist("B"); + valid.sublist("A", mod_A); + valid.sublist("A").sublist("B", mod_B); + input.modifyParameterList(valid); + // This calls `haveSameModifiers` to make sure they are all copied to `input` + TEST_EQUALITY(input, valid); +} + + TEUCHOS_UNIT_TEST( ParameterList, nestedSublistExpansion ) { Teuchos::RCP modifier = Teuchos::rcp(new SimpleModifier()); Teuchos::RCP sub_modifier = Teuchos::rcp(new SimpleSubModifier()); diff --git a/packages/thyra/adapters/epetra/src/Thyra_DiagonalEpetraLinearOpWithSolveFactory.hpp b/packages/thyra/adapters/epetra/src/Thyra_DiagonalEpetraLinearOpWithSolveFactory.hpp index 41f8843f34e2..d371ab0e61bf 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_DiagonalEpetraLinearOpWithSolveFactory.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_DiagonalEpetraLinearOpWithSolveFactory.hpp @@ -106,3 +106,10 @@ class DiagonalEpetraLinearOpWithSolveFactory : public LinearOpWithSolveFactoryBa #endif // THYRA_DIAGONAL_EPETRA_LINEAR_OP_WITH_SOLVE_FACTORY_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/src/Thyra_EpetraLinearOp.hpp b/packages/thyra/adapters/epetra/src/Thyra_EpetraLinearOp.hpp index 71bf163ccfe6..9c1a57a38e02 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_EpetraLinearOp.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_EpetraLinearOp.hpp @@ -522,3 +522,10 @@ epetraLinearOp( #endif // THYRA_EPETRA_LINEAR_OP_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/src/Thyra_EpetraLinearOpBase.hpp b/packages/thyra/adapters/epetra/src/Thyra_EpetraLinearOpBase.hpp index 564c578ea086..2763ee419b6a 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_EpetraLinearOpBase.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_EpetraLinearOpBase.hpp @@ -188,3 +188,10 @@ class EpetraLinearOpBase : virtual public Teuchos::Describable { #endif // THYRA_EPETRA_LINEAR_OP_BASE_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorViewExtractorBase.hpp b/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorViewExtractorBase.hpp index d28cbcd5240a..2523878d4aad 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorViewExtractorBase.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorViewExtractorBase.hpp @@ -198,3 +198,10 @@ class EpetraOperatorViewExtractorBase : virtual public Teuchos::Describable #endif // THYRA_EPETRA_OPERATOR_VIEW_EXTRACTOR_BASE_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorViewExtractorStd.hpp b/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorViewExtractorStd.hpp index 5158f9361652..b6fca1498be3 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorViewExtractorStd.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorViewExtractorStd.hpp @@ -93,3 +93,10 @@ class EpetraOperatorViewExtractorStd : virtual public EpetraOperatorViewExtracto #endif // THYRA_EPETRA_OPERATOR_VIEW_EXTRACTOR_STD_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorWrapper.hpp b/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorWrapper.hpp index 2b2d5632da6d..0f9c96b5b0f8 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorWrapper.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_EpetraOperatorWrapper.hpp @@ -158,3 +158,10 @@ makeEpetraWrapper(const RCP > &thyraOp); #endif // THYRA_EPETRA_OPERATOR_WRAPPER_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/src/Thyra_EpetraThyraWrappers.hpp b/packages/thyra/adapters/epetra/src/Thyra_EpetraThyraWrappers.hpp index a3b86741c877..a246c176b9ce 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_EpetraThyraWrappers.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_EpetraThyraWrappers.hpp @@ -486,3 +486,10 @@ get_Epetra_MultiVector( #endif // THYRA_EPETRA_THYRA_WRAPPERS_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/src/Thyra_EpetraTypes.hpp b/packages/thyra/adapters/epetra/src/Thyra_EpetraTypes.hpp index 6d5e9b1e2e8e..65f4c3fe2bdd 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_EpetraTypes.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_EpetraTypes.hpp @@ -122,3 +122,10 @@ class EpetraLinearOp; } // namespace Thyra #endif // THYRA_EPETRA_TYPES_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/src/Thyra_get_Epetra_Operator.hpp b/packages/thyra/adapters/epetra/src/Thyra_get_Epetra_Operator.hpp index 9617b7c27653..88a45f54b8e6 100644 --- a/packages/thyra/adapters/epetra/src/Thyra_get_Epetra_Operator.hpp +++ b/packages/thyra/adapters/epetra/src/Thyra_get_Epetra_Operator.hpp @@ -137,3 +137,10 @@ get_Epetra_Operator( const LinearOpBase &op ); #endif // THYRA_GET_EPETRA_OPERATOR_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/test/UnitTests/EpetraLinearOpTestHelpers.hpp b/packages/thyra/adapters/epetra/test/UnitTests/EpetraLinearOpTestHelpers.hpp index ed7f1467ebcb..cc76bdbd69fa 100644 --- a/packages/thyra/adapters/epetra/test/UnitTests/EpetraLinearOpTestHelpers.hpp +++ b/packages/thyra/adapters/epetra/test/UnitTests/EpetraLinearOpTestHelpers.hpp @@ -83,3 +83,10 @@ RCP getEpetraMatrix(int numRows, int numCols, double shift=0.0 } // namespace + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetra/test/UnitTests/EpetraThyraAdaptersTestHelpers.hpp b/packages/thyra/adapters/epetra/test/UnitTests/EpetraThyraAdaptersTestHelpers.hpp index 5c54b1ae816b..5ad96da475d4 100644 --- a/packages/thyra/adapters/epetra/test/UnitTests/EpetraThyraAdaptersTestHelpers.hpp +++ b/packages/thyra/adapters/epetra/test/UnitTests/EpetraThyraAdaptersTestHelpers.hpp @@ -102,3 +102,10 @@ RCP getEpetraComm() } // namespace + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetraext/src/model_evaluator/Thyra_EpetraModelEvaluator.hpp b/packages/thyra/adapters/epetraext/src/model_evaluator/Thyra_EpetraModelEvaluator.hpp index ecd03be5f4ac..2a3bea11c1c7 100644 --- a/packages/thyra/adapters/epetraext/src/model_evaluator/Thyra_EpetraModelEvaluator.hpp +++ b/packages/thyra/adapters/epetraext/src/model_evaluator/Thyra_EpetraModelEvaluator.hpp @@ -535,3 +535,10 @@ convert( #endif // THYRA_EPETRA_MODEL_EVALUATOR_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraExtAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtAddTransformer.hpp b/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtAddTransformer.hpp index e09d0d222980..ee84c11739b8 100644 --- a/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtAddTransformer.hpp +++ b/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtAddTransformer.hpp @@ -95,3 +95,10 @@ epetraExtAddTransformer() #endif // THYRA_EPETRAEXT_ADD_TRANSFORMER_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraExtAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtDiagScaledMatProdTransformer.hpp b/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtDiagScaledMatProdTransformer.hpp index 053d25191d5a..7fb20fa09d0c 100644 --- a/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtDiagScaledMatProdTransformer.hpp +++ b/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtDiagScaledMatProdTransformer.hpp @@ -96,3 +96,10 @@ epetraExtDiagScaledMatProdTransformer() #endif // THYRA_EPETRAEXT_DIAG_SCALED_MAT_PROD_TRANSFORMER_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraExtAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtDiagScalingTransformer.hpp b/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtDiagScalingTransformer.hpp index 7a615212ec38..1e65e625ec9d 100644 --- a/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtDiagScalingTransformer.hpp +++ b/packages/thyra/adapters/epetraext/src/transformer/Thyra_EpetraExtDiagScalingTransformer.hpp @@ -96,3 +96,10 @@ epetraExtDiagScalingTransformer() #endif // THYRA_EPETRAEXT_DIAG_SCALED_MAT_PROD_TRANSFORMER_HPP + +#if defined(Thyra_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The ThyraEpetraExtAdapters package is deprecated" +#endif +#endif + diff --git a/packages/thyra/core/cmake/Thyra_Config.h.in b/packages/thyra/core/cmake/Thyra_Config.h.in index 2aed7bec7aad..fab8e709e0f5 100755 --- a/packages/thyra/core/cmake/Thyra_Config.h.in +++ b/packages/thyra/core/cmake/Thyra_Config.h.in @@ -16,3 +16,5 @@ @THYRA_TEUCHOS_TIME_MONITOR_DECLARATIONS@ @THYRA_DEPRECATED_DECLARATIONS@ + +#cmakedefine Thyra_SHOW_DEPRECATED_WARNINGS diff --git a/packages/triutils/CMakeLists.txt b/packages/triutils/CMakeLists.txt index 7d23be723e6b..2a397149a906 100644 --- a/packages/triutils/CMakeLists.txt +++ b/packages/triutils/CMakeLists.txt @@ -2,6 +2,8 @@ TRIBITS_PACKAGE(Triutils) +TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() + ADD_SUBDIRECTORY(src) TRIBITS_ADD_TEST_DIRECTORIES(test) diff --git a/packages/triutils/cmake/Triutils_config.h.in b/packages/triutils/cmake/Triutils_config.h.in index e0fb02f032da..339721ee501b 100644 --- a/packages/triutils/cmake/Triutils_config.h.in +++ b/packages/triutils/cmake/Triutils_config.h.in @@ -102,3 +102,6 @@ /* Define if want to build with Epetra support. */ #cmakedefine HAVE_TRIUTILS_EPETRA + +#cmakedefine Triutils_SHOW_DEPRECATED_WARNINGS + diff --git a/packages/triutils/src/Trilinos_Util.h b/packages/triutils/src/Trilinos_Util.h index 31b59de1c266..d1a2d63a7a1e 100644 --- a/packages/triutils/src/Trilinos_Util.h +++ b/packages/triutils/src/Trilinos_Util.h @@ -503,3 +503,10 @@ int Trilinos_Util_ReadTriples2Epetra64( #endif //ifdef HAVE_TRIUTILS_EPETRA #endif /* _TRILINOS_UTIL_H_ */ + +#if defined(Triutils_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Triutils package is deprecated" +#endif +#endif + diff --git a/packages/triutils/src/Trilinos_Util_CommandLineParser.h b/packages/triutils/src/Trilinos_Util_CommandLineParser.h index 464a6481a8ad..f0453721d146 100644 --- a/packages/triutils/src/Trilinos_Util_CommandLineParser.h +++ b/packages/triutils/src/Trilinos_Util_CommandLineParser.h @@ -295,3 +295,10 @@ class InputFileReader : public Trilinos_Util_Map } // namespace Trilinos_Util #endif + +#if defined(Triutils_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Triutils package is deprecated" +#endif +#endif + diff --git a/packages/triutils/src/Trilinos_Util_CountMatrixMarket.h b/packages/triutils/src/Trilinos_Util_CountMatrixMarket.h index 8daa0daff407..995ad5c10475 100644 --- a/packages/triutils/src/Trilinos_Util_CountMatrixMarket.h +++ b/packages/triutils/src/Trilinos_Util_CountMatrixMarket.h @@ -81,3 +81,10 @@ void Trilinos_Util_CountMatrixMarket( const char *data_file, #endif #endif + +#if defined(Triutils_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Triutils package is deprecated" +#endif +#endif + diff --git a/packages/triutils/src/Trilinos_Util_CountTriples.h b/packages/triutils/src/Trilinos_Util_CountTriples.h index 000d89e789aa..78d78094695b 100644 --- a/packages/triutils/src/Trilinos_Util_CountTriples.h +++ b/packages/triutils/src/Trilinos_Util_CountTriples.h @@ -66,3 +66,10 @@ void Trilinos_Util_CountTriples( const char *data_file, bool ZeroBased=false ) ; #endif + +#if defined(Triutils_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Triutils package is deprecated" +#endif +#endif + diff --git a/packages/triutils/src/Trilinos_Util_CrsMatrixGallery.h b/packages/triutils/src/Trilinos_Util_CrsMatrixGallery.h index 36973302db01..ab4157cf4188 100644 --- a/packages/triutils/src/Trilinos_Util_CrsMatrixGallery.h +++ b/packages/triutils/src/Trilinos_Util_CrsMatrixGallery.h @@ -646,3 +646,10 @@ class VbrMatrixGallery : public CrsMatrixGallery } // namespace Trilinos_Util #endif + +#if defined(Triutils_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Triutils package is deprecated" +#endif +#endif + diff --git a/packages/triutils/src/Trilinos_Util_ReadMatrixMarket2Epetra.h b/packages/triutils/src/Trilinos_Util_ReadMatrixMarket2Epetra.h index 4f771627be1d..3dba33964041 100644 --- a/packages/triutils/src/Trilinos_Util_ReadMatrixMarket2Epetra.h +++ b/packages/triutils/src/Trilinos_Util_ReadMatrixMarket2Epetra.h @@ -78,3 +78,10 @@ int Trilinos_Util_ReadMatrixMarket2Epetra64( Epetra_Vector *&xexact ) ; #endif + +#if defined(Triutils_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Triutils package is deprecated" +#endif +#endif + diff --git a/packages/triutils/src/Trilinos_Util_Version.h b/packages/triutils/src/Trilinos_Util_Version.h index 7885f05120ff..f9797b6fe024 100644 --- a/packages/triutils/src/Trilinos_Util_Version.h +++ b/packages/triutils/src/Trilinos_Util_Version.h @@ -51,3 +51,10 @@ #endif // TRILINOS_UTIL_VERSION_H + +#if defined(Triutils_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Triutils package is deprecated" +#endif +#endif + diff --git a/packages/triutils/src/Trilinos_Util_iohb.h b/packages/triutils/src/Trilinos_Util_iohb.h index fcdf4f4f8296..eac01c101698 100644 --- a/packages/triutils/src/Trilinos_Util_iohb.h +++ b/packages/triutils/src/Trilinos_Util_iohb.h @@ -137,3 +137,10 @@ int ParseRfmt(char* fmt, int* perline, int* width, int* prec, int* flag); void IOHBTerminate(char* message); #endif + +#if defined(Triutils_SHOW_DEPRECATED_WARNINGS) +#ifdef __GNUC__ +#warning "The Triutils package is deprecated" +#endif +#endif +