Skip to content

Commit 101ae90

Browse files
authored
Merge pull request #277 from trilinos/remove-config-constants
Remove configuration constants
2 parents ddb2fcb + 9589cbe commit 101ae90

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

scripts/build-yuri.sh

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ cmake -G Ninja \
1616
-DCMAKE_INSTALL_PREFIX:PATH=$SOURCE_DIR/install \
1717
-DCMAKE_BUILD_TYPE:STRING=Debug \
1818
-DBUILD_SHARED_LIBS:BOOL=ON \
19+
-DForTrilinos_EXAMPLES:BOOL=ON \
20+
-DForTrilinos_TESTING:BOOL=ON \
1921
-DForTrilinos_USE_SWIG_Fortran:BOOL=ON \
2022
-DSWIG_EXECUTABLE:FILENAME=/rnsdhpc/code/swig-old/swig \
2123
-DSWIG_DIR:FILENAME=/rnsdhpc/code/swig-old/Lib \

src/forteuchos/forteuchos.i

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
%{
2323
#include "ForTrilinos_config.h"
2424
%}
25-
%include "ForTrilinos_config.h"
2625

2726
// Typedefs
2827
typedef int Teuchos_Ordinal;

src/forteuchos/generated/forteuchos.F90

-10
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@ module forteuchos
1616
private
1717

1818
! DECLARATION CONSTRUCTS
19-
integer(C_INT), parameter, public :: FORTRILINOS_USE_MPI = 1_C_INT
20-
integer(C_INT), parameter, public :: FORTRILINOS_USE_BELOS = 1_C_INT
21-
integer(C_INT), parameter, public :: FORTRILINOS_USE_TPETRA = 1_C_INT
22-
integer(C_INT), parameter, public :: FORTRILINOS_USE_ANASAZI = 1_C_INT
23-
integer(C_INT), parameter, public :: FORTRILINOS_USE_NOX = 1_C_INT
24-
integer(C_INT), parameter, public :: FORTRILINOS_USE_STRATIMIKOS = 1_C_INT
25-
integer(C_INT), parameter, public :: FORTRILINOS_USE_THYRA = 1_C_INT
26-
integer(C_INT), parameter, public :: FORTRILINOS_USE_THYRATPETRA = 0_C_INT
27-
integer(C_INT), parameter, public :: FORTRILINOS_USE_IFPACK2 = 1_C_INT
28-
integer(C_INT), parameter, public :: FORTRILINOS_USE_MUELU = 1_C_INT
2919
! enum Teuchos::ESide
3020
enum, bind(c)
3121
enumerator :: TeuchosLEFT_SIDE

src/fortrilinos_hl/fortrilinos_hl.i

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
%import "forteuchos/forteuchos.i"
1313
%import "fortpetra/fortpetra.i"
1414

15-
%include "ForTrilinos_config.h"
16-
1715
%{
1816
#include <Kokkos_DefaultNode.hpp>
1917
#include "fortpetra/ForTrilinos_DefaultNodeType.hpp"

0 commit comments

Comments
 (0)