Merge pull request #275 from aprokop/update_fortrilinos_12.18.1

Merging without review, because who needs those?
trilinos · Sep 1, 2020 · ddb2fcb · ddb2fcb
2 parents 8708d6e + 93b737b
commit ddb2fcb
Show file tree

Hide file tree

Showing 6 changed files with 235 additions and 102 deletions.
diff --git a/.jenkins b/.jenkins
@@ -72,7 +72,7 @@ pipeline {
             node('docker') {
                 recordIssues(
                     enabledForFailure: true,
-                    tools: [cmake(), gcc()],
+                    tools: [gcc()],
                     qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
                 )
             }

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -65,9 +65,9 @@ RUN OPENMPI_VERSION=4.0.3 && \
     rm -rf ${SCRATCH_DIR}
 ENV PATH=${OPENMPI_DIR}/bin:$PATH
 
-# Install Trilinos
+# Install Trilinos (12.18.1)
 ENV TRILINOS_DIR=/opt/trilinos
-RUN export TRILINOS_HASH=8a82b322ba70274299d0ffd3a2daf2c652dbeea7 && \
+RUN export TRILINOS_HASH=55a75997332636a28afc9db1aee4ae46fe8d93e7 && \
     export TRILINOS_URL=https://github.com/trilinos/Trilinos/archive/${TRILINOS_HASH}.tar.gz && \
     export TRILINOS_ARCHIVE=trilinos-${TRILINOS_HASH}.tar.gz && \
     SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \

diff --git a/src/forteuchos/generated/forteuchos.F90 b/src/forteuchos/generated/forteuchos.F90
@@ -4,7 +4,7 @@
 ! Do not make changes to this file unless you know what you are doing--modify
 ! the SWIG interface file instead.
 
-! Copyright 2017-2018, UT-Battelle, LLC
+! Copyright 2017-2020, UT-Battelle, LLC
 !
 ! SPDX-License-Identifier: BSD-3-Clause
 ! License-Filename: LICENSE
@@ -16,6 +16,16 @@ 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