Build System
during the copy procedure. For example, the first line of each test
script source file is now:
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
which means that the python executable that is recognized (and
compiled against) by the CMake build system will also be the python
diff --git a/packages/PyTrilinos/doc/DevelopersGuide/Testing.txt b/packages/PyTrilinos/doc/DevelopersGuide/Testing.txt
index 089946e00b03..c98a32442662 100644
--- a/packages/PyTrilinos/doc/DevelopersGuide/Testing.txt
+++ b/packages/PyTrilinos/doc/DevelopersGuide/Testing.txt
@@ -44,7 +44,7 @@ reason for this is that CMake variable values can be substituted
during the copy procedure. For example, the first line of each test
script source file is now::
- #! ${PYTHON_EXECUTABLE}
+ #! ${Python3_EXECUTABLE}
which means that the python executable that is recognized (and
compiled against) by the CMake build system will also be the python
diff --git a/packages/PyTrilinos/doc/Doxygen/CMakeLists.txt b/packages/PyTrilinos/doc/Doxygen/CMakeLists.txt
index 37dc7c7e38e7..d46df421389d 100644
--- a/packages/PyTrilinos/doc/Doxygen/CMakeLists.txt
+++ b/packages/PyTrilinos/doc/Doxygen/CMakeLists.txt
@@ -63,7 +63,7 @@ FOREACH(Package ${PyTrilinos_PACKAGES})
${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_${Package}
@ONLY
)
- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/docstrings.py
+ EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/docstrings.py
--doxygen=${DOXYGEN_EXECUTABLE} ${Package}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
ERROR_VARIABLE Doxy_CONVERT_ERROR)
diff --git a/packages/PyTrilinos/doc/Doxygen/docstrings.py.in b/packages/PyTrilinos/doc/Doxygen/docstrings.py.in
index c0a537af9b29..ac59b6b38cd6 100755
--- a/packages/PyTrilinos/doc/Doxygen/docstrings.py.in
+++ b/packages/PyTrilinos/doc/Doxygen/docstrings.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# System includes
from __future__ import print_function
diff --git a/packages/PyTrilinos/doc/Doxygen/doxy2swig.py.in b/packages/PyTrilinos/doc/Doxygen/doxy2swig.py.in
index ba7088ecc27e..878bd9721ffc 100755
--- a/packages/PyTrilinos/doc/Doxygen/doxy2swig.py.in
+++ b/packages/PyTrilinos/doc/Doxygen/doxy2swig.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
"""
Doxygen XML to SWIG docstring converter.
diff --git a/packages/PyTrilinos/doc/Doxygen/makedeps.py.in b/packages/PyTrilinos/doc/Doxygen/makedeps.py.in
index e7c18c441311..3a94a5590bfc 100755
--- a/packages/PyTrilinos/doc/Doxygen/makedeps.py.in
+++ b/packages/PyTrilinos/doc/Doxygen/makedeps.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
"""
Create a Makefile dependency file that includes all of the names of the source
diff --git a/packages/PyTrilinos/doc/UsersGuide/BuildingAndInstalling.txt b/packages/PyTrilinos/doc/UsersGuide/BuildingAndInstalling.txt
index 99b5ec781a64..0392cd4df3b2 100644
--- a/packages/PyTrilinos/doc/UsersGuide/BuildingAndInstalling.txt
+++ b/packages/PyTrilinos/doc/UsersGuide/BuildingAndInstalling.txt
@@ -62,7 +62,7 @@ Python and SWIG
You may specify the python interpreter (and thus the version of the
Python/C API) with the ``cmake`` option::
- -D PYTHON_EXECUTABLE:FILEPATH=...
+ -D Python3_EXECUTABLE:FILEPATH=...
If you do not specify this option, ``cmake`` actually looks for an
executable named ``python2.7`` (and then ``python2.6``, etc., down to
diff --git a/packages/PyTrilinos/doc/UsersGuide/UsersGuide.html b/packages/PyTrilinos/doc/UsersGuide/UsersGuide.html
index 6a2425e34a7d..377b14dd0b58 100644
--- a/packages/PyTrilinos/doc/UsersGuide/UsersGuide.html
+++ b/packages/PyTrilinos/doc/UsersGuide/UsersGuide.html
@@ -427,7 +427,7 @@
You may specify the python interpreter (and thus the version of the
Python/C API) with the cmake option:
--D PYTHON_EXECUTABLE:FILEPATH=...
+-D Python3_EXECUTABLE:FILEPATH=...
If you do not specify this option, cmake actually looks for an
executable named python2.7 (and then python2.6, etc., down to
diff --git a/packages/PyTrilinos/example/CMakeLists.txt b/packages/PyTrilinos/example/CMakeLists.txt
index e0b9d4f89ed2..725334ed2869 100644
--- a/packages/PyTrilinos/example/CMakeLists.txt
+++ b/packages/PyTrilinos/example/CMakeLists.txt
@@ -47,7 +47,7 @@ ENABLE_TESTING()
INCLUDE(PyTrilinosMakeTest)
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/testutil.py
- COMMAND ${PYTHON_EXECUTABLE}
+ COMMAND ${Python3_EXECUTABLE}
${PyTrilinos_BINARY_DIR}/util/copyWithCMakeSubstitutions.py
${CMAKE_CURRENT_SOURCE_DIR}/testutil.py.in
${CMAKE_CURRENT_BINARY_DIR}/testutil.py
@@ -57,7 +57,7 @@ ADD_CUSTOM_TARGET(PyTrilinos_Example_testutil ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/testutil.py)
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gre__115.rua
- COMMAND ${PYTHON_EXECUTABLE}
+ COMMAND ${Python3_EXECUTABLE}
${PyTrilinos_BINARY_DIR}/util/copyWithCMakeSubstitutions.py
${CMAKE_CURRENT_SOURCE_DIR}/gre__115.mx
${CMAKE_CURRENT_BINARY_DIR}/gre__115.rua
diff --git a/packages/PyTrilinos/example/exAmesos_Factory.py.in b/packages/PyTrilinos/example/exAmesos_Factory.py.in
index 0e3d3481ea00..8b2279f78c26 100755
--- a/packages/PyTrilinos/example/exAmesos_Factory.py.in
+++ b/packages/PyTrilinos/example/exAmesos_Factory.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exAmesos_Solvers.py.in b/packages/PyTrilinos/example/exAmesos_Solvers.py.in
index c056d4341ebf..273200a054ff 100755
--- a/packages/PyTrilinos/example/exAmesos_Solvers.py.in
+++ b/packages/PyTrilinos/example/exAmesos_Solvers.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exAnasazi_BlockDavidson.py.in b/packages/PyTrilinos/example/exAnasazi_BlockDavidson.py.in
index 2de10323d03f..69a94881498f 100755
--- a/packages/PyTrilinos/example/exAnasazi_BlockDavidson.py.in
+++ b/packages/PyTrilinos/example/exAnasazi_BlockDavidson.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exAztecOO.py.in b/packages/PyTrilinos/example/exAztecOO.py.in
index 0c3f04afacc9..23d357963874 100755
--- a/packages/PyTrilinos/example/exAztecOO.py.in
+++ b/packages/PyTrilinos/example/exAztecOO.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exAztecOO_BasicRowMatrix.py.in b/packages/PyTrilinos/example/exAztecOO_BasicRowMatrix.py.in
index e52348c1a679..83a21b88c21d 100755
--- a/packages/PyTrilinos/example/exAztecOO_BasicRowMatrix.py.in
+++ b/packages/PyTrilinos/example/exAztecOO_BasicRowMatrix.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exAztecOO_Operator.py.in b/packages/PyTrilinos/example/exAztecOO_Operator.py.in
index 9ad6a7d25254..d1690befac1c 100755
--- a/packages/PyTrilinos/example/exAztecOO_Operator.py.in
+++ b/packages/PyTrilinos/example/exAztecOO_Operator.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exAztecOO_RowMatrix.py.in b/packages/PyTrilinos/example/exAztecOO_RowMatrix.py.in
index dcc4f8e83e39..f9a2e09b7f1e 100755
--- a/packages/PyTrilinos/example/exAztecOO_RowMatrix.py.in
+++ b/packages/PyTrilinos/example/exAztecOO_RowMatrix.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exDomi_Simple.py.in b/packages/PyTrilinos/example/exDomi_Simple.py.in
index 89b739d115a7..1bb1b0f340f2 100755
--- a/packages/PyTrilinos/example/exDomi_Simple.py.in
+++ b/packages/PyTrilinos/example/exDomi_Simple.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetra.py.in b/packages/PyTrilinos/example/exEpetra.py.in
index f27b511520bb..49fcb6c0bee7 100755
--- a/packages/PyTrilinos/example/exEpetra.py.in
+++ b/packages/PyTrilinos/example/exEpetra.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetraExt_IO_HDF5.py.in b/packages/PyTrilinos/example/exEpetraExt_IO_HDF5.py.in
index 3d90da47e640..d35f64db9cd6 100755
--- a/packages/PyTrilinos/example/exEpetraExt_IO_HDF5.py.in
+++ b/packages/PyTrilinos/example/exEpetraExt_IO_HDF5.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetraExt_IO_MatrixMarket.py.in b/packages/PyTrilinos/example/exEpetraExt_IO_MatrixMarket.py.in
index 83e1df3fc8b3..fecc442d3b97 100755
--- a/packages/PyTrilinos/example/exEpetraExt_IO_MatrixMarket.py.in
+++ b/packages/PyTrilinos/example/exEpetraExt_IO_MatrixMarket.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetraExt_IO_XML.py.in b/packages/PyTrilinos/example/exEpetraExt_IO_XML.py.in
index 4c338604eb51..b56c447cd88e 100755
--- a/packages/PyTrilinos/example/exEpetraExt_IO_XML.py.in
+++ b/packages/PyTrilinos/example/exEpetraExt_IO_XML.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetraExt_MatrixMatrix.py.in b/packages/PyTrilinos/example/exEpetraExt_MatrixMatrix.py.in
index 4205551be1e0..d4fd5be9a91f 100755
--- a/packages/PyTrilinos/example/exEpetraExt_MatrixMatrix.py.in
+++ b/packages/PyTrilinos/example/exEpetraExt_MatrixMatrix.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetra_Comm.py.in b/packages/PyTrilinos/example/exEpetra_Comm.py.in
index ec499a8c3522..4286f676cd99 100755
--- a/packages/PyTrilinos/example/exEpetra_Comm.py.in
+++ b/packages/PyTrilinos/example/exEpetra_Comm.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetra_CrsMatrix_Easy.py.in b/packages/PyTrilinos/example/exEpetra_CrsMatrix_Easy.py.in
index 6abadf1e4338..ec6d02a78e13 100755
--- a/packages/PyTrilinos/example/exEpetra_CrsMatrix_Easy.py.in
+++ b/packages/PyTrilinos/example/exEpetra_CrsMatrix_Easy.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetra_CrsMatrix_Efficient.py.in b/packages/PyTrilinos/example/exEpetra_CrsMatrix_Efficient.py.in
index bedee3eb2148..59feca1aab25 100755
--- a/packages/PyTrilinos/example/exEpetra_CrsMatrix_Efficient.py.in
+++ b/packages/PyTrilinos/example/exEpetra_CrsMatrix_Efficient.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetra_DAP.py.in b/packages/PyTrilinos/example/exEpetra_DAP.py.in
index d112a8f45a05..a3a3fd165c43 100755
--- a/packages/PyTrilinos/example/exEpetra_DAP.py.in
+++ b/packages/PyTrilinos/example/exEpetra_DAP.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetra_FECrsMatrix_Easy.py.in b/packages/PyTrilinos/example/exEpetra_FECrsMatrix_Easy.py.in
index 72b75666e425..9e0d4f064d35 100755
--- a/packages/PyTrilinos/example/exEpetra_FECrsMatrix_Easy.py.in
+++ b/packages/PyTrilinos/example/exEpetra_FECrsMatrix_Easy.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exEpetra_ImportExport.py.in b/packages/PyTrilinos/example/exEpetra_ImportExport.py.in
index 37b690100d76..3880f9377ccf 100755
--- a/packages/PyTrilinos/example/exEpetra_ImportExport.py.in
+++ b/packages/PyTrilinos/example/exEpetra_ImportExport.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exGaleri.py.in b/packages/PyTrilinos/example/exGaleri.py.in
index 4625ae8061eb..172437b804f9 100755
--- a/packages/PyTrilinos/example/exGaleri.py.in
+++ b/packages/PyTrilinos/example/exGaleri.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exGaleri_ReadHB.py.in b/packages/PyTrilinos/example/exGaleri_ReadHB.py.in
index d4d291c2a5db..ef3028537641 100755
--- a/packages/PyTrilinos/example/exGaleri_ReadHB.py.in
+++ b/packages/PyTrilinos/example/exGaleri_ReadHB.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exIFPACK.py.in b/packages/PyTrilinos/example/exIFPACK.py.in
index 85da04dfe92a..b8848fd4ca40 100755
--- a/packages/PyTrilinos/example/exIFPACK.py.in
+++ b/packages/PyTrilinos/example/exIFPACK.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exIsorropia.py.in b/packages/PyTrilinos/example/exIsorropia.py.in
index 846367e6b23f..911ef3c3b8b4 100755
--- a/packages/PyTrilinos/example/exIsorropia.py.in
+++ b/packages/PyTrilinos/example/exIsorropia.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exKomplex_Simple.py.in b/packages/PyTrilinos/example/exKomplex_Simple.py.in
index e3f4e98b36c0..1fc22a553020 100755
--- a/packages/PyTrilinos/example/exKomplex_Simple.py.in
+++ b/packages/PyTrilinos/example/exKomplex_Simple.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exLOCA_Chan.py.in b/packages/PyTrilinos/example/exLOCA_Chan.py.in
index 95a3efc5d4b3..a7e713957dd2 100755
--- a/packages/PyTrilinos/example/exLOCA_Chan.py.in
+++ b/packages/PyTrilinos/example/exLOCA_Chan.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# ************************************************************************
diff --git a/packages/PyTrilinos/example/exLOCA_Chan_Jac.py.in b/packages/PyTrilinos/example/exLOCA_Chan_Jac.py.in
index 874930734eb3..ac2b993e8044 100755
--- a/packages/PyTrilinos/example/exLOCA_Chan_Jac.py.in
+++ b/packages/PyTrilinos/example/exLOCA_Chan_Jac.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# ************************************************************************
diff --git a/packages/PyTrilinos/example/exMLAPI.py.in b/packages/PyTrilinos/example/exMLAPI.py.in
index 80710cee17f6..2143e440ac8b 100755
--- a/packages/PyTrilinos/example/exMLAPI.py.in
+++ b/packages/PyTrilinos/example/exMLAPI.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exMLAPI_AztecOO.py.in b/packages/PyTrilinos/example/exMLAPI_AztecOO.py.in
index ecee9419a9e9..a54438b4211a 100755
--- a/packages/PyTrilinos/example/exMLAPI_AztecOO.py.in
+++ b/packages/PyTrilinos/example/exMLAPI_AztecOO.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exMLAPI_Iterate.py.in b/packages/PyTrilinos/example/exMLAPI_Iterate.py.in
index 146efc841ba2..a2dd0c6d8658 100755
--- a/packages/PyTrilinos/example/exMLAPI_Iterate.py.in
+++ b/packages/PyTrilinos/example/exMLAPI_Iterate.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exMLAPI_PyMatrix.py.in b/packages/PyTrilinos/example/exMLAPI_PyMatrix.py.in
index 840f36179e63..c7762fe76f36 100755
--- a/packages/PyTrilinos/example/exMLAPI_PyMatrix.py.in
+++ b/packages/PyTrilinos/example/exMLAPI_PyMatrix.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exMLAPI_Simple.py.in b/packages/PyTrilinos/example/exMLAPI_Simple.py.in
index aaef201b7f27..004b6d09f62a 100755
--- a/packages/PyTrilinos/example/exMLAPI_Simple.py.in
+++ b/packages/PyTrilinos/example/exMLAPI_Simple.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exMLAPI_Smoother.py.in b/packages/PyTrilinos/example/exMLAPI_Smoother.py.in
index ef3c891d3bcc..49e96dbeeec4 100755
--- a/packages/PyTrilinos/example/exMLAPI_Smoother.py.in
+++ b/packages/PyTrilinos/example/exMLAPI_Smoother.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exMPI_Init.py.in b/packages/PyTrilinos/example/exMPI_Init.py.in
index 50734b6d7764..2de079f7340f 100755
--- a/packages/PyTrilinos/example/exMPI_Init.py.in
+++ b/packages/PyTrilinos/example/exMPI_Init.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exNOXEpetraExt_2DSim.py.in b/packages/PyTrilinos/example/exNOXEpetraExt_2DSim.py.in
index b138a090d67d..e4d7e73ea745 100755
--- a/packages/PyTrilinos/example/exNOXEpetraExt_2DSim.py.in
+++ b/packages/PyTrilinos/example/exNOXEpetraExt_2DSim.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exNOX_1Dfdm.py.in b/packages/PyTrilinos/example/exNOX_1Dfdm.py.in
index 44a3ff9563d1..aecd4893dff2 100755
--- a/packages/PyTrilinos/example/exNOX_1Dfdm.py.in
+++ b/packages/PyTrilinos/example/exNOX_1Dfdm.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exNOX_2DSim.py.in b/packages/PyTrilinos/example/exNOX_2DSim.py.in
index 4b79e9a051ba..c388b9e01dd3 100755
--- a/packages/PyTrilinos/example/exNOX_2DSim.py.in
+++ b/packages/PyTrilinos/example/exNOX_2DSim.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exTeuchos.py.in b/packages/PyTrilinos/example/exTeuchos.py.in
index 7a0075568952..2418b35dfc37 100755
--- a/packages/PyTrilinos/example/exTeuchos.py.in
+++ b/packages/PyTrilinos/example/exTeuchos.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/exThyra.py.in b/packages/PyTrilinos/example/exThyra.py.in
index 18614d00d130..f94e6bfaa203 100755
--- a/packages/PyTrilinos/example/exThyra.py.in
+++ b/packages/PyTrilinos/example/exThyra.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/example/testutil.py.in b/packages/PyTrilinos/example/testutil.py.in
index 57f7562811bb..0f115f102758 100644
--- a/packages/PyTrilinos/example/testutil.py.in
+++ b/packages/PyTrilinos/example/testutil.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/CMakeLists.txt b/packages/PyTrilinos/src/CMakeLists.txt
index 5e071091841f..5cdc5a45f6bd 100644
--- a/packages/PyTrilinos/src/CMakeLists.txt
+++ b/packages/PyTrilinos/src/CMakeLists.txt
@@ -262,7 +262,7 @@ SET_TARGET_PROPERTIES(pytrilinos
#
# Get the python version
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
"import sys; print(sys.version[:3])"
OUTPUT_VARIABLE PYTHON_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -323,7 +323,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${TEUCHOS_RCP_SCRIPT}.in
${CMAKE_CURRENT_BINARY_DIR}/${TEUCHOS_RCP_SCRIPT})
ADD_CUSTOM_COMMAND(
OUTPUT "${TEUCHOS_RCP}"
- COMMAND "${PYTHON_EXECUTABLE}"
+ COMMAND "${Python3_EXECUTABLE}"
ARGS ${CMAKE_CURRENT_BINARY_DIR}/${TEUCHOS_RCP_SCRIPT} >
${CMAKE_CURRENT_BINARY_DIR}/${TEUCHOS_RCP}
)
@@ -343,7 +343,7 @@ SET_TARGET_PROPERTIES(${TEUCHOS_RCP_TARGET} PROPERTIES
LINK_FLAGS "${EXTRA_LINK_ARGS}"
)
ADD_CUSTOM_COMMAND(TARGET ${TEUCHOS_RCP_TARGET} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/Teuchos/RCP.py', 'PyTrilinos/Teuchos/RCP.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/Teuchos/RCP.py', 'PyTrilinos/Teuchos/RCP.pyc')"
COMMENT "Byte compiling Teuchos/RCP.py"
VERBATIM)
LIST(APPEND ADDITIONAL_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${TEUCHOS_RCP})
@@ -399,7 +399,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
# causes other packages to "import Teuchos" properly.
IF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/Teuchos")
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/Teuchos/${MODULE_NAME}.py', 'PyTrilinos/Teuchos/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/Teuchos/${MODULE_NAME}.py', 'PyTrilinos/Teuchos/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling Teuchos/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -414,7 +414,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/NOX/Epetra")
SET(TRILINOS_LIBS ${NOXEPETRA_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/NOX/Epetra/${MODULE_NAME}.py', 'PyTrilinos/NOX/Epetra/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/NOX/Epetra/${MODULE_NAME}.py', 'PyTrilinos/NOX/Epetra/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling NOX/Epetra/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -430,7 +430,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/NOX/PETSc")
SET(TRILINOS_LIBS ${NOXPETSC_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/NOX/PETSc/${MODULE_NAME}.py', 'PyTrilinos/NOX/PETSc/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/NOX/PETSc/${MODULE_NAME}.py', 'PyTrilinos/NOX/PETSc/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling NOX/PETSc/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -446,7 +446,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/NOX")
SET(TRILINOS_LIBS ${NOX_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/NOX/${MODULE_NAME}.py', 'PyTrilinos/NOX/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/NOX/${MODULE_NAME}.py', 'PyTrilinos/NOX/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling NOX/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -462,7 +462,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/LOCA/Hopf")
SET(TRILINOS_LIBS ${LOCAEPETRA_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/Hopf/${MODULE_NAME}.py', 'PyTrilinos/LOCA/Hopf/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/Hopf/${MODULE_NAME}.py', 'PyTrilinos/LOCA/Hopf/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling LOCA/Hopf/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -478,7 +478,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/LOCA/Pitchfork")
SET(TRILINOS_LIBS ${LOCAEPETRA_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/Pitchfork/${MODULE_NAME}.py', 'PyTrilinos/LOCA/Pitchfork/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/Pitchfork/${MODULE_NAME}.py', 'PyTrilinos/LOCA/Pitchfork/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling LOCA/Pitchfork/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -494,7 +494,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/LOCA/TurningPoint")
SET(TRILINOS_LIBS ${LOCAEPETRA_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/TurningPoint/${MODULE_NAME}.py', 'PyTrilinos/LOCA/TurningPoint/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/TurningPoint/${MODULE_NAME}.py', 'PyTrilinos/LOCA/TurningPoint/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling LOCA/TurningPoint/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -510,7 +510,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/LOCA/Epetra")
SET(TRILINOS_LIBS ${LOCAEPETRA_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/Epetra/${MODULE_NAME}.py', 'PyTrilinos/LOCA/Epetra/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/Epetra/${MODULE_NAME}.py', 'PyTrilinos/LOCA/Epetra/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling LOCA/Epetra/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -526,7 +526,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/LOCA")
SET(TRILINOS_LIBS ${LOCA_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/${MODULE_NAME}.py', 'PyTrilinos/LOCA/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/${MODULE_NAME}.py', 'PyTrilinos/LOCA/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling LOCA/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -542,7 +542,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/Isorropia")
SET(TRILINOS_LIBS ${ISORROPIA_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/Isorropia/${MODULE_NAME}.py', 'PyTrilinos/Isorropia/${MODULE_NAME}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/Isorropia/${MODULE_NAME}.py', 'PyTrilinos/Isorropia/${MODULE_NAME}.pyc')"
COMMENT "Byte compiling Isorropia/${MODULE_NAME}.py"
VERBATIM)
INSTALL(FILES
@@ -558,7 +558,7 @@ FOREACH(MODULE ${PyTrilinos_MODULES})
ELSE()
SET(TRILINOS_LIBS ${${MODULE_UPPER}_LIBRARIES})
ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/${MODULE}.py', 'PyTrilinos/${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/${MODULE}.py', 'PyTrilinos/${MODULE}.pyc')"
COMMENT "Byte compiling ${MODULE}.py"
VERBATIM)
INSTALL(FILES
diff --git a/packages/PyTrilinos/src/PyTrilinos/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/CMakeLists.txt
index 3ca687f781f8..97fe157c0729 100644
--- a/packages/PyTrilinos/src/PyTrilinos/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/CMakeLists.txt
@@ -71,7 +71,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling ${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/Isorropia/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/Isorropia/CMakeLists.txt
index a06fb4c0b452..fcc954bb5e4a 100644
--- a/packages/PyTrilinos/src/PyTrilinos/Isorropia/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/Isorropia/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_Isorropia_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling Isorropia/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/Isorropia/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/Isorropia/__init__.py.in
index 56d8856619a2..45bec4cbc46f 100644
--- a/packages/PyTrilinos/src/PyTrilinos/Isorropia/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/Isorropia/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/LOCA/CMakeLists.txt
index 5d119713bb5a..f9d30e0bb252 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_LOCA_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling LOCA/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/Epetra/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/LOCA/Epetra/CMakeLists.txt
index 221043450b01..c61356409bf4 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/Epetra/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/Epetra/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_LOCA_Epetra_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling LOCA/Epetra/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/Epetra/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/LOCA/Epetra/__init__.py.in
index c87f4ec4e00b..23947fcef50b 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/Epetra/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/Epetra/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/Hopf/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/LOCA/Hopf/CMakeLists.txt
index 13d2e61841cc..ae379cf0475d 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/Hopf/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/Hopf/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_LOCA_Hopf_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling LOCA/Hopf/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/Hopf/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/LOCA/Hopf/__init__.py.in
index c157a7d0476b..feebe7fa029b 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/Hopf/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/Hopf/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/Pitchfork/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/LOCA/Pitchfork/CMakeLists.txt
index ae010fc45c65..885deb0d8ffd 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/Pitchfork/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/Pitchfork/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_LOCA_Pitchfork_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling LOCA/Pitchfork/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/Pitchfork/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/LOCA/Pitchfork/__init__.py.in
index fa29127825d3..1b274442514d 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/Pitchfork/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/Pitchfork/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/TurningPoint/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/LOCA/TurningPoint/CMakeLists.txt
index e2021357070e..324db7f7e37a 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/TurningPoint/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/TurningPoint/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_LOCA_TurningPoint_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling LOCA/TurningPoint/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/TurningPoint/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/LOCA/TurningPoint/__init__.py.in
index 2e07b1b2c617..80dd1dbe1325 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/TurningPoint/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/TurningPoint/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/LOCA/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/LOCA/__init__.py.in
index a1dd9d41fe66..1089800b759b 100644
--- a/packages/PyTrilinos/src/PyTrilinos/LOCA/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/LOCA/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/NOX/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/NOX/CMakeLists.txt
index d7004ed6aea5..561235b3f775 100644
--- a/packages/PyTrilinos/src/PyTrilinos/NOX/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/NOX/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_NOX_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling NOX/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/NOX/Epetra/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/NOX/Epetra/CMakeLists.txt
index 93c5211c9178..78a05883d212 100644
--- a/packages/PyTrilinos/src/PyTrilinos/NOX/Epetra/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/NOX/Epetra/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_NOX_Epetra_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling NOX/Epetra/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/NOX/Epetra/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/NOX/Epetra/__init__.py.in
index 62fb83082991..c912295c13a0 100644
--- a/packages/PyTrilinos/src/PyTrilinos/NOX/Epetra/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/NOX/Epetra/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/NOX/PETSc/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/NOX/PETSc/CMakeLists.txt
index f9632d20df48..1d33fd3cce93 100644
--- a/packages/PyTrilinos/src/PyTrilinos/NOX/PETSc/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/NOX/PETSc/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_NOX_PETSc_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling NOX/PETSc/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/NOX/PETSc/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/NOX/PETSc/__init__.py.in
index f254110ebea3..ff799ed50ab3 100644
--- a/packages/PyTrilinos/src/PyTrilinos/NOX/PETSc/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/NOX/PETSc/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/NOX/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/NOX/__init__.py.in
index 0d477f1a5d20..c0fc512511d7 100644
--- a/packages/PyTrilinos/src/PyTrilinos/NOX/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/NOX/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/Teuchos/CMakeLists.txt b/packages/PyTrilinos/src/PyTrilinos/Teuchos/CMakeLists.txt
index 05a0308af428..15e2a717d576 100644
--- a/packages/PyTrilinos/src/PyTrilinos/Teuchos/CMakeLists.txt
+++ b/packages/PyTrilinos/src/PyTrilinos/Teuchos/CMakeLists.txt
@@ -58,7 +58,7 @@ FOREACH(MODULE ${LOCAL_MODULES})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${MODULE}.py)
ADD_CUSTOM_COMMAND(TARGET PyTrilinos_Teuchos_Pure_Python_Modules
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
+ COMMAND ${Python3_EXECUTABLE} -c "import py_compile; py_compile.compile('${MODULE}.py', '${MODULE}.pyc')"
COMMENT "Byte compiling Teuchos/${MODULE}.py"
BYPRODUCTS ${MODULE}.pyc
VERBATIM)
diff --git a/packages/PyTrilinos/src/PyTrilinos/Teuchos/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/Teuchos/__init__.py.in
index 3cf921c10867..28c81e2b7712 100644
--- a/packages/PyTrilinos/src/PyTrilinos/Teuchos/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/Teuchos/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/PyTrilinos/__init__.py.in b/packages/PyTrilinos/src/PyTrilinos/__init__.py.in
index 6c53789fd2c3..df2e9a056a91 100644
--- a/packages/PyTrilinos/src/PyTrilinos/__init__.py.in
+++ b/packages/PyTrilinos/src/PyTrilinos/__init__.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/src/gen_teuchos_rcp.py.in b/packages/PyTrilinos/src/gen_teuchos_rcp.py.in
index ac4ac19bc823..f56c3b12dfc3 100755
--- a/packages/PyTrilinos/src/gen_teuchos_rcp.py.in
+++ b/packages/PyTrilinos/src/gen_teuchos_rcp.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
import glob
diff --git a/packages/PyTrilinos/src/scripts/CMakeLists.txt b/packages/PyTrilinos/src/scripts/CMakeLists.txt
index a30e4ff1a47b..4cbacec449a6 100644
--- a/packages/PyTrilinos/src/scripts/CMakeLists.txt
+++ b/packages/PyTrilinos/src/scripts/CMakeLists.txt
@@ -43,7 +43,7 @@
# @HEADER
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/testutil.py
- COMMAND ${PYTHON_EXECUTABLE}
+ COMMAND ${Python3_EXECUTABLE}
${PyTrilinos_BINARY_DIR}/util/copyWithCMakeSubstitutions.py
${CMAKE_CURRENT_SOURCE_DIR}/testutil.py.in
${CMAKE_CURRENT_BINARY_DIR}/testutil.py
@@ -55,7 +55,7 @@ ADD_CUSTOM_TARGET(PyTrilinos_Scripts_testutil ALL
MACRO(PyTrilinos_MAKE_SCRIPT SCRIPT_NAME)
ADD_CUSTOM_COMMAND(OUTPUT ${SCRIPT_NAME}.py
- COMMAND ${PYTHON_EXECUTABLE}
+ COMMAND ${Python3_EXECUTABLE}
${PyTrilinos_BINARY_DIR}/util/copyWithCMakeSubstitutions.py
${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT_NAME}.py.in
${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT_NAME}.py
diff --git a/packages/PyTrilinos/src/scripts/IsorropiaVisualizer.py.in b/packages/PyTrilinos/src/scripts/IsorropiaVisualizer.py.in
index 1a319fe5c2d3..0c0d613bd5be 100755
--- a/packages/PyTrilinos/src/scripts/IsorropiaVisualizer.py.in
+++ b/packages/PyTrilinos/src/scripts/IsorropiaVisualizer.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# TODO:
diff --git a/packages/PyTrilinos/src/scripts/testutil.py.in b/packages/PyTrilinos/src/scripts/testutil.py.in
index 846ba26319c6..ee32ee8257e4 100644
--- a/packages/PyTrilinos/src/scripts/testutil.py.in
+++ b/packages/PyTrilinos/src/scripts/testutil.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testAmesos.py.in b/packages/PyTrilinos/test/testAmesos.py.in
index 53837470a9b1..1378054c583a 100755
--- a/packages/PyTrilinos/test/testAmesos.py.in
+++ b/packages/PyTrilinos/test/testAmesos.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testAnasazi.py.in b/packages/PyTrilinos/test/testAnasazi.py.in
index 23023f3a861e..764c1c4fd17e 100755
--- a/packages/PyTrilinos/test/testAnasazi.py.in
+++ b/packages/PyTrilinos/test/testAnasazi.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testAztecOO.py.in b/packages/PyTrilinos/test/testAztecOO.py.in
index f991e98aa412..b807f561faf5 100755
--- a/packages/PyTrilinos/test/testAztecOO.py.in
+++ b/packages/PyTrilinos/test/testAztecOO.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetraExt_Coloring.py.in b/packages/PyTrilinos/test/testEpetraExt_Coloring.py.in
index 5322ddd55e09..47f910d8dcf1 100755
--- a/packages/PyTrilinos/test/testEpetraExt_Coloring.py.in
+++ b/packages/PyTrilinos/test/testEpetraExt_Coloring.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetraExt_HDF5.py.in b/packages/PyTrilinos/test/testEpetraExt_HDF5.py.in
index 8ea31e7fdb9c..051d9ee4c234 100755
--- a/packages/PyTrilinos/test/testEpetraExt_HDF5.py.in
+++ b/packages/PyTrilinos/test/testEpetraExt_HDF5.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetraExt_Property.py.in b/packages/PyTrilinos/test/testEpetraExt_Property.py.in
index 629f89bf3e5e..82ee253e1bb6 100755
--- a/packages/PyTrilinos/test/testEpetraExt_Property.py.in
+++ b/packages/PyTrilinos/test/testEpetraExt_Property.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_BlockMap.py.in b/packages/PyTrilinos/test/testEpetra_BlockMap.py.in
index d523e273cdd3..159fbae4b9db 100755
--- a/packages/PyTrilinos/test/testEpetra_BlockMap.py.in
+++ b/packages/PyTrilinos/test/testEpetra_BlockMap.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_Comm.py.in b/packages/PyTrilinos/test/testEpetra_Comm.py.in
index 81ebad421004..0dc7d6c2ddb3 100755
--- a/packages/PyTrilinos/test/testEpetra_Comm.py.in
+++ b/packages/PyTrilinos/test/testEpetra_Comm.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_CompObject.py.in b/packages/PyTrilinos/test/testEpetra_CompObject.py.in
index 408f30e27f48..e0d0bc923d11 100755
--- a/packages/PyTrilinos/test/testEpetra_CompObject.py.in
+++ b/packages/PyTrilinos/test/testEpetra_CompObject.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_CrsGraph.py.in b/packages/PyTrilinos/test/testEpetra_CrsGraph.py.in
index 877670766ffc..4147335f209f 100755
--- a/packages/PyTrilinos/test/testEpetra_CrsGraph.py.in
+++ b/packages/PyTrilinos/test/testEpetra_CrsGraph.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_CrsMatrix.py.in b/packages/PyTrilinos/test/testEpetra_CrsMatrix.py.in
index 223aa230986c..b1f8e68cd235 100755
--- a/packages/PyTrilinos/test/testEpetra_CrsMatrix.py.in
+++ b/packages/PyTrilinos/test/testEpetra_CrsMatrix.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_FEVector.py.in b/packages/PyTrilinos/test/testEpetra_FEVector.py.in
index 352c2bc4783a..7eaf90871602 100755
--- a/packages/PyTrilinos/test/testEpetra_FEVector.py.in
+++ b/packages/PyTrilinos/test/testEpetra_FEVector.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_ImportExport.py.in b/packages/PyTrilinos/test/testEpetra_ImportExport.py.in
index 3a578048c68a..08f25a5379eb 100755
--- a/packages/PyTrilinos/test/testEpetra_ImportExport.py.in
+++ b/packages/PyTrilinos/test/testEpetra_ImportExport.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_IntSerialDense.py.in b/packages/PyTrilinos/test/testEpetra_IntSerialDense.py.in
index 11acc1d7096d..ec2077db5daa 100755
--- a/packages/PyTrilinos/test/testEpetra_IntSerialDense.py.in
+++ b/packages/PyTrilinos/test/testEpetra_IntSerialDense.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_IntVector.py.in b/packages/PyTrilinos/test/testEpetra_IntVector.py.in
index fe2ece2400b9..b7aa34971ded 100755
--- a/packages/PyTrilinos/test/testEpetra_IntVector.py.in
+++ b/packages/PyTrilinos/test/testEpetra_IntVector.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_LinearProblem.py.in b/packages/PyTrilinos/test/testEpetra_LinearProblem.py.in
index a69775f8eda1..d704ed688394 100755
--- a/packages/PyTrilinos/test/testEpetra_LinearProblem.py.in
+++ b/packages/PyTrilinos/test/testEpetra_LinearProblem.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_LocalMap.py.in b/packages/PyTrilinos/test/testEpetra_LocalMap.py.in
index 3d7625604d8c..10c453103e59 100755
--- a/packages/PyTrilinos/test/testEpetra_LocalMap.py.in
+++ b/packages/PyTrilinos/test/testEpetra_LocalMap.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_Map.py.in b/packages/PyTrilinos/test/testEpetra_Map.py.in
index 639068f2490d..bd3900a1ec7a 100755
--- a/packages/PyTrilinos/test/testEpetra_Map.py.in
+++ b/packages/PyTrilinos/test/testEpetra_Map.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_MapColoring.py.in b/packages/PyTrilinos/test/testEpetra_MapColoring.py.in
index e7e960ed2dae..8dd64c962d9c 100755
--- a/packages/PyTrilinos/test/testEpetra_MapColoring.py.in
+++ b/packages/PyTrilinos/test/testEpetra_MapColoring.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_MultiVector.py.in b/packages/PyTrilinos/test/testEpetra_MultiVector.py.in
index ed41555a6fd0..b33b38a9d04f 100755
--- a/packages/PyTrilinos/test/testEpetra_MultiVector.py.in
+++ b/packages/PyTrilinos/test/testEpetra_MultiVector.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_Object.py.in b/packages/PyTrilinos/test/testEpetra_Object.py.in
index e3be8ccc18eb..b714ad57e0e0 100755
--- a/packages/PyTrilinos/test/testEpetra_Object.py.in
+++ b/packages/PyTrilinos/test/testEpetra_Object.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_SerialDense.py.in b/packages/PyTrilinos/test/testEpetra_SerialDense.py.in
index 51c4a6551a4f..2210b3907e40 100755
--- a/packages/PyTrilinos/test/testEpetra_SerialDense.py.in
+++ b/packages/PyTrilinos/test/testEpetra_SerialDense.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_Time.py.in b/packages/PyTrilinos/test/testEpetra_Time.py.in
index 7a33c8f6e15c..cc82a7a57103 100755
--- a/packages/PyTrilinos/test/testEpetra_Time.py.in
+++ b/packages/PyTrilinos/test/testEpetra_Time.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_Util.py.in b/packages/PyTrilinos/test/testEpetra_Util.py.in
index 33e66c4e40e2..278823382141 100755
--- a/packages/PyTrilinos/test/testEpetra_Util.py.in
+++ b/packages/PyTrilinos/test/testEpetra_Util.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testEpetra_Vector.py.in b/packages/PyTrilinos/test/testEpetra_Vector.py.in
index 0b40f57e575f..eaa5942d5db6 100755
--- a/packages/PyTrilinos/test/testEpetra_Vector.py.in
+++ b/packages/PyTrilinos/test/testEpetra_Vector.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testGaleri_CrsMatrices.py.in b/packages/PyTrilinos/test/testGaleri_CrsMatrices.py.in
index 66f1fbc7a23b..eba9f00c69a8 100755
--- a/packages/PyTrilinos/test/testGaleri_CrsMatrices.py.in
+++ b/packages/PyTrilinos/test/testGaleri_CrsMatrices.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testGaleri_Maps.py.in b/packages/PyTrilinos/test/testGaleri_Maps.py.in
index c9c3b0c4cbd2..0acd72c402fc 100755
--- a/packages/PyTrilinos/test/testGaleri_Maps.py.in
+++ b/packages/PyTrilinos/test/testGaleri_Maps.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testIFPACK.py.in b/packages/PyTrilinos/test/testIFPACK.py.in
index 05c1567ab06f..60613f3105f9 100755
--- a/packages/PyTrilinos/test/testIFPACK.py.in
+++ b/packages/PyTrilinos/test/testIFPACK.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testIsorropia.py.in b/packages/PyTrilinos/test/testIsorropia.py.in
index 87e5099bbcb9..ae8002c0cf92 100755
--- a/packages/PyTrilinos/test/testIsorropia.py.in
+++ b/packages/PyTrilinos/test/testIsorropia.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testKomplex_LinearProblem.py.in b/packages/PyTrilinos/test/testKomplex_LinearProblem.py.in
index 6d6f8b91fcb4..8489174dc236 100755
--- a/packages/PyTrilinos/test/testKomplex_LinearProblem.py.in
+++ b/packages/PyTrilinos/test/testKomplex_LinearProblem.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testLOCA.py.in b/packages/PyTrilinos/test/testLOCA.py.in
index f41db067693b..97f14791dd47 100755
--- a/packages/PyTrilinos/test/testLOCA.py.in
+++ b/packages/PyTrilinos/test/testLOCA.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testML_CompObject.py.in b/packages/PyTrilinos/test/testML_CompObject.py.in
index ede735a8651b..ae827a4dcb9c 100755
--- a/packages/PyTrilinos/test/testML_CompObject.py.in
+++ b/packages/PyTrilinos/test/testML_CompObject.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testML_MultiVector.py.in b/packages/PyTrilinos/test/testML_MultiVector.py.in
index aea1919eb942..267026731d99 100755
--- a/packages/PyTrilinos/test/testML_MultiVector.py.in
+++ b/packages/PyTrilinos/test/testML_MultiVector.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testML_Preconditioner.py.in b/packages/PyTrilinos/test/testML_Preconditioner.py.in
index 2a5ddc99b507..04a6c87779a5 100755
--- a/packages/PyTrilinos/test/testML_Preconditioner.py.in
+++ b/packages/PyTrilinos/test/testML_Preconditioner.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testML_PyMatrix.py.in b/packages/PyTrilinos/test/testML_PyMatrix.py.in
index ef0344371636..5e0aab4c3e73 100755
--- a/packages/PyTrilinos/test/testML_PyMatrix.py.in
+++ b/packages/PyTrilinos/test/testML_PyMatrix.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testML_Space.py.in b/packages/PyTrilinos/test/testML_Space.py.in
index c332d1e4ec00..4ce1c5b4d0c4 100755
--- a/packages/PyTrilinos/test/testML_Space.py.in
+++ b/packages/PyTrilinos/test/testML_Space.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testML_TimeObject.py.in b/packages/PyTrilinos/test/testML_TimeObject.py.in
index 4f10253e62ca..9a580277632e 100755
--- a/packages/PyTrilinos/test/testML_TimeObject.py.in
+++ b/packages/PyTrilinos/test/testML_TimeObject.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testNOX_StatusTest.py.in b/packages/PyTrilinos/test/testNOX_StatusTest.py.in
index ce15bc66e34d..8e0e411fee5f 100755
--- a/packages/PyTrilinos/test/testNOX_StatusTest.py.in
+++ b/packages/PyTrilinos/test/testNOX_StatusTest.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testPliris.py.in b/packages/PyTrilinos/test/testPliris.py.in
index 97fb331587eb..1d7fb0008904 100755
--- a/packages/PyTrilinos/test/testPliris.py.in
+++ b/packages/PyTrilinos/test/testPliris.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTeuchos.py.in b/packages/PyTrilinos/test/testTeuchos.py.in
index b24701d107d1..cdb50cd14065 100755
--- a/packages/PyTrilinos/test/testTeuchos.py.in
+++ b/packages/PyTrilinos/test/testTeuchos.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTeuchos_Comm.py.in b/packages/PyTrilinos/test/testTeuchos_Comm.py.in
index bee34ae07e7b..2d61efe2f356 100755
--- a/packages/PyTrilinos/test/testTeuchos_Comm.py.in
+++ b/packages/PyTrilinos/test/testTeuchos_Comm.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTeuchos_ParameterList.py.in b/packages/PyTrilinos/test/testTeuchos_ParameterList.py.in
index cd4004361e3c..ce00e6cfbddd 100755
--- a/packages/PyTrilinos/test/testTeuchos_ParameterList.py.in
+++ b/packages/PyTrilinos/test/testTeuchos_ParameterList.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTeuchos_RCP.py.in b/packages/PyTrilinos/test/testTeuchos_RCP.py.in
index c36340441955..1260c3338f45 100755
--- a/packages/PyTrilinos/test/testTeuchos_RCP.py.in
+++ b/packages/PyTrilinos/test/testTeuchos_RCP.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTeuchos_ScalarTraits.py.in b/packages/PyTrilinos/test/testTeuchos_ScalarTraits.py.in
index 2386d947fa23..1f454b028ece 100755
--- a/packages/PyTrilinos/test/testTeuchos_ScalarTraits.py.in
+++ b/packages/PyTrilinos/test/testTeuchos_ScalarTraits.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testThyra.py.in b/packages/PyTrilinos/test/testThyra.py.in
index 59d25b36de1d..2c30b5cb0022 100755
--- a/packages/PyTrilinos/test/testThyra.py.in
+++ b/packages/PyTrilinos/test/testThyra.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTpetra_Map.py.in b/packages/PyTrilinos/test/testTpetra_Map.py.in
index 6819b4d6c177..2655f44d3ec5 100755
--- a/packages/PyTrilinos/test/testTpetra_Map.py.in
+++ b/packages/PyTrilinos/test/testTpetra_Map.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTpetra_MultiVector.py.in b/packages/PyTrilinos/test/testTpetra_MultiVector.py.in
index 4c30729b6c9a..2f709404533e 100755
--- a/packages/PyTrilinos/test/testTpetra_MultiVector.py.in
+++ b/packages/PyTrilinos/test/testTpetra_MultiVector.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTpetra_Vector.py.in b/packages/PyTrilinos/test/testTpetra_Vector.py.in
index 34ab9d87e08a..e9e228089507 100755
--- a/packages/PyTrilinos/test/testTpetra_Vector.py.in
+++ b/packages/PyTrilinos/test/testTpetra_Vector.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testTriUtils.py.in b/packages/PyTrilinos/test/testTriUtils.py.in
index c9bdb16ae584..46e10421c8c4 100755
--- a/packages/PyTrilinos/test/testTriUtils.py.in
+++ b/packages/PyTrilinos/test/testTriUtils.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/test/testutil.py.in b/packages/PyTrilinos/test/testutil.py.in
index 86efd2f5e412..498a4ad18cbb 100644
--- a/packages/PyTrilinos/test/testutil.py.in
+++ b/packages/PyTrilinos/test/testutil.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# -*- python -*-
# @HEADER
diff --git a/packages/PyTrilinos/util/CMakeCacheVariables.py.in b/packages/PyTrilinos/util/CMakeCacheVariables.py.in
index 9b22d3ec29bd..738bce362240 100755
--- a/packages/PyTrilinos/util/CMakeCacheVariables.py.in
+++ b/packages/PyTrilinos/util/CMakeCacheVariables.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# @HEADER
# ***********************************************************************
diff --git a/packages/PyTrilinos/util/MakefileVariables.py.in b/packages/PyTrilinos/util/MakefileVariables.py.in
index 5df302598180..688379d7acd5 100755
--- a/packages/PyTrilinos/util/MakefileVariables.py.in
+++ b/packages/PyTrilinos/util/MakefileVariables.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# @HEADER
# ***********************************************************************
diff --git a/packages/PyTrilinos/util/configFix.py.in b/packages/PyTrilinos/util/configFix.py.in
index e9b476ffca33..6783ab3cc357 100755
--- a/packages/PyTrilinos/util/configFix.py.in
+++ b/packages/PyTrilinos/util/configFix.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# @HEADER
# ***********************************************************************
diff --git a/packages/PyTrilinos/util/copyWithCMakeSubstitutions.py.in b/packages/PyTrilinos/util/copyWithCMakeSubstitutions.py.in
index ee76cca284d8..6e7950e61515 100755
--- a/packages/PyTrilinos/util/copyWithCMakeSubstitutions.py.in
+++ b/packages/PyTrilinos/util/copyWithCMakeSubstitutions.py.in
@@ -1,4 +1,4 @@
-#! ${PYTHON_EXECUTABLE}
+#! ${Python3_EXECUTABLE}
# @HEADER
# ***********************************************************************
diff --git a/packages/PyTrilinos2/CMakeLists.txt b/packages/PyTrilinos2/CMakeLists.txt
index 8f22df527dda..d912b7efe078 100644
--- a/packages/PyTrilinos2/CMakeLists.txt
+++ b/packages/PyTrilinos2/CMakeLists.txt
@@ -33,14 +33,14 @@ TRIBITS_ADD_OPTION_AND_DEFINE(PyTrilinos2_BINDER_VERBOSE
SET(PyTrilinos2_BINDER_NUM_FILES "100" CACHE STRING "Maxinum number of generated files by binder.")
-MESSAGE("-- PYTHON_EXECUTABLE:")
-IF(NOT DEFINED ${PYTHON_EXECUTABLE})
- find_program(PYTHON_EXECUTABLE
+MESSAGE("-- Python3_EXECUTABLE:")
+IF(NOT DEFINED ${Python3_EXECUTABLE})
+ find_program(Python3_EXECUTABLE
NAMES python3 python
)
- MESSAGE(" -- CMake has set: PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}")
+ MESSAGE(" -- CMake has set: Python3_EXECUTABLE = ${Python3_EXECUTABLE}")
ELSE()
- MESSAGE(" -- User has set: PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}")
+ MESSAGE(" -- User has set: Python3_EXECUTABLE = ${Python3_EXECUTABLE}")
ENDIF()
function(get_all_include_dirs LIBRARY_NAME all_include_dirs all_visited_libs)
@@ -196,7 +196,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/PyTrilinos2_Tpetra_ETI.hpp ${CMAKE_CURRENT_BINARY_DIR}/python/getTpetraTypeName.py
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/gather_ETI.py ${CMAKE_CURRENT_BINARY_DIR} ${all_ETI_files_list} ${all_ETI_classes_list} "src/PyTrilinos2_Tpetra_ETI.hpp"
+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/gather_ETI.py ${CMAKE_CURRENT_BINARY_DIR} ${all_ETI_files_list} ${all_ETI_classes_list} "src/PyTrilinos2_Tpetra_ETI.hpp"
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include_tmp
)
add_custom_target(generate_ETI_name DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/src/PyTrilinos2_Tpetra_ETI.hpp ${CMAKE_CURRENT_BINARY_DIR}/include_tmp)
@@ -206,7 +206,7 @@ list (APPEND PyTrilinos2PyFiles ${PyTrilinos2PyFiles2})
add_custom_command(
OUTPUT ${binder_include_name}
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/gather_includes.py ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${all_header_with_dir_list} ${all_header_without_dir_list} ${binder_include_name}
+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/gather_includes.py ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${all_header_with_dir_list} ${all_header_without_dir_list} ${binder_include_name}
DEPENDS generate_ETI_name ${CMAKE_CURRENT_BINARY_DIR}/include_tmp
)
add_custom_target(generate_include_name DEPENDS ${binder_include_name})
@@ -272,12 +272,12 @@ SET(PyTrilinos2_INSTALL_PREFIX ${PyTrilinos2_DEFAULT_INSTALL_PREFIX}
CACHE PATH "The path prefix for where PyTrilinos2 will be installed, e.g. /usr/local")
# Get the python version
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
"import sys; print(sys.version_info.major)"
OUTPUT_VARIABLE PYTHON_MAJOR_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
"import sys; print(sys.version_info.minor)"
OUTPUT_VARIABLE PYTHON_MINOR_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -300,7 +300,7 @@ INSTALL(FILES
# Find the pybind11 CMake module
EXECUTE_PROCESS(COMMAND
- ${PYTHON_EXECUTABLE} -c "import pybind11; print(pybind11.get_cmake_dir())"
+ ${Python3_EXECUTABLE} -c "import pybind11; print(pybind11.get_cmake_dir())"
OUTPUT_VARIABLE pybind11_DIR
ERROR_VARIABLE pybind11_CMAKE_ERROR
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -310,7 +310,7 @@ MESSAGE(STATUS "pybind11 CMake path: ${pybind11_DIR}")
find_package(pybind11 REQUIRED)
EXECUTE_PROCESS(COMMAND
- ${PYTHON_EXECUTABLE} -c "import mpi4py; print(mpi4py.get_include())"
+ ${Python3_EXECUTABLE} -c "import mpi4py; print(mpi4py.get_include())"
OUTPUT_VARIABLE Mpi4Py_INCLUDE_DIR
ERROR_VARIABLE Mpi4Py_INCLUDE_ERROR
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -323,7 +323,7 @@ ELSE()
ENDIF()
EXECUTE_PROCESS(COMMAND
- ${PYTHON_EXECUTABLE} -c "import mpi4py; print(mpi4py.get_config()['mpicxx'])"
+ ${Python3_EXECUTABLE} -c "import mpi4py; print(mpi4py.get_config()['mpicxx'])"
OUTPUT_VARIABLE Mpi4Py_MPICXX
OUTPUT_STRIP_TRAILING_WHITESPACE
)
diff --git a/packages/PyTrilinos2/README.md b/packages/PyTrilinos2/README.md
index d5221b26e29b..f777f230041b 100644
--- a/packages/PyTrilinos2/README.md
+++ b/packages/PyTrilinos2/README.md
@@ -48,7 +48,7 @@ cmake -S ../llvm/llvm -DLLVM_ENABLE_PROJECTS="clang;libcxx;libcxxabi;clang-tools
```
-D Trilinos_ENABLE_PyTrilinos2:BOOL=ON \
--D PYTHON_EXECUTABLE=... \
+-D Python3_EXECUTABLE=... \
-D PyTrilinos2_ENABLE_TESTS=ON \
-D PyTrilinos2_BINDER_EXECUTABLE=... \
-D PyTrilinos2_BINDER_GCC_TOOLCHAIN=...\
diff --git a/packages/PyTrilinos2/cmake/PyTrilinos2MakeTest.cmake b/packages/PyTrilinos2/cmake/PyTrilinos2MakeTest.cmake
index 4950a10a246e..52691290a084 100644
--- a/packages/PyTrilinos2/cmake/PyTrilinos2MakeTest.cmake
+++ b/packages/PyTrilinos2/cmake/PyTrilinos2MakeTest.cmake
@@ -4,7 +4,7 @@ MACRO(PyTrilinos2_MAKE_MPI_TEST TEST_NAME)
FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
TRIBITS_ADD_TEST(
- ${PYTHON_EXECUTABLE}
+ ${Python3_EXECUTABLE}
NOEXEPREFIX
NOEXESUFFIX
NAME ${TEST_NAME}
diff --git a/packages/amesos/example/pk.h b/packages/amesos/example/pk.h
index 8d4dac373fe8..cf862d290449 100644
--- a/packages/amesos/example/pk.h
+++ b/packages/amesos/example/pk.h
@@ -20,4 +20,3 @@ void *my_realloc2 (void *p, size_t size) ;
void my_free2 (void *p) ;
void normal_memory_handler ( cholmod_common *cm ) ;
void test_memory_handler ( cholmod_common *cm ) ;
-
diff --git a/packages/amesos/src/Amesos.h b/packages/amesos/src/Amesos.h
index c199894f02b0..356f95796730 100644
--- a/packages/amesos/src/Amesos.h
+++ b/packages/amesos/src/Amesos.h
@@ -31,6 +31,12 @@
#ifndef _AMESOS_FACTORY_H_
#define _AMESOS_FACTORY_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_BaseSolver.h"
/** \brief Factory for binding a third party direct solver to an
@@ -92,10 +98,3 @@ 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 b55209ea2291..dd6ab14c4854 100644
--- a/packages/amesos/src/Amesos_BTF.h
+++ b/packages/amesos/src/Amesos_BTF.h
@@ -31,6 +31,12 @@ This file is out of date. Is has not been refactored to use Amesos_Status.
#ifndef _AMESOS_BTF_H_
#define _AMESOS_BTF_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Epetra_LinearProblem.h"
@@ -220,10 +226,3 @@ 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 26310fe69a52..a72d79a6d88e 100644
--- a/packages/amesos/src/Amesos_BaseSolver.h
+++ b/packages/amesos/src/Amesos_BaseSolver.h
@@ -41,6 +41,12 @@
#ifndef _AMESOS_BASESOLVER_H_
#define _AMESOS_BASESOLVER_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
const int StructurallySingularMatrixError = -21;
const int NumericallySingularMatrixError = -22;
@@ -442,10 +448,3 @@ 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 e05f8f0c30b4..b5a84832a1d2 100644
--- a/packages/amesos/src/Amesos_CSparse.h
+++ b/packages/amesos/src/Amesos_CSparse.h
@@ -28,6 +28,12 @@
#ifndef AMESOS_CSPARSE_H
#define AMESOS_CSPARSE_H
+
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
#ifdef HAVE_AMESOS_CSPARSE
#include "Amesos_ConfigDefs.h"
@@ -214,10 +220,3 @@ 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 53c6c4378ec6..c4d5c2ab3e48 100644
--- a/packages/amesos/src/Amesos_Component.h
+++ b/packages/amesos/src/Amesos_Component.h
@@ -36,6 +36,12 @@
#ifndef _AMESOS_COMPONENTBASESOLVER_H_
#define _AMESOS_COMPONENTBASESOLVER_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Teuchos_ParameterList.hpp"
#include "Epetra_LinearProblem.h"
class Epetra_LinearProblem;
@@ -209,10 +215,3 @@ 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 2da07acf9cea..d8490122534e 100644
--- a/packages/amesos/src/Amesos_ComponentBaseSolver.h
+++ b/packages/amesos/src/Amesos_ComponentBaseSolver.h
@@ -36,6 +36,12 @@
#ifndef _AMESOS_COMPONENTBASESOLVER_H_
#define _AMESOS_COMPONENTBASESOLVER_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Teuchos_ParameterList.hpp"
#include "Epetra_LinearProblem.h"
class Epetra_LinearProblem;
@@ -243,10 +249,3 @@ 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 019243f402a7..d04500bc680c 100644
--- a/packages/amesos/src/Amesos_ConfigDefs.h
+++ b/packages/amesos/src/Amesos_ConfigDefs.h
@@ -29,6 +29,12 @@
#ifndef AMESOS_CONFIGDEFS
#define AMESOS_CONFIGDEFS
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#ifdef PACKAGE
#undef PACKAGE
#endif
@@ -102,11 +108,4 @@
return(amesos_err); }
-#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 37897c118da5..23f142a860cb 100644
--- a/packages/amesos/src/Amesos_Control.h
+++ b/packages/amesos/src/Amesos_Control.h
@@ -1,6 +1,12 @@
#ifndef AMESOS_CONTROL_H
#define AMESOS_CONTROL_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Teuchos_ParameterList.hpp"
using namespace Teuchos;
/*!
@@ -85,10 +91,3 @@ 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_CssMKL.h b/packages/amesos/src/Amesos_CssMKL.h
index 0987245c63fc..ee2eafd53985 100644
--- a/packages/amesos/src/Amesos_CssMKL.h
+++ b/packages/amesos/src/Amesos_CssMKL.h
@@ -29,6 +29,12 @@
#ifndef AMESOS_CSSMKL_H
#define AMESOS_CSSMKL_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -183,10 +189,3 @@ class Amesos_CssMKL: public Amesos_BaseSolver,
MPI_Fint CssComm_;
}; // class Amesos_CssMKL
#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 2c5eacda538e..6f3c4e407427 100644
--- a/packages/amesos/src/Amesos_Dscpack.h
+++ b/packages/amesos/src/Amesos_Dscpack.h
@@ -29,6 +29,12 @@
#ifndef AMESOS_DSCPACK_H
#define AMESOS_DSCPACK_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -199,10 +205,3 @@ 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 55db605f4196..bafd8823796d 100644
--- a/packages/amesos/src/Amesos_Klu.h
+++ b/packages/amesos/src/Amesos_Klu.h
@@ -39,6 +39,12 @@
#ifndef AMESOS_KLU_H
#define AMESOS_KLU_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -344,10 +350,3 @@ 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 df165192acb9..44f73ba850ea 100644
--- a/packages/amesos/src/Amesos_Lapack.h
+++ b/packages/amesos/src/Amesos_Lapack.h
@@ -29,6 +29,12 @@
#ifndef AMESOS_LAPACK_H
#define AMESOS_LAPACK_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -270,10 +276,3 @@ 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 edcf15026a15..de9b1636ea50 100644
--- a/packages/amesos/src/Amesos_MC64.h
+++ b/packages/amesos/src/Amesos_MC64.h
@@ -41,6 +41,12 @@
#ifndef AMESOS_MC64_H
#define AMESOS_MC64_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#if defined(HAVE_AMESOS_MC64)
#include "Amesos_Scaling.h"
@@ -125,10 +131,3 @@ 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 03db007bd440..2623daaf91a5 100644
--- a/packages/amesos/src/Amesos_Merikos.h
+++ b/packages/amesos/src/Amesos_Merikos.h
@@ -120,6 +120,12 @@ Task list:
#ifndef _AMESOS_MERIKOS_H_
#define _AMESOS_MERIKOS_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Epetra_LinearProblem.h"
@@ -410,10 +416,3 @@ 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 4d1622402d97..b07d7d77f619 100644
--- a/packages/amesos/src/Amesos_Mumps.h
+++ b/packages/amesos/src/Amesos_Mumps.h
@@ -29,6 +29,12 @@
#ifndef AMESOS_MUMPS_H
#define AMESOS_MUMPS_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
class Epetra_Import;
class Epetra_RowMatrix;
class Epetra_MultiVector;
@@ -421,10 +427,3 @@ 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 4b7c5c10aafc..54904db33fa6 100644
--- a/packages/amesos/src/Amesos_NoCopiable.h
+++ b/packages/amesos/src/Amesos_NoCopiable.h
@@ -31,6 +31,12 @@
#ifndef AMESOS_NOCOPIABLE_H
#define AMESOS_NOCOPIABLE_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
/*!
\class Amesos_NoCopiable
@@ -58,10 +64,3 @@ 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 c46c1dc59daf..f6ad7f61925b 100644
--- a/packages/amesos/src/Amesos_Paraklete.h
+++ b/packages/amesos/src/Amesos_Paraklete.h
@@ -39,6 +39,12 @@
#ifndef AMESOS_PARAKLETE_H
#define AMESOS_PARAKLETE_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -326,10 +332,3 @@ 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 e58942fb39c3..41793f714912 100644
--- a/packages/amesos/src/Amesos_Pardiso.h
+++ b/packages/amesos/src/Amesos_Pardiso.h
@@ -29,6 +29,12 @@
#ifndef AMESOS_PARDISO_H
#define AMESOS_PARDISO_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -206,10 +212,3 @@ 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 37e70687c6c6..9b88d3ddeb45 100644
--- a/packages/amesos/src/Amesos_Reordering.h
+++ b/packages/amesos/src/Amesos_Reordering.h
@@ -40,6 +40,12 @@
#ifndef AMESOS_REORDERING_H
#define AMESOS_REORDERING_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
//! Amesos_Reordering: base class for reordering procedures.
class Amesos_Reordering
{
@@ -55,10 +61,3 @@ 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 fe6b3fd79db7..a47c99372d14 100644
--- a/packages/amesos/src/Amesos_SCALAPACK_wrappers.h
+++ b/packages/amesos/src/Amesos_SCALAPACK_wrappers.h
@@ -30,6 +30,12 @@
#ifndef AMESOS_SCALAPACK_WRAPPERS_H
#define AMESOS_SCALAPACK_WRAPPERS_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_LAPACK_wrappers.h"
#include
@@ -107,10 +113,3 @@ 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 4f56d6c8c735..a0df93e1cbf8 100644
--- a/packages/amesos/src/Amesos_Scalapack.h
+++ b/packages/amesos/src/Amesos_Scalapack.h
@@ -42,6 +42,12 @@
#ifndef _AMESOS_SCALAPACK_H_
#define _AMESOS_SCALAPACK_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -408,10 +414,3 @@ 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 7bbc156ee9b4..7a0cd785a5df 100644
--- a/packages/amesos/src/Amesos_Scaling.h
+++ b/packages/amesos/src/Amesos_Scaling.h
@@ -40,6 +40,12 @@
#ifndef AMESOS_SCALING_H
#define AMESOS_SCALING_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
//! Amesos_Scaling: base class for scaling procedures.
class Amesos_Scaling
{
@@ -55,10 +61,3 @@ 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 c69260346689..e70278704c62 100644
--- a/packages/amesos/src/Amesos_Status.h
+++ b/packages/amesos/src/Amesos_Status.h
@@ -1,6 +1,12 @@
#ifndef AMESOS_STATUS_H
#define AMESOS_STATUS_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Teuchos_ParameterList.hpp"
using namespace Teuchos;
@@ -77,10 +83,3 @@ 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 7e067d874ec8..940aceb40956 100644
--- a/packages/amesos/src/Amesos_Superlu.h
+++ b/packages/amesos/src/Amesos_Superlu.h
@@ -66,6 +66,12 @@
#ifndef AMESOS_SUPERLU_H
#define AMESOS_SUPERLU_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -238,10 +244,3 @@ 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 e9f44367090f..6ba6082ee8ef 100644
--- a/packages/amesos/src/Amesos_Superludist.h
+++ b/packages/amesos/src/Amesos_Superludist.h
@@ -29,6 +29,12 @@
#ifndef AMESOS_SUPERLUDIST_H
#define AMESOS_SUPERLUDIST_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -219,10 +225,3 @@ 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 870e4046788a..0e4104335042 100644
--- a/packages/amesos/src/Amesos_Support.h
+++ b/packages/amesos/src/Amesos_Support.h
@@ -1,6 +1,12 @@
#ifndef AMESOS_SUPPORT_H
#define AMESOS_SUPPORT_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Epetra_CrsMatrix.h"
#include "Epetra_MultiVector.h"
#include "Epetra_Map.h"
@@ -75,10 +81,3 @@ 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 2de58a524a32..9e9280a1a1e2 100644
--- a/packages/amesos/src/Amesos_Taucs.h
+++ b/packages/amesos/src/Amesos_Taucs.h
@@ -39,6 +39,12 @@
#ifndef AMESOS_TAUCS_H
#define AMESOS_TAUCS_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
@@ -218,10 +224,3 @@ 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 8c4651ba101d..5f28ae38ac3b 100644
--- a/packages/amesos/src/Amesos_TestRowMatrix.h
+++ b/packages/amesos/src/Amesos_TestRowMatrix.h
@@ -1,6 +1,12 @@
#ifndef IFPACK_ROWMATRIX_H
#define IFPACK_ROWMATRIX_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#ifdef HAVE_MPI
#include "Epetra_MpiComm.h"
@@ -369,11 +375,3 @@ 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 28698d0e1788..dfaef5c3728f 100644
--- a/packages/amesos/src/Amesos_Time.h
+++ b/packages/amesos/src/Amesos_Time.h
@@ -1,6 +1,12 @@
#ifndef AMESOS_TIME_H
#define AMESOS_TIME_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Epetra_Comm.h"
#include "Epetra_Time.h"
#include "Teuchos_Array.hpp"
@@ -142,10 +148,3 @@ 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 6d01cde3be8d..7f2f13184467 100644
--- a/packages/amesos/src/Amesos_Umfpack.h
+++ b/packages/amesos/src/Amesos_Umfpack.h
@@ -40,6 +40,12 @@
#ifndef AMESOS_UMFPACK_H
#define AMESOS_UMFPACK_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Amesos_ConfigDefs.h"
#include "Amesos_BaseSolver.h"
#include "Amesos_BaseSolver.h"
@@ -264,10 +270,3 @@ 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 eec0944afdbe..946d14f3b9ed 100644
--- a/packages/amesos/src/Amesos_Utils.h
+++ b/packages/amesos/src/Amesos_Utils.h
@@ -1,6 +1,12 @@
#ifndef AMESOS_UTILS_H
#define AMESOS_UTILS_H
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Epetra_RowMatrix.h"
#include "Epetra_MultiVector.h"
#include "Epetra_Vector.h"
@@ -99,10 +105,3 @@ 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 44268f658156..d62b42dab7d7 100644
--- a/packages/amesos/src/CrsMatrixTranspose.h
+++ b/packages/amesos/src/CrsMatrixTranspose.h
@@ -30,10 +30,6 @@
#ifndef CRSMATRIXTRANSPOSE
#define CRSMATRIXTRANSPOSE
-#include "Epetra_CrsMatrix.h"
-int CrsMatrixTranspose( Epetra_CrsMatrix *In, Epetra_CrsMatrix *Out ) ;
-#endif
-
#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
#ifdef __GNUC__
@@ -41,3 +37,6 @@ int CrsMatrixTranspose( Epetra_CrsMatrix *In, Epetra_CrsMatrix *Out ) ;
#endif
#endif
+#include "Epetra_CrsMatrix.h"
+int CrsMatrixTranspose( Epetra_CrsMatrix *In, Epetra_CrsMatrix *Out ) ;
+#endif
diff --git a/packages/amesos/src/src-repository/Epetra_SLU.h b/packages/amesos/src/src-repository/Epetra_SLU.h
index c497effd09ce..5a7caa5ffdfc 100644
--- a/packages/amesos/src/src-repository/Epetra_SLU.h
+++ b/packages/amesos/src/src-repository/Epetra_SLU.h
@@ -29,6 +29,12 @@
#ifndef _EPETRA_SLU_H_
#define _EPETRA_SLU_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
class Epetra_LinearProblem;
class Epetra_CrsMatrix;
class Epetra_MultiVector;
@@ -125,10 +131,3 @@ 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 b7957432e187..71dc85addeaf 100644
--- a/packages/amesos/src/src-repository/SpoolesOO.h
+++ b/packages/amesos/src/src-repository/SpoolesOO.h
@@ -29,6 +29,12 @@
#ifndef _SPOOLESOO_H_
#define _SPOOLESOO_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
class Epetra_Comm;
class Epetra_BlockMap;
class Epetra_MultiVector;
@@ -98,11 +104,3 @@ 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 738222ed3c4b..a4c57f843290 100644
--- a/packages/amesos/src/src-repository/Superludist2_OO.h
+++ b/packages/amesos/src/src-repository/Superludist2_OO.h
@@ -37,6 +37,12 @@
#ifndef _SUPERLUDIST2_OO_H_
#define _SUPERLUDIST2_OO_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
class Epetra_Comm;
class Epetra_BlockMap;
class Epetra_MultiVector;
@@ -299,11 +305,3 @@ 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 5b11b25def47..7c890d5cb021 100644
--- a/packages/amesos/src/src-repository/SuperludistOO.h
+++ b/packages/amesos/src/src-repository/SuperludistOO.h
@@ -36,6 +36,12 @@
#ifndef _SUPERLUDISTOO_H_
#define _SUPERLUDISTOO_H_
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
class Epetra_Comm;
class Epetra_BlockMap;
class Epetra_MultiVector;
@@ -293,11 +299,3 @@ 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 3a0aae679352..35e7bf5f5092 100644
--- a/packages/amesos/test/TestOptions/CreateTridi.h
+++ b/packages/amesos/test/TestOptions/CreateTridi.h
@@ -49,4 +49,3 @@ int CreateTridiPlus(Epetra_CrsMatrix& A) ;
#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 2ee6cc2a56ff..2d4118c88240 100644
--- a/packages/amesos/test/TestOptions/NewMatNewMap.h
+++ b/packages/amesos/test/TestOptions/NewMatNewMap.h
@@ -14,4 +14,3 @@ RCP NewMatNewMap(Epetra_CrsMatrix& In,
#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 b68e12471382..80802242ced5 100644
--- a/packages/amesos/test/TestOptions/PartialFactorization.h
+++ b/packages/amesos/test/TestOptions/PartialFactorization.h
@@ -16,4 +16,3 @@ int PartialFactorization( const char* AmesosClass,
#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 6fdfe350839e..832718519de3 100644
--- a/packages/amesos/test/TestOptions/PerformOneSolveAndTest.h
+++ b/packages/amesos/test/TestOptions/PerformOneSolveAndTest.h
@@ -20,4 +20,3 @@ int PerformOneSolveAndTest(const char* AmesosClass,
#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 0c7db9354bb5..364afd310381 100644
--- a/packages/amesos/test/TestOptions/TestAllClasses.h
+++ b/packages/amesos/test/TestOptions/TestAllClasses.h
@@ -27,4 +27,3 @@ int TestAllClasses( const std::vector AmesosClasses,
#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 7b0bf7e03fc6..1e6a7f334881 100644
--- a/packages/amesos/test/TestOptions/TestKlu.h
+++ b/packages/amesos/test/TestOptions/TestKlu.h
@@ -21,4 +21,3 @@ int TestKlu( Epetra_CrsMatrix *& Amat,
#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 e91016ec729a..b70f04d581b0 100644
--- a/packages/amesos/test/TestOptions/TestOtherClasses.h
+++ b/packages/amesos/test/TestOptions/TestOtherClasses.h
@@ -20,4 +20,3 @@ int TestOtherClasses( const char* AmesosClass,
#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 1cf7f3148c05..21986ba12e04 100644
--- a/packages/amesos/test/TestOptions/TestScalapack.h
+++ b/packages/amesos/test/TestOptions/TestScalapack.h
@@ -16,4 +16,3 @@ int TestScalapack( Epetra_CrsMatrix *& Amat,
#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 e60037725fc4..abf26cd487f8 100644
--- a/packages/amesos/test/TestOptions/TestSuperludist.h
+++ b/packages/amesos/test/TestOptions/TestSuperludist.h
@@ -17,4 +17,3 @@ int TestSuperludist( Epetra_CrsMatrix *& Amat,
#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 811cb420e70f..b8dd1e3be9a6 100644
--- a/packages/amesos/test/Test_Basic/Amesos_TestSolver.h
+++ b/packages/amesos/test/Test_Basic/Amesos_TestSolver.h
@@ -52,4 +52,3 @@ int Amesos_TestMrhsSolver( Epetra_Comm &Comm, char *matrix_file, int numsolves,
#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 8ebecb720236..97543bb18ec6 100644
--- a/packages/amesos/test/Test_Basic/SparseDirectTimingVars.h
+++ b/packages/amesos/test/Test_Basic/SparseDirectTimingVars.h
@@ -30,6 +30,13 @@
#ifndef SPARSEDIRECTTIMINGVARS_H
#define SPARSEDIRECTTIMINGVARS_H
+
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#define SPARSE_DIRECT_TIMINGS
#ifdef SPARSE_DIRECT_TIMINGS
#include "SparseSolverResult.h"
@@ -45,11 +52,3 @@ 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 a845ecb8427f..4f5c424aa220 100644
--- a/packages/amesos/test/Test_Basic/SparseSolverResult.h
+++ b/packages/amesos/test/Test_Basic/SparseSolverResult.h
@@ -30,6 +30,13 @@
#ifndef SPARSESOLVERRESULT
#define SPARSESOLVERRESULT
+
+#if defined(Amesos_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Amesos package is deprecated"
+#endif
+#endif
+
#include "Epetra_Object.h"
const double UnUsedDbl = 13e130;
@@ -85,10 +92,3 @@ 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/amesos2/src/basker/basker_old/basker.h b/packages/amesos2/src/basker/basker_old/basker.h
index 13d27e634764..1322210de7b2 100644
--- a/packages/amesos2/src/basker/basker_old/basker.h
+++ b/packages/amesos2/src/basker/basker_old/basker.h
@@ -88,4 +88,3 @@ long basker_basker_l
#define PRINT(params)
#endif /* DEBUG */
-
diff --git a/packages/anasazi/epetra/src-rbgen/RBGen_BurkardtFileIOHandler.h b/packages/anasazi/epetra/src-rbgen/RBGen_BurkardtFileIOHandler.h
index 20cce5520ec5..2714b788bbcf 100644
--- a/packages/anasazi/epetra/src-rbgen/RBGen_BurkardtFileIOHandler.h
+++ b/packages/anasazi/epetra/src-rbgen/RBGen_BurkardtFileIOHandler.h
@@ -89,4 +89,3 @@ namespace RBGen {
} // namespace RBGen
#endif // BURKARDT_FILE_IO_HANDLER_H
-
diff --git a/packages/anasazi/epetra/src-rbgen/RBGen_EpetraCrsMatrixFileIOHandler.h b/packages/anasazi/epetra/src-rbgen/RBGen_EpetraCrsMatrixFileIOHandler.h
index f56f764f647a..19793b7b0735 100644
--- a/packages/anasazi/epetra/src-rbgen/RBGen_EpetraCrsMatrixFileIOHandler.h
+++ b/packages/anasazi/epetra/src-rbgen/RBGen_EpetraCrsMatrixFileIOHandler.h
@@ -81,4 +81,3 @@ namespace RBGen {
} // namespace RBGen
#endif // EPETRA_CRSMATRIX_FILE_IO_HANDLER_H
-
diff --git a/packages/anasazi/epetra/src-rbgen/RBGen_ISVDUDV.h b/packages/anasazi/epetra/src-rbgen/RBGen_ISVDUDV.h
index 5852ff9f5392..841dbfd73714 100644
--- a/packages/anasazi/epetra/src-rbgen/RBGen_ISVDUDV.h
+++ b/packages/anasazi/epetra/src-rbgen/RBGen_ISVDUDV.h
@@ -92,4 +92,3 @@ namespace RBGen {
} // end of RBGen namespace
#endif // RBGEN_ISVDUDV_H
-
diff --git a/packages/anasazi/epetra/src-rbgen/RBGen_MatrixMarketFileIOHandler.h b/packages/anasazi/epetra/src-rbgen/RBGen_MatrixMarketFileIOHandler.h
index dc84aac30e29..33cebe98dd85 100644
--- a/packages/anasazi/epetra/src-rbgen/RBGen_MatrixMarketFileIOHandler.h
+++ b/packages/anasazi/epetra/src-rbgen/RBGen_MatrixMarketFileIOHandler.h
@@ -84,4 +84,3 @@ namespace RBGen {
} // namespace RBGen
#endif // MATRIX_MARKET_FILE_IO_HANDLER_H
-
diff --git a/packages/anasazi/epetra/src-rbgen/RBGen_NetCDFFileIOHandler.h b/packages/anasazi/epetra/src-rbgen/RBGen_NetCDFFileIOHandler.h
index 8c8b9ac31a3e..bdc2c5874808 100644
--- a/packages/anasazi/epetra/src-rbgen/RBGen_NetCDFFileIOHandler.h
+++ b/packages/anasazi/epetra/src-rbgen/RBGen_NetCDFFileIOHandler.h
@@ -90,4 +90,3 @@ namespace RBGen {
} // namespace RBGen
#endif // NETCDF_FILE_IO_HANDLER_H
-
diff --git a/packages/anasazi/epetra/util/ModeLaplace/CheckingTools.h b/packages/anasazi/epetra/util/ModeLaplace/CheckingTools.h
index ad4ac8877d34..5a5cdec02049 100644
--- a/packages/anasazi/epetra/util/ModeLaplace/CheckingTools.h
+++ b/packages/anasazi/epetra/util/ModeLaplace/CheckingTools.h
@@ -70,4 +70,3 @@ class ANASAZIEPETRA_MODELAPLACE_LIB_DLL_EXPORT CheckingTools {
#endif
-
diff --git a/packages/anasazi/epetra/util/ModeLaplace/SortingTools.h b/packages/anasazi/epetra/util/ModeLaplace/SortingTools.h
index 33550c25d225..9eb84e70aecd 100644
--- a/packages/anasazi/epetra/util/ModeLaplace/SortingTools.h
+++ b/packages/anasazi/epetra/util/ModeLaplace/SortingTools.h
@@ -33,4 +33,3 @@ class SortingTools {
};
#endif
-
diff --git a/packages/anasazi/src/ModalAnalysisSolvers/CheckingTools.h b/packages/anasazi/src/ModalAnalysisSolvers/CheckingTools.h
index c76b03b0a640..a0f81ba2163f 100644
--- a/packages/anasazi/src/ModalAnalysisSolvers/CheckingTools.h
+++ b/packages/anasazi/src/ModalAnalysisSolvers/CheckingTools.h
@@ -69,4 +69,3 @@ class CheckingTools {
#endif
-
diff --git a/packages/anasazi/src/ModalAnalysisSolvers/ModalAnalysisSolver.h b/packages/anasazi/src/ModalAnalysisSolvers/ModalAnalysisSolver.h
index 60fceb614a4a..ac83d7d1de0f 100644
--- a/packages/anasazi/src/ModalAnalysisSolvers/ModalAnalysisSolver.h
+++ b/packages/anasazi/src/ModalAnalysisSolvers/ModalAnalysisSolver.h
@@ -43,4 +43,3 @@ class ModalAnalysisSolver {
#endif
-
diff --git a/packages/anasazi/src/ModalAnalysisSolvers/ModalTools.h b/packages/anasazi/src/ModalAnalysisSolvers/ModalTools.h
index 1f20bb167d41..af662e02e309 100644
--- a/packages/anasazi/src/ModalAnalysisSolvers/ModalTools.h
+++ b/packages/anasazi/src/ModalAnalysisSolvers/ModalTools.h
@@ -87,4 +87,3 @@ class ModalTools {
#endif
-
diff --git a/packages/anasazi/src/ModalAnalysisSolvers/SortingTools.h b/packages/anasazi/src/ModalAnalysisSolvers/SortingTools.h
index 0fbfc72c4985..14cbcc44e18d 100644
--- a/packages/anasazi/src/ModalAnalysisSolvers/SortingTools.h
+++ b/packages/anasazi/src/ModalAnalysisSolvers/SortingTools.h
@@ -33,4 +33,3 @@ class SortingTools {
};
#endif
-
diff --git a/packages/aztecoo/example/aztec_app/example_specific.h b/packages/aztecoo/example/aztec_app/example_specific.h
index b28b1c66f695..1207d7be6897 100644
--- a/packages/aztecoo/example/aztec_app/example_specific.h
+++ b/packages/aztecoo/example/aztec_app/example_specific.h
@@ -119,4 +119,3 @@ extern int example_specific_comm_wrapper(double vec[], AZ_MATRIX *Amat);
extern int simple_example_specific_getrow( int columns[], double values[],
int row_lengths[], struct AZ_MATRIX_STRUCT *Amat, int N_requested_rows,
int requested_rows[], int allocated_space);
-
diff --git a/packages/aztecoo/src/AZOO_iterate.h b/packages/aztecoo/src/AZOO_iterate.h
index bbbc09e7c138..17f130aa985c 100644
--- a/packages/aztecoo/src/AZOO_iterate.h
+++ b/packages/aztecoo/src/AZOO_iterate.h
@@ -45,6 +45,12 @@
#ifndef _AZOO_ITERATE_H_
#define _AZOO_ITERATE_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#ifndef __cplusplus
#define __cplusplus
#endif
@@ -107,10 +113,3 @@ 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 ffe3f7ad0ac5..5285dc2010be 100644
--- a/packages/aztecoo/src/AZOO_printf.h
+++ b/packages/aztecoo/src/AZOO_printf.h
@@ -44,6 +44,12 @@
#ifndef _AZOO_printf_h_
#define _AZOO_printf_h_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -79,11 +85,3 @@ void AZOO_clear_streams();
#endif
#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 6ddcccbc8914..0595b2034581 100644
--- a/packages/aztecoo/src/Aztec2Petra.h
+++ b/packages/aztecoo/src/Aztec2Petra.h
@@ -45,6 +45,12 @@
#ifndef _AZTEC2PETRA_H_
#define _AZTEC2PETRA_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#ifndef __cplusplus
#define __cplusplus
#endif
@@ -127,10 +133,3 @@ 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 151edebac90b..f5383f6555a0 100644
--- a/packages/aztecoo/src/AztecOO.h
+++ b/packages/aztecoo/src/AztecOO.h
@@ -45,6 +45,12 @@
#ifndef _AZTECOO_H_
#define _AZTECOO_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include
class Epetra_Comm;
@@ -692,11 +698,3 @@ void AztecOO_StatusTest_wrapper(void * conv_test_obj,void * res_vector_obj,
int sol_updated, int * converged, int * isnan,
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 0a252fad6027..971da0613919 100644
--- a/packages/aztecoo/src/AztecOO_ConditionNumber.h
+++ b/packages/aztecoo/src/AztecOO_ConditionNumber.h
@@ -42,6 +42,12 @@
#ifndef AZTECOO_CONDITIONNUMBER_H
#define AZTECOO_CONDITIONNUMBER_H
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
class Epetra_Map;
class Epetra_Vector;
class Epetra_Operator;
@@ -118,10 +124,3 @@ 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 cfe8268de67d..4ee4a5d39a46 100644
--- a/packages/aztecoo/src/AztecOO_ConfigDefs.h
+++ b/packages/aztecoo/src/AztecOO_ConfigDefs.h
@@ -45,6 +45,12 @@
#ifndef AZTECOO_CONFIGDEFS_H
#define AZTECOO_CONFIGDEFS_H
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#ifndef TRILINOS_NO_CONFIG_H
/*
@@ -103,10 +109,3 @@
#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 e534159ee467..a7ce3fa5d8ce 100644
--- a/packages/aztecoo/src/AztecOO_Operator.h
+++ b/packages/aztecoo/src/AztecOO_Operator.h
@@ -45,6 +45,12 @@
#ifndef _AZTECOO_OPERATOR_H_
#define _AZTECOO_OPERATOR_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
class Epetra_MultiVector;
class Epetra_BlockMap;
class Epetra_Comm;
@@ -175,11 +181,3 @@ 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 0c719f095893..58fb958a9fba 100644
--- a/packages/aztecoo/src/AztecOO_Scaling.h
+++ b/packages/aztecoo/src/AztecOO_Scaling.h
@@ -45,6 +45,12 @@
#ifndef _AZTECOO_SCALING_H_
#define _AZTECOO_SCALING_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include
#include
@@ -63,11 +69,3 @@ int AztecOO_scale_epetra(int action,
AZ_SCALING* scaling);
#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 e252fa4c1749..c48b3f454c10 100644
--- a/packages/aztecoo/src/AztecOO_StatusTest.h
+++ b/packages/aztecoo/src/AztecOO_StatusTest.h
@@ -45,6 +45,12 @@
#ifndef AZTECOO_STATUSTEST_H
#define AZTECOO_STATUSTEST_H
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
class Epetra_MultiVector;
#include "AztecOO_StatusType.h"
#include "Epetra_ConfigDefs.h"
@@ -149,10 +155,3 @@ 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 acef2ac0a688..ef3f8f71af91 100644
--- a/packages/aztecoo/src/AztecOO_StatusTestCombo.h
+++ b/packages/aztecoo/src/AztecOO_StatusTestCombo.h
@@ -45,6 +45,12 @@
#ifndef AZTECOO_STATUSTESTCOMBO_H
#define AZTECOO_STATUSTESTCOMBO_H
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "AztecOO_StatusTest.h"
#include
class Epetra_MultiVector;
@@ -191,10 +197,3 @@ 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 fb25bacb2ef5..39b3489d34c6 100644
--- a/packages/aztecoo/src/AztecOO_StatusTestMaxIters.h
+++ b/packages/aztecoo/src/AztecOO_StatusTestMaxIters.h
@@ -45,6 +45,12 @@
#ifndef AZTECOO_STATUSTESTMAXITERS_H
#define AZTECOO_STATUSTESTMAXITERS_H
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "AztecOO_StatusTest.h"
class Epetra_MultiVector;
@@ -123,10 +129,3 @@ 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 522cba597e19..c0babce64433 100644
--- a/packages/aztecoo/src/AztecOO_StatusTestResNorm.h
+++ b/packages/aztecoo/src/AztecOO_StatusTestResNorm.h
@@ -45,6 +45,12 @@
#ifndef AZTECOO_STATUSTESTRESNORM_H
#define AZTECOO_STATUSTESTRESNORM_H
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "AztecOO_StatusTest.h"
#include
class Epetra_MultiVector;
@@ -329,10 +335,3 @@ 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 0a4b11649b22..b38d87490577 100644
--- a/packages/aztecoo/src/AztecOO_StatusType.h
+++ b/packages/aztecoo/src/AztecOO_StatusType.h
@@ -44,6 +44,13 @@
#ifndef AZTECOO_STATUSTYPE_H
#define AZTECOO_STATUSTYPE_H
+
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
/*! \file AztecOO_StatusType.h
\brief AztecOO StatusType: Used to return convergence status information for AztecOO_StatusTest objects.
*/
@@ -64,10 +71,3 @@ 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 1192840b98e7..4ff82bae3d1e 100644
--- a/packages/aztecoo/src/AztecOO_Version.h
+++ b/packages/aztecoo/src/AztecOO_Version.h
@@ -42,6 +42,12 @@
#ifndef AZTECOO_VERSION_H
#define AZTECOO_VERSION_H
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "AztecOO.h"
#include "Trilinos_version.h"
@@ -50,10 +56,3 @@
}
#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 b834e11bc58f..c685e16782f4 100644
--- a/packages/aztecoo/src/AztecOO_string_maps.h
+++ b/packages/aztecoo/src/AztecOO_string_maps.h
@@ -45,6 +45,12 @@
#ifndef _AztecOO_string_maps_h_
#define _AztecOO_string_maps_h_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include
#ifdef HAVE_AZTECOO_TEUCHOS
@@ -56,11 +62,3 @@ void AztecOO_initialize_maps();
#endif
#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 7a44eb291718..371ba70d7cfc 100644
--- a/packages/aztecoo/src/Epetra_MsrMatrix.h
+++ b/packages/aztecoo/src/Epetra_MsrMatrix.h
@@ -45,6 +45,12 @@
#ifndef _EPETRA_MSRMATRIX_H_
#define _EPETRA_MSRMATRIX_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "Epetra_Object.h"
#include "Epetra_CompObject.h"
#include "Epetra_RowMatrix.h"
@@ -416,10 +422,3 @@ 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 efc554ab3d29..22b991a6e12f 100644
--- a/packages/aztecoo/src/az_aztec.h
+++ b/packages/aztecoo/src/az_aztec.h
@@ -71,6 +71,12 @@
#define __AZTECH__
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "az_aztec_defs.h"
#include "az_f77func.h"
/* Some older codes use AZ_MPI to set MPI mode for AztecOO/Aztec.
@@ -1643,10 +1649,3 @@ 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 5243196ee1ab..40c55a1d0a0c 100644
--- a/packages/aztecoo/src/az_aztec_defs.h
+++ b/packages/aztecoo/src/az_aztec_defs.h
@@ -61,6 +61,12 @@
#define __AZTECDEFSH__
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#ifndef TRILINOS_NO_CONFIG_H
/*
@@ -745,10 +751,3 @@
#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 41172cef1e12..f1c08db602a8 100644
--- a/packages/aztecoo/src/az_aztecf.h
+++ b/packages/aztecoo/src/az_aztecf.h
@@ -453,4 +453,3 @@
#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 2e4d9fddbd5d..42805645f1df 100644
--- a/packages/aztecoo/src/az_blas_wrappers.h
+++ b/packages/aztecoo/src/az_blas_wrappers.h
@@ -44,6 +44,12 @@
#ifndef _AZ_BLAS_WRAPPERS_H_
#define _AZ_BLAS_WRAPPERS_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "az_f77func.h"
#if defined(CRAY_T3X)
@@ -132,10 +138,3 @@ 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 043618897266..83f38ff11c9e 100644
--- a/packages/aztecoo/src/az_f77func.h
+++ b/packages/aztecoo/src/az_f77func.h
@@ -44,6 +44,12 @@
#ifndef _AZ_F77FUNC_H_
#define _AZ_F77FUNC_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "az_aztec_defs.h"
#include
@@ -122,10 +128,3 @@
#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 92de772d0a6e..ec54af8a4ebb 100644
--- a/packages/aztecoo/src/az_lapack_wrappers.h
+++ b/packages/aztecoo/src/az_lapack_wrappers.h
@@ -44,6 +44,12 @@
#ifndef _AZ_LAPACK_WRAPPERS_H_
#define _AZ_LAPACK_WRAPPERS_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "az_f77func.h"
#if defined(CRAY_T3X)
@@ -109,10 +115,3 @@ 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 0d49c6eb431b..ae6938eebc53 100644
--- a/packages/aztecoo/src/az_y12m_wrappers.h
+++ b/packages/aztecoo/src/az_y12m_wrappers.h
@@ -44,6 +44,12 @@
#ifndef _AZ_Y12M_WRAPPERS_H_
#define _AZ_Y12M_WRAPPERS_H_
+#if defined(AztecOO_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The AztecOO package is deprecated"
+#endif
+#endif
+
#include "az_f77func.h"
# define Y12MBF_F77 F77_FUNC(y12mbf,Y12MBF)
@@ -71,10 +77,3 @@ 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/belos/epetra/src/BelosEpetraOperator.h b/packages/belos/epetra/src/BelosEpetraOperator.h
index 6aab79fa3861..ba16d289e29a 100644
--- a/packages/belos/epetra/src/BelosEpetraOperator.h
+++ b/packages/belos/epetra/src/BelosEpetraOperator.h
@@ -119,5 +119,4 @@ class EpetraOperator : public virtual Epetra_Operator {
} //end namespace Belos
// end of file BELOS_EPETRA_OPERATOR_H
-#endif
-
+#endif
diff --git a/packages/common/auxiliarySoftware/SuiteSparse/src/CHOLMOD/Include/amesos_cholmod_io64.h b/packages/common/auxiliarySoftware/SuiteSparse/src/CHOLMOD/Include/amesos_cholmod_io64.h
index 77caa0719a14..60f5fac32ad6 100644
--- a/packages/common/auxiliarySoftware/SuiteSparse/src/CHOLMOD/Include/amesos_cholmod_io64.h
+++ b/packages/common/auxiliarySoftware/SuiteSparse/src/CHOLMOD/Include/amesos_cholmod_io64.h
@@ -43,4 +43,3 @@
#endif
#endif
-
diff --git a/packages/compadre/examples/CMakeLists.tribits.cmake b/packages/compadre/examples/CMakeLists.tribits.cmake
index 523f31cae25d..3542e6a08425 100644
--- a/packages/compadre/examples/CMakeLists.tribits.cmake
+++ b/packages/compadre/examples/CMakeLists.tribits.cmake
@@ -518,7 +518,7 @@ if (NOT(Compadre_DEBUG OR Compadre_EXTREME_DEBUG))
# This test is too slow in DEBUG (3x longer than all other tests
# combined)
- if (PYTHON_EXECUTABLE)
+ if (Python3_EXECUTABLE)
# Python driven test of a C++ executable (Python changes command line
# arguments given to executable)
configure_file(
@@ -529,7 +529,7 @@ if (NOT(Compadre_DEBUG OR Compadre_EXTREME_DEBUG))
set(testName GMLS_Manifold_Multiple_Evaluation_Sites)
TRIBITS_ADD_ADVANCED_TEST(
${testName}
- TEST_0 CMND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold_Multiple_Evaluation_Sites.py --porder=3 --grids=3 --in-trilinos=True
+ TEST_0 CMND ${Python3_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold_Multiple_Evaluation_Sites.py --porder=3 --grids=3 --in-trilinos=True
PASS_REGULAR_EXPRESSION "Passed."
COMM mpi serial
ADDED_TEST_NAME_OUT ${testName}_CREATED
@@ -546,7 +546,7 @@ if (NOT(Compadre_DEBUG OR Compadre_EXTREME_DEBUG))
$
)
endif() # test created
- endif() # PYTHON_EXECUTABLE
+ endif() # Python3_EXECUTABLE
# Divergence-free basis test for GMLS on non-manifold
# Note: QR is needed to be used here due to the null space introduced
@@ -634,7 +634,7 @@ if (NOT(Compadre_DEBUG OR Compadre_EXTREME_DEBUG))
#endif() # test created
endif() # not debug
-if (PYTHON_EXECUTABLE)
+if (Python3_EXECUTABLE)
# Python driven test of a C++ executable (Python changes command line
# arguments given to executable) - calling QR solver
configure_file(
@@ -645,7 +645,7 @@ if (PYTHON_EXECUTABLE)
set(testName GMLS_Manifold_Refinement_Study_QR)
TRIBITS_ADD_ADVANCED_TEST(
${testName}
- TEST_0 CMND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py --porder=3 --grids=4 --solver-type=QR --in-trilinos=True
+ TEST_0 CMND ${Python3_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py --porder=3 --grids=4 --solver-type=QR --in-trilinos=True
PASS_REGULAR_EXPRESSION "Passed."
COMM mpi serial
ADDED_TEST_NAME_OUT ${testName}_CREATED
@@ -668,7 +668,7 @@ if (PYTHON_EXECUTABLE)
set(testName GMLS_Manifold_Refinement_Study_LU)
TRIBITS_ADD_ADVANCED_TEST(
${testName}
- TEST_0 CMND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py --porder=3 --grids=4 --solver-type=LU --in-trilinos=True
+ TEST_0 CMND ${Python3_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py --porder=3 --grids=4 --solver-type=LU --in-trilinos=True
PASS_REGULAR_EXPRESSION "Passed."
COMM mpi serial
ADDED_TEST_NAME_OUT ${testName}_CREATED
@@ -698,7 +698,7 @@ if (PYTHON_EXECUTABLE)
set(testName GMLS_Staggered_Manifold_Refinement_Study)
TRIBITS_ADD_ADVANCED_TEST(
${testName}
- TEST_0 CMND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Staggered_Manifold.py --porder=3 --grids=4 --in-trilinos=True
+ TEST_0 CMND ${Python3_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Staggered_Manifold.py --porder=3 --grids=4 --in-trilinos=True
PASS_REGULAR_EXPRESSION "Passed."
COMM mpi serial
ADDED_TEST_NAME_OUT ${testName}_CREATED
@@ -715,7 +715,7 @@ if (PYTHON_EXECUTABLE)
$
)
endif() # test created
-endif() # PYTHON_EXECUTABLE
+endif() # Python3_EXECUTABLE
# Utility test - Filter By ID
set(testName Test_Utilities)
diff --git a/packages/epetra/example/petra_nonlinear/basis.h b/packages/epetra/example/petra_nonlinear/basis.h
index f492c459fd90..6772e339d341 100644
--- a/packages/epetra/example/petra_nonlinear/basis.h
+++ b/packages/epetra/example/petra_nonlinear/basis.h
@@ -65,4 +65,3 @@ class Basis {
#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 8c7e8d90f747..cd573991c720 100644
--- a/packages/epetra/src/Epetra_BLAS.h
+++ b/packages/epetra/src/Epetra_BLAS.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_BLAS_H
#define EPETRA_BLAS_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
@@ -183,10 +191,3 @@ 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 78d2552e582a..2567836bc8df 100644
--- a/packages/epetra/src/Epetra_BLAS_wrappers.h
+++ b/packages/epetra/src/Epetra_BLAS_wrappers.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_BLAS_WRAPPERS_H
#define EPETRA_BLAS_WRAPPERS_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
/* #include */
/* #include */
@@ -299,10 +307,3 @@ 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 a785eef20bee..e8e681bc91f2 100644
--- a/packages/epetra/src/Epetra_BasicDirectory.h
+++ b/packages/epetra/src/Epetra_BasicDirectory.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_BASICDIRECTORY_H
#define EPETRA_BASICDIRECTORY_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
#include "Epetra_Directory.h"
@@ -230,10 +238,3 @@ 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 4805012c03d4..1043f234fd76 100644
--- a/packages/epetra/src/Epetra_BasicRowMatrix.h
+++ b/packages/epetra/src/Epetra_BasicRowMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_BASICROWMATRIX_H
#define EPETRA_BASICROWMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_RowMatrix.h"
#include "Epetra_Object.h"
@@ -563,10 +571,3 @@ 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 ba6eab9f04a4..eb3995d97707 100644
--- a/packages/epetra/src/Epetra_BlockMap.h
+++ b/packages/epetra/src/Epetra_BlockMap.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_BLOCKMAP_H
#define EPETRA_BLOCKMAP_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
#include "Epetra_BlockMapData.h"
@@ -933,10 +941,3 @@ 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 5b2fad89024b..9748a06c06b5 100644
--- a/packages/epetra/src/Epetra_BlockMapData.h
+++ b/packages/epetra/src/Epetra_BlockMapData.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_BLOCKMAPDATA_H
#define EPETRA_BLOCKMAPDATA_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Data.h"
#include "Epetra_IntSerialDenseVector.h"
@@ -128,10 +136,3 @@ 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 6ec80e670101..cda98fd10839 100644
--- a/packages/epetra/src/Epetra_C_wrappers.h
+++ b/packages/epetra/src/Epetra_C_wrappers.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_C_WRAPPERS_H
#define EPETRA_C_WRAPPERS_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#ifdef EPETRA_FORTRAN
@@ -370,10 +378,3 @@ 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 dda75feef421..3d0c27edd765 100644
--- a/packages/epetra/src/Epetra_CombineMode.h
+++ b/packages/epetra/src/Epetra_CombineMode.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_COMBINEMODE_H
#define EPETRA_COMBINEMODE_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
/*! \file Epetra_CombineMode.h
\brief Epetra_Combine Mode enumerable type
*/
@@ -90,10 +98,3 @@ 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 64e16cccb469..6a4844271ecc 100644
--- a/packages/epetra/src/Epetra_Comm.h
+++ b/packages/epetra/src/Epetra_Comm.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_COMM_H
#define EPETRA_COMM_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
@@ -474,10 +482,3 @@ 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 76f9a8a6d411..a215995b544e 100644
--- a/packages/epetra/src/Epetra_CompObject.h
+++ b/packages/epetra/src/Epetra_CompObject.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_COMPOBJECT_H
#define EPETRA_COMPOBJECT_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
//! Epetra_CompObject: Functionality and data that is common to all computational classes.
/*! The Epetra_CompObject is a base class for all Epetra computational objects. It provides the basic
@@ -125,10 +133,3 @@ 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 7b16b00bf09e..af2213288f80 100644
--- a/packages/epetra/src/Epetra_ConfigDefs.h
+++ b/packages/epetra/src/Epetra_ConfigDefs.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_CONFIGDEFS_H
#define EPETRA_CONFIGDEFS_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#ifndef __cplusplus
#define __cplusplus
#endif
@@ -330,10 +338,3 @@ 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 9e1bb8825da7..d954c4d099bd 100644
--- a/packages/epetra/src/Epetra_CrsGraph.h
+++ b/packages/epetra/src/Epetra_CrsGraph.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_CRSGRAPH_H
#define EPETRA_CRSGRAPH_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_DistObject.h"
#include "Epetra_CrsGraphData.h"
@@ -1261,10 +1269,3 @@ 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 b94304b0e5a3..07d37118a894 100644
--- a/packages/epetra/src/Epetra_CrsGraphData.h
+++ b/packages/epetra/src/Epetra_CrsGraphData.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_CRSGRAPHDATA_H
#define EPETRA_CRSGRAPHDATA_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Data.h"
#include "Epetra_DataAccess.h"
@@ -339,10 +347,3 @@ 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 0f748b4b132c..9393ecdf4f62 100644
--- a/packages/epetra/src/Epetra_CrsMatrix.h
+++ b/packages/epetra/src/Epetra_CrsMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_CRSMATRIX_H
#define EPETRA_CRSMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_DistObject.h"
#include "Epetra_CompObject.h"
@@ -1782,10 +1790,3 @@ 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 1d6819fe1b87..84ab1f9f7098 100644
--- a/packages/epetra/src/Epetra_CrsSingletonFilter.h
+++ b/packages/epetra/src/Epetra_CrsSingletonFilter.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_CRSSINGLETONFILTER_H
#define EPETRA_CRSSINGLETONFILTER_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
#include "Epetra_CrsMatrix.h"
#include "Epetra_MapColoring.h"
@@ -313,10 +321,3 @@ 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 d7de575c1a02..2065de79f74f 100644
--- a/packages/epetra/src/Epetra_Data.h
+++ b/packages/epetra/src/Epetra_Data.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_DATA_H
#define EPETRA_DATA_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
//! Epetra_Data: The Epetra Base Data Class.
@@ -106,10 +114,3 @@ 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 305712ee24a2..a004a953c88a 100644
--- a/packages/epetra/src/Epetra_DataAccess.h
+++ b/packages/epetra/src/Epetra_DataAccess.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_DATAACCESS_H
#define EPETRA_DATAACCESS_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
/*! \file Epetra_DataAccess.h
\brief Epetra_DataAccess Mode enumerable type
*/
@@ -59,10 +67,3 @@ 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 5800ead1bfa8..216edc410c9a 100644
--- a/packages/epetra/src/Epetra_Directory.h
+++ b/packages/epetra/src/Epetra_Directory.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_DIRECTORY_H
#define EPETRA_DIRECTORY_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
class Epetra_BlockMap; // Compiler needs forward reference
@@ -123,10 +131,3 @@ 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 5bc90d507a64..ef000a462fd7 100644
--- a/packages/epetra/src/Epetra_DistObject.h
+++ b/packages/epetra/src/Epetra_DistObject.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_DISTOBJECT_H
#define EPETRA_DISTOBJECT_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
#include "Epetra_SrcDistObject.h"
@@ -281,10 +289,3 @@ 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 2b9548e42d82..cf0ad8420f82 100644
--- a/packages/epetra/src/Epetra_Distributor.h
+++ b/packages/epetra/src/Epetra_Distributor.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_DISTRIBUTOR_H
#define EPETRA_DISTRIBUTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
//! Epetra_Distributor: The Epetra Gather/Scatter Setup Base Class.
/*! The Epetra_Distributor class is an interface that encapsulates the general
information and services needed for other Epetra classes to perform gather/scatter
@@ -204,10 +212,3 @@ 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 95c88f4d2128..8ad52903e393 100644
--- a/packages/epetra/src/Epetra_Export.h
+++ b/packages/epetra/src/Epetra_Export.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_EXPORT_H
#define EPETRA_EXPORT_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
#include "Epetra_BlockMap.h"
@@ -317,10 +325,3 @@ 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 b15ebffd33f0..27b007f4ea40 100644
--- a/packages/epetra/src/Epetra_FECrsGraph.h
+++ b/packages/epetra/src/Epetra_FECrsGraph.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_FECRSGRAPH_H
#define EPETRA_FECRSGRAPH_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Map.h"
#include "Epetra_CrsGraph.h"
@@ -239,10 +247,3 @@ template<> inline std::map
#include
#include
@@ -857,10 +865,3 @@ template<> 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 ef271da4d2d1..4b5bfe5bbad0 100644
--- a/packages/epetra/src/Epetra_FEVbrMatrix.h
+++ b/packages/epetra/src/Epetra_FEVbrMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_FEVBRMATRIX_H
#define EPETRA_FEVBRMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include
#include
@@ -286,10 +294,3 @@ 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 8807428e3b1f..43c7a84c6adb 100644
--- a/packages/epetra/src/Epetra_FEVector.h
+++ b/packages/epetra/src/Epetra_FEVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_FEVECTOR_H
#define EPETRA_FEVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include
#include
#include
@@ -360,11 +368,3 @@ 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 177e605d329c..b348e8b986a8 100644
--- a/packages/epetra/src/Epetra_GIDTypeVector.h
+++ b/packages/epetra/src/Epetra_GIDTypeVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_GIDTYPEVECTOR_H
#define EPETRA_GIDTYPEVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_IntVector.h"
#include "Epetra_LongLongVector.h"
@@ -81,10 +89,3 @@ 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 182d360df721..56ac65ec7bb2 100644
--- a/packages/epetra/src/Epetra_HashTable.h
+++ b/packages/epetra/src/Epetra_HashTable.h
@@ -44,6 +44,14 @@
#ifndef Epetra_HashTable_H_
#define Epetra_HashTable_H_
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
template
@@ -146,10 +154,3 @@ 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 f0b95beddf44..41ae055a5f7e 100644
--- a/packages/epetra/src/Epetra_Import.h
+++ b/packages/epetra/src/Epetra_Import.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_IMPORT_H
#define EPETRA_IMPORT_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
#include "Epetra_BlockMap.h"
class Epetra_Distributor;
@@ -349,10 +357,3 @@ 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 22b624d99991..1f503c93f12c 100644
--- a/packages/epetra/src/Epetra_Import_Util.h
+++ b/packages/epetra/src/Epetra_Import_Util.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_IMPORT_UTIL_H
#define EPETRA_IMPORT_UTIL_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
#include "Epetra_CrsMatrix.h"
@@ -193,10 +201,3 @@ 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 43c28b7036f7..a0943ba58de2 100644
--- a/packages/epetra/src/Epetra_IntMultiVector.h
+++ b/packages/epetra/src/Epetra_IntMultiVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_INTMULTIVECTOR_H
#define EPETRA_INTMULTIVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
class Epetra_Comm;
class Epetra_BlockMap;
class Epetra_Map;
@@ -805,10 +813,3 @@ 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 65af8b1e5d76..92728d2f1391 100644
--- a/packages/epetra/src/Epetra_IntSerialDenseMatrix.h
+++ b/packages/epetra/src/Epetra_IntSerialDenseMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_INTSERIALDENSEMATRIX_H
#define EPETRA_INTSERIALDENSEMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
//! Epetra_IntSerialDenseMatrix: A class for constructing and using general dense integer matrices.
@@ -405,10 +413,3 @@ 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 61d1edb49349..87116c2e729f 100644
--- a/packages/epetra/src/Epetra_IntSerialDenseVector.h
+++ b/packages/epetra/src/Epetra_IntSerialDenseVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_INTSERIALDENSEVECTOR_H
#define EPETRA_INTSERIALDENSEVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
#include "Epetra_IntSerialDenseMatrix.h"
@@ -299,10 +307,3 @@ 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 9e1eaa6bf436..47a0f259a7af 100644
--- a/packages/epetra/src/Epetra_IntVector.h
+++ b/packages/epetra/src/Epetra_IntVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_INTVECTOR_H
#define EPETRA_INTVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_DistObject.h"
#include "Epetra_BlockMap.h"
@@ -307,10 +315,3 @@ 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 29b8cea93399..81a24ccafcd5 100644
--- a/packages/epetra/src/Epetra_InvOperator.h
+++ b/packages/epetra/src/Epetra_InvOperator.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_INVOPERATOR_H
#define EPETRA_INVOPERATOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
class Epetra_MultiVector;
class Epetra_BlockMap;
class Epetra_Comm;
@@ -165,11 +173,3 @@ 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 b6af502dcbe0..e06112091b35 100644
--- a/packages/epetra/src/Epetra_JadMatrix.h
+++ b/packages/epetra/src/Epetra_JadMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_JADMATRIX_H
#define EPETRA_JADMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_BasicRowMatrix.h"
#include "Epetra_Map.h"
#include "Epetra_Comm.h"
@@ -227,10 +235,3 @@ 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 8946bce81b27..bcebc4fb019a 100644
--- a/packages/epetra/src/Epetra_LAPACK.h
+++ b/packages/epetra/src/Epetra_LAPACK.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_LAPACK_H
#define EPETRA_LAPACK_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
//! Epetra_LAPACK: The Epetra LAPACK Wrapper Class.
/*! The Epetra_LAPACK class is a wrapper that encapsulates LAPACK
(Linear Algebra Package). LAPACK provides portable, high-
@@ -429,10 +437,3 @@ 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 b6aa00eaaccf..031236978c81 100644
--- a/packages/epetra/src/Epetra_LAPACK_wrappers.h
+++ b/packages/epetra/src/Epetra_LAPACK_wrappers.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_LAPACK_WRAPPERS_H
#define EPETRA_LAPACK_WRAPPERS_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#if defined(CRAY_T3X) || defined(INTEL_CXML) || defined(INTEL_MKL)
@@ -493,10 +501,3 @@ 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 cae087e75064..ff05d5c12c77 100644
--- a/packages/epetra/src/Epetra_LinearProblem.h
+++ b/packages/epetra/src/Epetra_LinearProblem.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_LINEARPROBLEM_H
#define EPETRA_LINEARPROBLEM_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_RowMatrix.h"
#include "Epetra_Operator.h"
#ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -200,10 +208,3 @@ 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 43327ca9a685..278b6b92a9e5 100644
--- a/packages/epetra/src/Epetra_LinearProblemRedistor.h
+++ b/packages/epetra/src/Epetra_LinearProblemRedistor.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_LINEARPROBLEMREDISTOR_H
#define EPETRA_LINEARPROBLEMREDISTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
class Epetra_Map;
class Epetra_Export;
class Epetra_LinearProblem;
@@ -246,10 +254,3 @@ 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 155a1c8efcf3..bdf7891835b9 100644
--- a/packages/epetra/src/Epetra_LocalMap.h
+++ b/packages/epetra/src/Epetra_LocalMap.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_LOCALMAP_H
#define EPETRA_LOCALMAP_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
//! Epetra_LocalMap: A class for replicating vectors and matrices across multiple processors.
/*! Small matrix and vector objects are often replicated on distributed memory
@@ -132,10 +140,3 @@ 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 cba6bf4b0ce3..4b0437c897cf 100644
--- a/packages/epetra/src/Epetra_LongLongSerialDenseMatrix.h
+++ b/packages/epetra/src/Epetra_LongLongSerialDenseMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_LONGLONGSERIALDENSEMATRIX_H
#define EPETRA_LONGLONGSERIALDENSEMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
@@ -410,10 +418,3 @@ 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 a41476a900b1..260c2a332674 100644
--- a/packages/epetra/src/Epetra_LongLongSerialDenseVector.h
+++ b/packages/epetra/src/Epetra_LongLongSerialDenseVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_LONGLONGSERIALDENSEVECTOR_H
#define EPETRA_LONGLONGSERIALDENSEVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
#include "Epetra_LongLongSerialDenseMatrix.h"
@@ -304,10 +312,3 @@ 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 0cacfec6468c..5548f118e00b 100644
--- a/packages/epetra/src/Epetra_LongLongVector.h
+++ b/packages/epetra/src/Epetra_LongLongVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_LONGLONGVECTOR_H
#define EPETRA_LONGLONGVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_DistObject.h"
#include "Epetra_BlockMap.h"
@@ -307,10 +315,3 @@ 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 59092758ee1f..1d96993f3b01 100644
--- a/packages/epetra/src/Epetra_Map.h
+++ b/packages/epetra/src/Epetra_Map.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_MAP_H
#define EPETRA_MAP_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
//! Epetra_Map: A class for partitioning vectors and matrices.
/*! It is often the case that multiple matrix and vector objects have an identical distribution
@@ -356,10 +364,3 @@ 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 d51fe9d9b233..7816765cb683 100644
--- a/packages/epetra/src/Epetra_MapColoring.h
+++ b/packages/epetra/src/Epetra_MapColoring.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_MAPCOLORING_H
#define EPETRA_MAPCOLORING_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_DistObject.h"
#include "Epetra_BlockMap.h"
@@ -323,10 +331,3 @@ 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 7862724b2a19..f57d6e9caddb 100644
--- a/packages/epetra/src/Epetra_MpiComm.h
+++ b/packages/epetra/src/Epetra_MpiComm.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_MPICOMM_H
#define EPETRA_MPICOMM_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
#include "Epetra_Object.h"
#include "Epetra_Comm.h"
#include "Epetra_MpiDistributor.h"
@@ -539,10 +547,3 @@ 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 ee9c3b71c6c6..50ed7d869b95 100644
--- a/packages/epetra/src/Epetra_MpiCommData.h
+++ b/packages/epetra/src/Epetra_MpiCommData.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_MPICOMMDATA_H
#define EPETRA_MPICOMMDATA_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Data.h"
#include
@@ -85,10 +93,3 @@ 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 2597be4d5c2e..4ec09b0b1ee6 100644
--- a/packages/epetra/src/Epetra_MpiDistributor.h
+++ b/packages/epetra/src/Epetra_MpiDistributor.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_MPIDISTRIBUTOR_H
#define EPETRA_MPIDISTRIBUTOR_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
#include "Epetra_Object.h"
#include "Epetra_Distributor.h"
class Epetra_MpiComm;
@@ -388,10 +396,3 @@ 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 efa1e13ef5d8..72ff984284f1 100644
--- a/packages/epetra/src/Epetra_MultiVector.h
+++ b/packages/epetra/src/Epetra_MultiVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_MULTIVECTOR_H
#define EPETRA_MULTIVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
class Epetra_Comm;
class Epetra_BlockMap;
class Epetra_Map;
@@ -1074,10 +1082,3 @@ 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 d427f224c618..8c5c4db40069 100644
--- a/packages/epetra/src/Epetra_Object.h
+++ b/packages/epetra/src/Epetra_Object.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_OBJECT_H
#define EPETRA_OBJECT_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_CombineMode.h"
#include "Epetra_DataAccess.h"
#include "Epetra_ConfigDefs.h"
@@ -212,10 +220,3 @@ 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 053614451534..f8f70175d2e8 100644
--- a/packages/epetra/src/Epetra_OffsetIndex.h
+++ b/packages/epetra/src/Epetra_OffsetIndex.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_OFFSETINDEX_H
#define EPETRA_OFFSETINDEX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
class Epetra_Import;
@@ -121,10 +129,3 @@ 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 44c538f22109..0385b5a6019d 100644
--- a/packages/epetra/src/Epetra_Operator.h
+++ b/packages/epetra/src/Epetra_Operator.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_OPERATOR_H
#define EPETRA_OPERATOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
class Epetra_MultiVector;
class Epetra_Map;
@@ -145,10 +153,3 @@ 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 0d253f8c4ad6..bab9950ef236 100644
--- a/packages/epetra/src/Epetra_OskiError.h
+++ b/packages/epetra/src/Epetra_OskiError.h
@@ -46,6 +46,14 @@
#ifndef EPETRA_OSKIERROR_H
#define EPETRA_OSKIERROR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
extern "C" {
#include
}
@@ -78,10 +86,3 @@ 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 8e8310b8e11f..7459fef114f5 100644
--- a/packages/epetra/src/Epetra_OskiMatrix.h
+++ b/packages/epetra/src/Epetra_OskiMatrix.h
@@ -46,6 +46,14 @@
#ifndef EPETRA_OSKIMATRIX_H
#define EPETRA_OSKIMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_OskiMultiVector.h"
#include "Epetra_OskiVector.h"
#include "Epetra_CrsMatrix.h"
@@ -799,10 +807,3 @@ 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 ec32f49a66c7..90b5f89b45f4 100644
--- a/packages/epetra/src/Epetra_OskiMultiVector.h
+++ b/packages/epetra/src/Epetra_OskiMultiVector.h
@@ -46,6 +46,14 @@
#ifndef EPETRA_OSKIMULTIVECTOR_H
#define EPETRA_OSKIMULTIVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_MultiVector.h"
extern "C" {
#include "oski/oski.h"
@@ -110,10 +118,3 @@ 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 e0c6b0004e41..d41f76d7c141 100644
--- a/packages/epetra/src/Epetra_OskiPermutation.h
+++ b/packages/epetra/src/Epetra_OskiPermutation.h
@@ -46,6 +46,14 @@
#ifndef EPETRA_OSKIPERMUTATION_H
#define EPETRA_OSKIPERMUTATION_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_OskiMatrix.h"
#include "Epetra_OskiMultiVector.h"
extern "C" {
@@ -115,10 +123,3 @@ 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 2553b40a35dd..ad0cabd87589 100644
--- a/packages/epetra/src/Epetra_OskiUtils.h
+++ b/packages/epetra/src/Epetra_OskiUtils.h
@@ -46,6 +46,14 @@
#ifndef EPETRA_OSKIUTILS_H
#define EPETRA_OSKIUTILS_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
extern "C" {
#include "oski/oski.h"
}
@@ -87,10 +95,3 @@ 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 c9ce5cd510e0..7ab74ca8beb0 100644
--- a/packages/epetra/src/Epetra_OskiVector.h
+++ b/packages/epetra/src/Epetra_OskiVector.h
@@ -46,6 +46,14 @@
#ifndef EPETRA_OSKIVECTOR_H
#define EPETRA_OSKIVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_OskiMultiVector.h"
#include "Epetra_Vector.h"
extern "C" {
@@ -105,10 +113,3 @@ 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 988c16f9829c..0ad7234f928f 100644
--- a/packages/epetra/src/Epetra_RowMatrix.h
+++ b/packages/epetra/src/Epetra_RowMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_ROWMATRIX_H
#define EPETRA_ROWMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
class Epetra_Comm;
class Epetra_Import;
class Epetra_Export;
@@ -280,10 +288,3 @@ 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 7c27ef08ac5c..e2f8b2b5db9a 100644
--- a/packages/epetra/src/Epetra_RowMatrixTransposer.h
+++ b/packages/epetra/src/Epetra_RowMatrixTransposer.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_ROWMATRIXTRANSPOSER_H
#define EPETRA_ROWMATRIXTRANSPOSER_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
#include
class Epetra_RowMatrix;
class Epetra_CrsMatrix;
@@ -164,10 +172,3 @@ 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 17ede0eb813d..17b3436effa4 100644
--- a/packages/epetra/src/Epetra_SerialComm.h
+++ b/packages/epetra/src/Epetra_SerialComm.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_SERIALCOMM_H
#define EPETRA_SERIALCOMM_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
#include "Epetra_Comm.h"
@@ -498,10 +506,3 @@ 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 9933f4e23dec..8ed759d89fc6 100644
--- a/packages/epetra/src/Epetra_SerialCommData.h
+++ b/packages/epetra/src/Epetra_SerialCommData.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_SERIALCOMMDATA_H
#define EPETRA_SERIALCOMMDATA_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Data.h"
//! Epetra_SerialCommData: The Epetra Serial Communication Data Class.
@@ -75,10 +83,3 @@ 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 b5c254fa1168..788f02b1a4e5 100644
--- a/packages/epetra/src/Epetra_SerialDenseMatrix.h
+++ b/packages/epetra/src/Epetra_SerialDenseMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_SERIALDENSEMATRIX_H
#define EPETRA_SERIALDENSEMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
#include "Epetra_CompObject.h"
@@ -540,10 +548,3 @@ 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 7c44af6d23b1..ce683ef878b6 100644
--- a/packages/epetra/src/Epetra_SerialDenseOperator.h
+++ b/packages/epetra/src/Epetra_SerialDenseOperator.h
@@ -44,6 +44,14 @@
#ifndef _EPETRA_SERIALDENSEOPERATOR_H_
#define _EPETRA_SERIALDENSEOPERATOR_H_
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
class Epetra_SerialDenseMatrix;
@@ -138,10 +146,3 @@ 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 a1e3f368b775..d887f8cb8528 100644
--- a/packages/epetra/src/Epetra_SerialDenseSVD.h
+++ b/packages/epetra/src/Epetra_SerialDenseSVD.h
@@ -44,6 +44,14 @@
#ifndef _EPETRA_SERIALDENSESVD_H_
#define _EPETRA_SERIALDENSESVD_H_
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_SerialDenseOperator.h"
#include "Epetra_SerialDenseMatrix.h"
#include "Epetra_Object.h"
@@ -524,10 +532,3 @@ 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 ee1393aa3be0..f7c0bf90c836 100644
--- a/packages/epetra/src/Epetra_SerialDenseSolver.h
+++ b/packages/epetra/src/Epetra_SerialDenseSolver.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_SERIALDENSESOLVER_H
#define EPETRA_SERIALDENSESOLVER_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
class Epetra_SerialDenseMatrix;
#include "Epetra_Object.h"
#include "Epetra_CompObject.h"
@@ -433,10 +441,3 @@ 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 7be49497367e..0d3012efcb7f 100644
--- a/packages/epetra/src/Epetra_SerialDenseVector.h
+++ b/packages/epetra/src/Epetra_SerialDenseVector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_SERIALDENSEVECTOR_H
#define EPETRA_SERIALDENSEVECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
#include "Epetra_SerialDenseMatrix.h"
@@ -321,10 +329,3 @@ 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 c03eaa067f23..a87f38beb790 100644
--- a/packages/epetra/src/Epetra_SerialDistributor.h
+++ b/packages/epetra/src/Epetra_SerialDistributor.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_SERIALDISTRIBUTOR_H
#define EPETRA_SERIALDISTRIBUTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_Object.h"
#include "Epetra_Distributor.h"
class Epetra_SerialComm;
@@ -157,10 +165,3 @@ 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 ff6dd2ab1099..c4e3898e1b53 100644
--- a/packages/epetra/src/Epetra_SerialSpdDenseSolver.h
+++ b/packages/epetra/src/Epetra_SerialSpdDenseSolver.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_SERIALSPDDENSESOLVER_H
#define EPETRA_SERIALSPDDENSESOLVER_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
#include "Epetra_SerialDenseSolver.h"
class Epetra_SerialSymDenseMatrix;
@@ -275,10 +283,3 @@ 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 2c17915a20de..3bfa01b3f7e8 100644
--- a/packages/epetra/src/Epetra_SerialSymDenseMatrix.h
+++ b/packages/epetra/src/Epetra_SerialSymDenseMatrix.h
@@ -43,6 +43,14 @@
#ifndef EPETRA_SERIALSYMDENSEMATRIX_H
#define EPETRA_SERIALSYMDENSEMATRIX_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
#include "Epetra_SerialDenseMatrix.h"
@@ -280,10 +288,3 @@ 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 984c3773769b..93fdaff08514 100644
--- a/packages/epetra/src/Epetra_SrcDistObject.h
+++ b/packages/epetra/src/Epetra_SrcDistObject.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_SRCDISTOBJECT_H
#define EPETRA_SRCDISTOBJECT_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
class Epetra_BlockMap;
@@ -77,10 +85,3 @@ 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 8faf5bfb44c8..51fa06b48a3b 100644
--- a/packages/epetra/src/Epetra_Time.h
+++ b/packages/epetra/src/Epetra_Time.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_TIME_H
#define EPETRA_TIME_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
//! Epetra_Time: The Epetra Timing Class.
/*! The Epetra_Time class is a wrapper that encapsulates the general
information needed getting timing information. Currently it return
@@ -130,10 +138,3 @@ 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 3fdb46e83f20..d5ac77e597d5 100644
--- a/packages/epetra/src/Epetra_Util.h
+++ b/packages/epetra/src/Epetra_Util.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_UTIL_H
#define EPETRA_UTIL_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Object.h"
#include
@@ -477,10 +485,3 @@ 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 3455d432db5e..41c34309df0b 100644
--- a/packages/epetra/src/Epetra_VbrMatrix.h
+++ b/packages/epetra/src/Epetra_VbrMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_VBRMATRIX_H
#define EPETRA_VBRMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
// FIXME long long : whole file
#include
@@ -1478,10 +1486,3 @@ 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 7bb8212cdd69..fd9a4d0ac385 100644
--- a/packages/epetra/src/Epetra_VbrRowMatrix.h
+++ b/packages/epetra/src/Epetra_VbrRowMatrix.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_VBRROWMATRIX_H
#define EPETRA_VBRROWMATRIX_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_BasicRowMatrix.h"
#include "Epetra_VbrMatrix.h"
#include "Epetra_Map.h"
@@ -246,10 +254,3 @@ 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 63a67e041f79..6a7c4896a696 100644
--- a/packages/epetra/src/Epetra_Vector.h
+++ b/packages/epetra/src/Epetra_Vector.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_VECTOR_H
#define EPETRA_VECTOR_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_MultiVector.h"
class Epetra_Map;
@@ -471,10 +479,3 @@ 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 a9dd007ff219..eaf4edf7962d 100644
--- a/packages/epetra/src/Epetra_Version.h
+++ b/packages/epetra/src/Epetra_Version.h
@@ -53,4 +53,3 @@ std::string Epetra_Version() {
#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 a4f1855d2f8c..eb5e98492124 100644
--- a/packages/epetra/test/BlockMap/checkmap.h
+++ b/packages/epetra/test/BlockMap/checkmap.h
@@ -56,4 +56,3 @@ int checkmap(Epetra_BlockMap & Map, int NumGlobalElements, int NumMyElements,
#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 84d705e1c6a8..ea5ab3ad9ada 100644
--- a/packages/epetra/test/BlockMap_LL/checkmap.h
+++ b/packages/epetra/test/BlockMap_LL/checkmap.h
@@ -56,4 +56,3 @@ int checkmap(Epetra_BlockMap & Map, long long NumGlobalElements, int NumMyElemen
#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 528e45747e87..4ed78651ec31 100644
--- a/packages/epetra/test/FECrsGraph/ExecuteTestProblems.h
+++ b/packages/epetra/test/FECrsGraph/ExecuteTestProblems.h
@@ -62,4 +62,3 @@ int Young1(const Epetra_Comm& Comm, bool verbose);
#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 528e45747e87..4ed78651ec31 100644
--- a/packages/epetra/test/FECrsGraph_LL/ExecuteTestProblems.h
+++ b/packages/epetra/test/FECrsGraph_LL/ExecuteTestProblems.h
@@ -62,4 +62,3 @@ int Young1(const Epetra_Comm& Comm, bool verbose);
#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 b177103943e2..f0f51087a340 100644
--- a/packages/epetra/test/FECrsMatrix/ExecuteTestProblems.h
+++ b/packages/epetra/test/FECrsMatrix/ExecuteTestProblems.h
@@ -63,4 +63,3 @@ int rectangular(const Epetra_Comm& Comm, bool verbose);
#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 b177103943e2..f0f51087a340 100644
--- a/packages/epetra/test/FECrsMatrix_LL/ExecuteTestProblems.h
+++ b/packages/epetra/test/FECrsMatrix_LL/ExecuteTestProblems.h
@@ -63,4 +63,3 @@ int rectangular(const Epetra_Comm& Comm, bool verbose);
#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 54ad1c85b034..8d436b4d1135 100644
--- a/packages/epetra/test/FEVbrMatrix/ExecuteTestProblems.h
+++ b/packages/epetra/test/FEVbrMatrix/ExecuteTestProblems.h
@@ -56,4 +56,3 @@ int four_quads(const Epetra_Comm& Comm, bool preconstruct_graph, bool verbose);
#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 2f7c93e6e618..03ca22b502d3 100644
--- a/packages/epetra/test/FEVector/ExecuteTestProblems.h
+++ b/packages/epetra/test/FEVector/ExecuteTestProblems.h
@@ -69,4 +69,3 @@ int fevec7(Epetra_Comm& Comm, bool verbose);
#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 c1aee85e5358..560b7e072f83 100644
--- a/packages/epetra/test/IntMultiVector/ExecuteTestProblems.h
+++ b/packages/epetra/test/IntMultiVector/ExecuteTestProblems.h
@@ -54,4 +54,3 @@ int IntMultiVectorTests(const Epetra_BlockMap & Map, int NumVectors, bool verbos
#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 1cdc509d8c89..2529ab3a0130 100644
--- a/packages/epetra/test/Map/checkmap.h
+++ b/packages/epetra/test/Map/checkmap.h
@@ -54,4 +54,3 @@ int checkmap(Epetra_Map & Map, int NumGlobalElements, int NumMyElements,
#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 d1d7c23e1a3e..5c35136e829c 100644
--- a/packages/epetra/test/Map_LL/checkmap.h
+++ b/packages/epetra/test/Map_LL/checkmap.h
@@ -54,4 +54,3 @@ int checkmap(Epetra_Map & Map, long long NumGlobalElements, int NumMyElements,
#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 5cdaaebc2099..a7f0dc86e10f 100644
--- a/packages/epetra/test/MultiVector/BuildTestProblems.h
+++ b/packages/epetra/test/MultiVector/BuildTestProblems.h
@@ -77,4 +77,3 @@ int BuildMultiVectorTests (Epetra_MultiVector & C,
#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 ffd902071002..8ca74ce752c0 100644
--- a/packages/epetra/test/MultiVector/ExecuteTestProblems.h
+++ b/packages/epetra/test/MultiVector/ExecuteTestProblems.h
@@ -61,4 +61,3 @@ int BadResidual1(bool verbose, double * Residual, int NumVectors);
#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 fe75cac6e29e..14770238106a 100644
--- a/packages/epetra/test/Vector/BuildTestProblems.h
+++ b/packages/epetra/test/Vector/BuildTestProblems.h
@@ -77,4 +77,3 @@ int BuildVectorTests (Epetra_Vector & C,
#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 2405217b5991..ad49c4b29cba 100644
--- a/packages/epetra/test/Vector/ExecuteTestProblems.h
+++ b/packages/epetra/test/Vector/ExecuteTestProblems.h
@@ -60,4 +60,3 @@ int BadResidual(bool verbose, double * Residual);
#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 658aa2b30fa8..5dacfdceff1f 100644
--- a/packages/epetra/test/epetra_test_err.h
+++ b/packages/epetra/test/epetra_test_err.h
@@ -49,6 +49,14 @@ error the way that an assert command does. */
#ifndef EPETRA_TEST_ERR_H
#define EPETRA_TEST_ERR_H
+
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
#include "Epetra_ConfigDefs.h"
using namespace std;
// This function is to be used when first identifying an error.
@@ -64,10 +72,3 @@ 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 7dac2b1a6c61..4345c34a5689 100644
--- a/packages/epetra/test/src/Epetra_matrix_data.h
+++ b/packages/epetra/test/src/Epetra_matrix_data.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_MATRIX_DATA_H
#define EPETRA_MATRIX_DATA_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
class Epetra_CrsMatrix;
@@ -103,11 +111,3 @@ class EPETRA_LIB_DLL_EXPORT matrix_data {
}//namespace epetra_test
#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 56bf3ce4211a..a7e356ebbf92 100644
--- a/packages/epetra/test/src/Epetra_test_functions.h
+++ b/packages/epetra/test/src/Epetra_test_functions.h
@@ -44,6 +44,14 @@
#ifndef EPETRA_TEST_FUNCTIONS_H
#define EPETRA_TEST_FUNCTIONS_H
+#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The Epetra package is deprecated"
+#endif
+#endif
+
+
+
#include "Epetra_ConfigDefs.h"
class Epetra_Comm;
@@ -71,11 +79,3 @@ EPETRA_LIB_DLL_EXPORT bool compare_matrices(const Epetra_CrsMatrix& A, const Epe
}//namespace epetra_test
#endif
-
-
-#if defined(Epetra_SHOW_DEPRECATED_WARNINGS)
-#ifdef __GNUC__
-#warning "The Epetra package is deprecated"
-#endif
-#endif
-
diff --git a/packages/epetraext/cmake/FindPythonInclude.cmake b/packages/epetraext/cmake/FindPythonInclude.cmake
index ba795196cf76..8634919cae73 100644
--- a/packages/epetraext/cmake/FindPythonInclude.cmake
+++ b/packages/epetraext/cmake/FindPythonInclude.cmake
@@ -1,16 +1,16 @@
# - Find the python include path
# This module determines where the python include file Python.h is,
-# based on the current value of PYTHON_EXECUTABLE. This code sets the
+# based on the current value of Python3_EXECUTABLE. This code sets the
# following variable:
#
# PYTHON_INCLUDE_PATH = path to where Python.h is found
#
-IF(PYTHON_EXECUTABLE)
+IF(Python3_EXECUTABLE)
# Obtain the candidate path for python include
EXECUTE_PROCESS(COMMAND
- ${PYTHON_EXECUTABLE} -c
+ ${Python3_EXECUTABLE} -c
"import sys; print(sys.prefix + '/include/python' + sys.version[:3])"
OUTPUT_VARIABLE CANDIDATE
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -24,13 +24,13 @@ IF(PYTHON_EXECUTABLE)
ENDIF(EXISTS "${CANDIDATE}")
# Obtain the candidate path for python library
EXECUTE_PROCESS(COMMAND
- ${PYTHON_EXECUTABLE} -c
+ ${Python3_EXECUTABLE} -c
"import sys; print('python' + sys.version[:3])"
OUTPUT_VARIABLE PYVERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
EXECUTE_PROCESS(COMMAND
- ${PYTHON_EXECUTABLE} -c
+ ${Python3_EXECUTABLE} -c
"import sys; print(sys.prefix + '/lib/python' + sys.version[:3] + '/config')"
OUTPUT_VARIABLE CANDIDATE
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -46,7 +46,7 @@ IF(PYTHON_EXECUTABLE)
ENDIF(EXISTS ${LIB_CANDIDATE})
ENDFOREACH(SUFFIX)
ENDIF(EXISTS "${CANDIDATE}")
-ENDIF(PYTHON_EXECUTABLE)
+ENDIF(Python3_EXECUTABLE)
# Set any python variables that did not get set by the above logic
IF(PYTHON_INCLUDE_FOUND AND PYTHON_LIB_FOUND)
diff --git a/packages/epetraext/src/EpetraExt_ConfigDefs.h b/packages/epetraext/src/EpetraExt_ConfigDefs.h
index 5467d9615eb9..3e7a853a42ad 100644
--- a/packages/epetraext/src/EpetraExt_ConfigDefs.h
+++ b/packages/epetraext/src/EpetraExt_ConfigDefs.h
@@ -43,6 +43,12 @@
#ifndef EPETRAEXT_CONFIGDEFS_H
#define EPETRAEXT_CONFIGDEFS_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#ifndef __cplusplus
#define __cplusplus
#endif
@@ -89,10 +95,3 @@
#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 40a9c2c4d76f..020c93c777ea 100644
--- a/packages/epetraext/src/EpetraExt_MMHelpers.h
+++ b/packages/epetraext/src/EpetraExt_MMHelpers.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_MMHELPERS_H
#define EPETRAEXT_MMHELPERS_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "EpetraExt_ConfigDefs.h"
#include "Epetra_ConfigDefs.h"
#include "Epetra_DistObject.h"
@@ -534,11 +540,3 @@ void PrintMultiplicationStatistics(Epetra_Export * Transfer, const std::string &
}//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/EpetraExt_MatrixMatrix.h b/packages/epetraext/src/EpetraExt_MatrixMatrix.h
index 309716bbac1e..1fa7c947aab0 100644
--- a/packages/epetraext/src/EpetraExt_MatrixMatrix.h
+++ b/packages/epetraext/src/EpetraExt_MatrixMatrix.h
@@ -41,6 +41,12 @@
#ifndef EPETRAEXT_MATRIXMATRIX_H
#define EPETRAEXT_MATRIXMATRIX_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include
class Epetra_CrsMatrix;
@@ -285,11 +291,3 @@ class MatrixMatrix {
}//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/EpetraExt_ProductOperator.h b/packages/epetraext/src/EpetraExt_ProductOperator.h
index e9eca74569da..d756cdc37779 100644
--- a/packages/epetraext/src/EpetraExt_ProductOperator.h
+++ b/packages/epetraext/src/EpetraExt_ProductOperator.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_PRODUCT_OPERATOR_H
#define EPETRAEXT_PRODUCT_OPERATOR_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "Epetra_Operator.h"
#include "Teuchos_RCP.hpp"
#include "Teuchos_BLAS_types.hpp"
@@ -416,10 +422,3 @@ 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 bcb746c8d877..bd08eada0c77 100644
--- a/packages/epetraext/src/EpetraExt_Version.h
+++ b/packages/epetraext/src/EpetraExt_Version.h
@@ -42,6 +42,12 @@
#ifndef EpetraExt_VERSION_H
#define EpetraExt_VERSION_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "EpetraExt_ConfigDefs.h"
#include "Trilinos_version.h"
@@ -53,11 +59,3 @@ namespace EpetraExt {
} // 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 d3567192221a..d33ee2ddafd6 100644
--- a/packages/epetraext/src/block/EpetraExt_BlockCrsMatrix.h
+++ b/packages/epetraext/src/block/EpetraExt_BlockCrsMatrix.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_BLOCKCRSMATRIX_H
#define EPETRAEXT_BLOCKCRSMATRIX_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include
#include "Epetra_ConfigDefs.h"
@@ -273,10 +279,3 @@ 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 e73b4220ed91..3b82e385c24b 100644
--- a/packages/epetraext/src/block/EpetraExt_BlockDiagMatrix.h
+++ b/packages/epetraext/src/block/EpetraExt_BlockDiagMatrix.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_BLOCKDIAGMATRIX_H
#define EPETRAEXT_BLOCKDIAGMATRIX_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "Epetra_BLAS.h"
#include "Epetra_LAPACK.h"
#include "Epetra_DistObject.h"
@@ -278,10 +284,3 @@ 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 3e982043821c..bb9888ef38c6 100644
--- a/packages/epetraext/src/block/EpetraExt_BlockMultiVector.h
+++ b/packages/epetraext/src/block/EpetraExt_BlockMultiVector.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_BLOCKMULTIVECTOR_H
#define EPETRAEXT_BLOCKMULTIVECTOR_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "Epetra_MultiVector.h"
#include "Teuchos_RCP.hpp"
#include
@@ -118,10 +124,3 @@ 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 2b93fe6b7203..54a2bc4387d8 100644
--- a/packages/epetraext/src/block/EpetraExt_BlockUtility.h
+++ b/packages/epetraext/src/block/EpetraExt_BlockUtility.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_BLOCKUTILITY_H
#define EPETRAEXT_BLOCKUTILITY_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include
#include
@@ -160,10 +166,3 @@ 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 fbe97f8dfe57..6b01cc3f8423 100644
--- a/packages/epetraext/src/block/EpetraExt_BlockVector.h
+++ b/packages/epetraext/src/block/EpetraExt_BlockVector.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_BLOCKVECTOR_H
#define EPETRAEXT_BLOCKVECTOR_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_Vector.h"
#include "Teuchos_RCP.hpp"
@@ -136,10 +142,3 @@ 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 af48ed10abf7..afa6f96c9a19 100644
--- a/packages/epetraext/src/block/EpetraExt_MultiComm.h
+++ b/packages/epetraext/src/block/EpetraExt_MultiComm.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_MULTICOMM_H
#define EPETRAEXT_MULTICOMM_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "EpetraExt_ConfigDefs.h"
#include "Epetra_Comm.h"
@@ -104,13 +110,3 @@ class MultiComm: public virtual Epetra_Comm {
} //namespace EpetraExt
#endif /* EPETRAEXT_MULTICOMM_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_MultiMpiComm.h b/packages/epetraext/src/block/EpetraExt_MultiMpiComm.h
index cd40a5ff32b3..341f98c579b5 100644
--- a/packages/epetraext/src/block/EpetraExt_MultiMpiComm.h
+++ b/packages/epetraext/src/block/EpetraExt_MultiMpiComm.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_MULTIMPICOMM_H
#define EPETRAEXT_MULTIMPICOMM_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "EpetraExt_ConfigDefs.h"
#include "EpetraExt_MultiComm.h"
#include "Epetra_MpiComm.h"
@@ -214,10 +220,3 @@ 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 3ccfc7d6cb05..ae51b6c6cb10 100644
--- a/packages/epetraext/src/block/EpetraExt_MultiPointModelEvaluator.h
+++ b/packages/epetraext/src/block/EpetraExt_MultiPointModelEvaluator.h
@@ -44,6 +44,12 @@
#ifndef EPETRAEXT_MULTIPOINTMODELEVALUATOR_H
#define EPETRAEXT_MULTIPOINTMODELEVALUATOR_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "Epetra_ConfigDefs.h"
#include "EpetraExt_ModelEvaluator.h"
#include "EpetraExt_BlockCrsMatrix.h"
@@ -214,10 +220,3 @@ 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 4236eb82979f..057cb3207493 100644
--- a/packages/epetraext/src/block/EpetraExt_MultiSerialComm.h
+++ b/packages/epetraext/src/block/EpetraExt_MultiSerialComm.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_MULTISERIALCOMM_H
#define EPETRAEXT_MULTISERIALCOMM_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "EpetraExt_ConfigDefs.h"
#include "EpetraExt_MultiComm.h"
#include "Epetra_SerialComm.h"
@@ -184,10 +190,3 @@ 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 a0b68fcdc848..3387164d613f 100644
--- a/packages/epetraext/src/block/EpetraExt_PointToBlockDiagPermute.h
+++ b/packages/epetraext/src/block/EpetraExt_PointToBlockDiagPermute.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_POINTTOBLOCKDIAGPERMUTE_H
#define EPETRAEXT_POINTTOBLOCKDIAGPERMUTE_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include "Epetra_ConfigDefs.h"
#include "Epetra_DistObject.h"
#include "Epetra_BlockMap.h"
@@ -340,10 +346,3 @@ template<> inline long long*& EpetraExt_PointToBlockDiagPermute::Blockids_ref
class Epetra_CrsGraph;
@@ -101,10 +107,3 @@ class CrsGraph_BTF : public StructuralSameTypeTransform {
} //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 07bdf5b9ecef..f781e56e55b4 100644
--- a/packages/epetraext/src/btf/EpetraExt_BTF_CrsMatrix.h
+++ b/packages/epetraext/src/btf/EpetraExt_BTF_CrsMatrix.h
@@ -42,6 +42,12 @@
#ifndef EpetraExt_CRSMATRIX_BTF_H
#define EpetraExt_CRSMATRIX_BTF_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include
class Epetra_CrsMatrix;
@@ -91,10 +97,3 @@ 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 5d4fdb3d6c55..7e6d54a5b760 100644
--- a/packages/epetraext/src/btf/EpetraExt_BTF_LinearProblem.h
+++ b/packages/epetraext/src/btf/EpetraExt_BTF_LinearProblem.h
@@ -42,6 +42,12 @@
#ifndef EpetraExt_LINEARPROBLEM_BTF_H
#define EpetraExt_LINEARPROBLEM_BTF_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include
#include
@@ -136,10 +142,3 @@ 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 7b966e089493..874d762fccc8 100644
--- a/packages/epetraext/src/btf/EpetraExt_BlockJacobi_LinearProblem.h
+++ b/packages/epetraext/src/btf/EpetraExt_BlockJacobi_LinearProblem.h
@@ -42,6 +42,12 @@
#ifndef EPETRAEXT_BLOCKJACOBI_LINEARPROBLEM_H
#define EPETRAEXT_BLOCKJACOBI_LINEARPROBLEM_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include
#include
@@ -109,10 +115,3 @@ 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 bb6ecd10299b..9150c87e27e3 100644
--- a/packages/epetraext/src/coloring/EpetraExt_MapColoring.h
+++ b/packages/epetraext/src/coloring/EpetraExt_MapColoring.h
@@ -42,6 +42,12 @@
#ifndef EpetraExt_CRSGRAPH_MAPCOLORING_H
#define EpetraExt_CRSGRAPH_MAPCOLORING_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include
class Epetra_CrsGraph;
@@ -103,10 +109,3 @@ class CrsGraph_MapColoring : public StructuralTransform
namespace EpetraExt {
@@ -117,10 +123,3 @@ class CrsGraph_MapColoringIndex64
} //namespace EpetraExt
#endif //EpetraExt_CRSGRAPH_MAPCOLORINGINDEX_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_TCrsGraph_MapColoringIndex.h b/packages/epetraext/src/coloring/EpetraExt_TCrsGraph_MapColoringIndex.h
index 28a6dfbf5b9f..f6aa59739d9a 100644
--- a/packages/epetraext/src/coloring/EpetraExt_TCrsGraph_MapColoringIndex.h
+++ b/packages/epetraext/src/coloring/EpetraExt_TCrsGraph_MapColoringIndex.h
@@ -42,6 +42,12 @@
#ifndef EpetraExt_TCRSGRAPH_MAPCOLORINGINDEX_H
#define EpetraExt_TCRSGRAPH_MAPCOLORINGINDEX_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
#include
#include
#include
@@ -134,10 +140,3 @@ operator()( OriginalTypeRef orig )
} //namespace EpetraExt
#endif // EpetraExt_TCRSGRAPH_MAPCOLORINGINDEX_H
-
-#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
-#ifdef __GNUC__
-#warning "The EpetraExt package is deprecated"
-#endif
-#endif
-
diff --git a/packages/epetraext/src/distdir/EpetraExt_Directory.h b/packages/epetraext/src/distdir/EpetraExt_Directory.h
index 536ea51cae1d..516f7a71067b 100644
--- a/packages/epetraext/src/distdir/EpetraExt_Directory.h
+++ b/packages/epetraext/src/distdir/EpetraExt_Directory.h
@@ -41,6 +41,12 @@
#ifndef EPETRAEXT_DIRECTORY_H
#define EPETRAEXT_DIRECTORY_H
+#if defined(EpetraExt_SHOW_DEPRECATED_WARNINGS)
+#ifdef __GNUC__
+#warning "The EpetraExt package is deprecated"
+#endif
+#endif
+
// ----------- Includes ----------
#include