Merge pull request #277 from trilinos/remove-config-constants

Remove configuration constants
trilinos · Sep 1, 2020 · 101ae90 · 101ae90
2 parents ddb2fcb + 9589cbe
commit 101ae90
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/scripts/build-yuri.sh b/scripts/build-yuri.sh
@@ -16,6 +16,8 @@ cmake -G Ninja \
   -DCMAKE_INSTALL_PREFIX:PATH=$SOURCE_DIR/install \
   -DCMAKE_BUILD_TYPE:STRING=Debug \
   -DBUILD_SHARED_LIBS:BOOL=ON \
+  -DForTrilinos_EXAMPLES:BOOL=ON \
+  -DForTrilinos_TESTING:BOOL=ON \
   -DForTrilinos_USE_SWIG_Fortran:BOOL=ON \
   -DSWIG_EXECUTABLE:FILENAME=/rnsdhpc/code/swig-old/swig \
   -DSWIG_DIR:FILENAME=/rnsdhpc/code/swig-old/Lib \

diff --git a/src/forteuchos/forteuchos.i b/src/forteuchos/forteuchos.i
@@ -22,7 +22,6 @@
 %{
 #include "ForTrilinos_config.h"
 %}
-%include "ForTrilinos_config.h"
 
 // Typedefs
 typedef int Teuchos_Ordinal;

diff --git a/src/forteuchos/generated/forteuchos.F90 b/src/forteuchos/generated/forteuchos.F90
@@ -16,16 +16,6 @@ module forteuchos
  private
 
  ! DECLARATION CONSTRUCTS
- integer(C_INT), parameter, public :: FORTRILINOS_USE_MPI = 1_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_BELOS = 1_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_TPETRA = 1_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_ANASAZI = 1_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_NOX = 1_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_STRATIMIKOS = 1_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_THYRA = 1_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_THYRATPETRA = 0_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_IFPACK2 = 1_C_INT
- integer(C_INT), parameter, public :: FORTRILINOS_USE_MUELU = 1_C_INT
  ! enum Teuchos::ESide
  enum, bind(c)
   enumerator :: TeuchosLEFT_SIDE

diff --git a/src/fortrilinos_hl/fortrilinos_hl.i b/src/fortrilinos_hl/fortrilinos_hl.i
@@ -12,8 +12,6 @@
 %import "forteuchos/forteuchos.i"
 %import "fortpetra/fortpetra.i"
 
-%include "ForTrilinos_config.h"
-
 %{
 #include <Kokkos_DefaultNode.hpp>
 #include "fortpetra/ForTrilinos_DefaultNodeType.hpp"