From fb825c8eb3395e08cfd920ae5bf2fc071398a9ce Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Tue, 11 Aug 2020 08:37:38 -0400 Subject: [PATCH 1/4] Work around NOX build error in latest Trilinos ``` In file included from ../src/fortrilinos/generated/fortrilinosFORTRAN_wrap.cxx:613: In file included from ../src/fortrilinos/nox_solver.hpp:39: ../src/fortrilinos/nox_solver_def.hpp:44:29: error: call to constructor of 'NOX::Thyra::Group' is ambiguous nox_group = rcp(new NOX::Thyra::Group(*(model_->initial_guess), model_, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/fortrilinos/generated/fortrilinosFORTRAN_wrap.cxx:2079:15: note: in instantiation of member function 'ForTrilinos::NOXSolver >::setup' requested here (arg1)->setup(*arg2); ^ /usr/local/spack/var/spack/environments/fortrilinos/.spack-env/view/include/NOX_Thyra_Group.H:115:7: note: candidate constructor Group(const NOX::Thyra::Vector& initialGuess, ^ /usr/local/spack/var/spack/environments/fortrilinos/.spack-env/view/include/NOX_Thyra_Group.H:143:7: note: candidate constructor Group(const NOX::Thyra::Vector& initialGuess, ^ ``` --- src/fortrilinos_hl/nox_solver_def.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fortrilinos_hl/nox_solver_def.hpp b/src/fortrilinos_hl/nox_solver_def.hpp index 1a4f8d1e..bbee2e69 100644 --- a/src/fortrilinos_hl/nox_solver_def.hpp +++ b/src/fortrilinos_hl/nox_solver_def.hpp @@ -43,7 +43,7 @@ namespace ForTrilinos { // Create the NOX::Thyra::Group nox_group = rcp(new NOX::Thyra::Group(*(model_->initial_guess), model_, model_->create_W_op(), model_->lows_factory, - Teuchos::null, Teuchos::null)); + Teuchos::null, Teuchos::null, Teuchos::null)); } else { @@ -67,7 +67,7 @@ namespace ForTrilinos { // Create the NOX::Thyra::Group nox_group = rcp(new NOX::Thyra::Group(*(model_->initial_guess), thyra_model, jfnk_op, - model_->lows_factory, prec_op, Teuchos::null)); + model_->lows_factory, prec_op, Teuchos::null, Teuchos::null)); } } @@ -76,7 +76,7 @@ namespace ForTrilinos { // Default to Analytic Jacobian nox_group = rcp(new NOX::Thyra::Group(*(model_->initial_guess), model_, model_->create_W_op(), model_->lows_factory, - Teuchos::null, Teuchos::null)); + Teuchos::null, Teuchos::null, Teuchos::null)); } if (nox_group.is_null()) From 95f7cf04f73e94db8b7976a87db6abcff3293231 Mon Sep 17 00:00:00 2001 From: Seth R Johnson Date: Wed, 12 Aug 2020 12:02:09 -0400 Subject: [PATCH 2/4] Update bindings using trilinos 12.18.1 --- src/forteuchos/generated/forteuchos.F90 | 12 +- src/fortpetra/generated/fortpetra.F90 | 201 +++++++++++------- .../generated/fortpetraFORTRAN_wrap.cxx | 112 ++++++++-- 3 files changed, 229 insertions(+), 96 deletions(-) diff --git a/src/forteuchos/generated/forteuchos.F90 b/src/forteuchos/generated/forteuchos.F90 index 6c4a3ea4..65e4b436 100644 --- 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 diff --git a/src/fortpetra/generated/fortpetra.F90 b/src/fortpetra/generated/fortpetra.F90 index fd2c89a1..d7e3264f 100644 --- a/src/fortpetra/generated/fortpetra.F90 +++ b/src/fortpetra/generated/fortpetra.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 @@ -447,8 +447,11 @@ module fortpetra module procedure swigf_new_TpetraCrsGraph__SWIG_11 module procedure swigf_new_TpetraCrsGraph__SWIG_12 module procedure swigf_new_TpetraCrsGraph__SWIG_13 - module procedure swigf_new_TpetraCrsGraph__SWIG_14 + module procedure swigf_new_TpetraCrsGraph__SWIG_16 end interface + type, public :: SWIGTYPE_p_p_Tpetra__CrsMatrixT_double_int_long_long_ForT1YX8D6 + type(SwigClassWrapper), public :: swigdata + end type ! class Tpetra::CrsMatrix< SC,LO,GO,NO > type, public :: TpetraCrsMatrix type(SwigClassWrapper), public :: swigdata @@ -573,9 +576,11 @@ module fortpetra module procedure swigf_new_TpetraCrsMatrix__SWIG_11 module procedure swigf_new_TpetraCrsMatrix__SWIG_12 module procedure swigf_new_TpetraCrsMatrix__SWIG_13 - module procedure swigf_new_TpetraCrsMatrix__SWIG_18 - module procedure swigf_new_TpetraCrsMatrix__SWIG_19 - module procedure swigf_new_TpetraCrsMatrix__SWIG_26 + module procedure swigf_new_TpetraCrsMatrix__SWIG_14 + module procedure swigf_new_TpetraCrsMatrix__SWIG_15 + module procedure swigf_new_TpetraCrsMatrix__SWIG_20 + module procedure swigf_new_TpetraCrsMatrix__SWIG_21 + module procedure swigf_new_TpetraCrsMatrix__SWIG_30 end interface public :: operator_to_matrix public :: matrix_to_operator @@ -2160,8 +2165,8 @@ function swigc_new_TpetraCrsGraph__SWIG_13(farg1, farg2, farg3, farg4) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_14(farg1) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_14") & +function swigc_new_TpetraCrsGraph__SWIG_16(farg1) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_16") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2862,20 +2867,38 @@ subroutine swigc_TpetraCrsGraph_op_assign__(farg1, farg2) & type(SwigClassWrapper) :: farg2 end subroutine -function swigc_new_TpetraCrsMatrix__SWIG_0(farg1, farg2, farg3, farg4) & +function swigc_new_TpetraCrsMatrix__SWIG_0(farg1) & bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_0") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper type(SwigClassWrapper) :: farg1 +type(SwigClassWrapper) :: fresult +end function + +function swigc_new_TpetraCrsMatrix__SWIG_1(farg1) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_1") & +result(fresult) +use, intrinsic :: ISO_C_BINDING +import :: swigclasswrapper +type(SwigClassWrapper) :: farg1 +type(SwigClassWrapper) :: fresult +end function + +function swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_2") & +result(fresult) +use, intrinsic :: ISO_C_BINDING +import :: swigclasswrapper +type(SwigClassWrapper) :: farg1 integer(C_SIZE_T), intent(in) :: farg2 integer(C_INT), intent(in) :: farg3 type(SwigClassWrapper) :: farg4 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_1(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_1") & +function swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_3") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2885,8 +2908,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_1(farg1, farg2, farg3) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_2") & +function swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_4") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2895,8 +2918,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_3") & +function swigc_new_TpetraCrsMatrix__SWIG_5(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_5") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2908,8 +2931,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2, farg3, farg4) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_4") & +function swigc_new_TpetraCrsMatrix__SWIG_6(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_6") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2920,8 +2943,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2, farg3) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_5(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_5") & +function swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_7") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2931,8 +2954,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_5(farg1, farg2) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_6(farg1, farg2, farg3, farg4, farg5) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_6") & +function swigc_new_TpetraCrsMatrix__SWIG_8(farg1, farg2, farg3, farg4, farg5) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_8") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2944,8 +2967,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_6(farg1, farg2, farg3, farg4, farg5) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_7") & +function swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_9") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2956,8 +2979,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2, farg3, farg4) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_8(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_8") & +function swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_10") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2967,8 +2990,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_8(farg1, farg2, farg3) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3, farg4, farg5) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_9") & +function swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2, farg3, farg4, farg5) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_11") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2981,8 +3004,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3, farg4, farg5) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_10") & +function swigc_new_TpetraCrsMatrix__SWIG_12(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_12") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2994,8 +3017,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3, farg4) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_11") & +function swigc_new_TpetraCrsMatrix__SWIG_13(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_13") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3006,8 +3029,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2, farg3) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_12(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_12") & +function swigc_new_TpetraCrsMatrix__SWIG_14(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_14") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3016,8 +3039,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_12(farg1, farg2) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_13(farg1) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_13") & +function swigc_new_TpetraCrsMatrix__SWIG_15(farg1) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_15") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3025,8 +3048,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_13(farg1) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_18(farg1, farg2, farg3, farg4, farg5, farg6) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_18") & +function swigc_new_TpetraCrsMatrix__SWIG_20(farg1, farg2, farg3, farg4, farg5, farg6) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_20") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3040,8 +3063,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_18(farg1, farg2, farg3, farg4, farg5, f type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_19(farg1, farg2, farg3, farg4, farg5) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_19") & +function swigc_new_TpetraCrsMatrix__SWIG_21(farg1, farg2, farg3, farg4, farg5) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_21") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3054,8 +3077,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_19(farg1, farg2, farg3, farg4, farg5) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_26(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_26") & +function swigc_new_TpetraCrsMatrix__SWIG_30(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_30") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -7015,7 +7038,7 @@ function swigf_new_TpetraCrsGraph__SWIG_13(rowmap, colmap, rowpointers, columnin self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_14(arg0) & +function swigf_new_TpetraCrsGraph__SWIG_16(arg0) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -7024,7 +7047,7 @@ function swigf_new_TpetraCrsGraph__SWIG_14(arg0) & type(SwigClassWrapper) :: farg1 farg1 = arg0%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_14(farg1) +fresult = swigc_new_TpetraCrsGraph__SWIG_16(farg1) self%swigdata = fresult end function @@ -8189,7 +8212,33 @@ subroutine swigf_TpetraCrsGraph_op_assign__(self, other) self%swigdata = farg1 end subroutine -function swigf_new_TpetraCrsMatrix__SWIG_0(rowmap, maxnumentriesperrow, pftype, params) & +function swigf_new_TpetraCrsMatrix__SWIG_0(arg0) & +result(self) +use, intrinsic :: ISO_C_BINDING +type(TpetraCrsMatrix) :: self +class(TpetraCrsMatrix), intent(in) :: arg0 +type(SwigClassWrapper) :: fresult +type(SwigClassWrapper) :: farg1 + +farg1 = arg0%swigdata +fresult = swigc_new_TpetraCrsMatrix__SWIG_0(farg1) +self%swigdata = fresult +end function + +function swigf_new_TpetraCrsMatrix__SWIG_1(arg0) & +result(self) +use, intrinsic :: ISO_C_BINDING +type(TpetraCrsMatrix) :: self +type(SWIGTYPE_p_p_Tpetra__CrsMatrixT_double_int_long_long_ForT1YX8D6), intent(in) :: arg0 +type(SwigClassWrapper) :: fresult +type(SwigClassWrapper) :: farg1 + +farg1 = arg0%swigdata +fresult = swigc_new_TpetraCrsMatrix__SWIG_1(farg1) +self%swigdata = fresult +end function + +function swigf_new_TpetraCrsMatrix__SWIG_2(rowmap, maxnumentriesperrow, pftype, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8207,11 +8256,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_0(rowmap, maxnumentriesperrow, pftype, farg2 = maxnumentriesperrow farg3 = pftype farg4 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_0(farg1, farg2, farg3, farg4) +fresult = swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_1(rowmap, maxnumentriesperrow, pftype) & +function swigf_new_TpetraCrsMatrix__SWIG_3(rowmap, maxnumentriesperrow, pftype) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8226,11 +8275,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_1(rowmap, maxnumentriesperrow, pftype) farg1 = rowmap%swigdata farg2 = maxnumentriesperrow farg3 = pftype -fresult = swigc_new_TpetraCrsMatrix__SWIG_1(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_2(rowmap, maxnumentriesperrow) & +function swigf_new_TpetraCrsMatrix__SWIG_4(rowmap, maxnumentriesperrow) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8242,11 +8291,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_2(rowmap, maxnumentriesperrow) & farg1 = rowmap%swigdata farg2 = maxnumentriesperrow -fresult = swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_3(rowmap, numentperrowtoalloc, pftype, params) & +function swigf_new_TpetraCrsMatrix__SWIG_5(rowmap, numentperrowtoalloc, pftype, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8272,11 +8321,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_3(rowmap, numentperrowtoalloc, pftype, end if farg3 = pftype farg4 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2, farg3, farg4) +fresult = swigc_new_TpetraCrsMatrix__SWIG_5(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_4(rowmap, numentperrowtoalloc, pftype) & +function swigf_new_TpetraCrsMatrix__SWIG_6(rowmap, numentperrowtoalloc, pftype) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8299,11 +8348,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_4(rowmap, numentperrowtoalloc, pftype) farg2%size = 0 end if farg3 = pftype -fresult = swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsMatrix__SWIG_6(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_5(rowmap, numentperrowtoalloc) & +function swigf_new_TpetraCrsMatrix__SWIG_7(rowmap, numentperrowtoalloc) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8323,11 +8372,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_5(rowmap, numentperrowtoalloc) & farg2%data = c_null_ptr farg2%size = 0 end if -fresult = swigc_new_TpetraCrsMatrix__SWIG_5(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_6(rowmap, colmap, maxnumentperrow, pftype, params) & +function swigf_new_TpetraCrsMatrix__SWIG_8(rowmap, colmap, maxnumentperrow, pftype, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8348,11 +8397,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_6(rowmap, colmap, maxnumentperrow, pfty farg3 = maxnumentperrow farg4 = pftype farg5 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_6(farg1, farg2, farg3, farg4, farg5) +fresult = swigc_new_TpetraCrsMatrix__SWIG_8(farg1, farg2, farg3, farg4, farg5) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_7(rowmap, colmap, maxnumentperrow, pftype) & +function swigf_new_TpetraCrsMatrix__SWIG_9(rowmap, colmap, maxnumentperrow, pftype) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8370,11 +8419,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_7(rowmap, colmap, maxnumentperrow, pfty farg2 = colmap%swigdata farg3 = maxnumentperrow farg4 = pftype -fresult = swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2, farg3, farg4) +fresult = swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_8(rowmap, colmap, maxnumentperrow) & +function swigf_new_TpetraCrsMatrix__SWIG_10(rowmap, colmap, maxnumentperrow) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8389,11 +8438,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_8(rowmap, colmap, maxnumentperrow) & farg1 = rowmap%swigdata farg2 = colmap%swigdata farg3 = maxnumentperrow -fresult = swigc_new_TpetraCrsMatrix__SWIG_8(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_9(rowmap, colmap, numentperrowtoalloc, pftype, params) & +function swigf_new_TpetraCrsMatrix__SWIG_11(rowmap, colmap, numentperrowtoalloc, pftype, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8422,11 +8471,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_9(rowmap, colmap, numentperrowtoalloc, end if farg4 = pftype farg5 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3, farg4, farg5) +fresult = swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2, farg3, farg4, farg5) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_10(rowmap, colmap, numentperrowtoalloc, pftype) & +function swigf_new_TpetraCrsMatrix__SWIG_12(rowmap, colmap, numentperrowtoalloc, pftype) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8452,11 +8501,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_10(rowmap, colmap, numentperrowtoalloc, farg3%size = 0 end if farg4 = pftype -fresult = swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3, farg4) +fresult = swigc_new_TpetraCrsMatrix__SWIG_12(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_11(rowmap, colmap, numentperrowtoalloc) & +function swigf_new_TpetraCrsMatrix__SWIG_13(rowmap, colmap, numentperrowtoalloc) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8479,11 +8528,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_11(rowmap, colmap, numentperrowtoalloc) farg3%data = c_null_ptr farg3%size = 0 end if -fresult = swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsMatrix__SWIG_13(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_12(graph, params) & +function swigf_new_TpetraCrsMatrix__SWIG_14(graph, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8495,11 +8544,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_12(graph, params) & farg1 = graph%swigdata farg2 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_12(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_14(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_13(graph) & +function swigf_new_TpetraCrsMatrix__SWIG_15(graph) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8508,11 +8557,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_13(graph) & type(SwigClassWrapper) :: farg1 farg1 = graph%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_13(farg1) +fresult = swigc_new_TpetraCrsMatrix__SWIG_15(farg1) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_18(rowmap, colmap, rowpointers, columnindices, values, params) & +function swigf_new_TpetraCrsMatrix__SWIG_20(rowmap, colmap, rowpointers, columnindices, values, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8560,11 +8609,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_18(rowmap, colmap, rowpointers, columni farg5%size = 0 end if farg6 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_18(farg1, farg2, farg3, farg4, farg5, farg6) +fresult = swigc_new_TpetraCrsMatrix__SWIG_20(farg1, farg2, farg3, farg4, farg5, farg6) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_19(rowmap, colmap, rowpointers, columnindices, values) & +function swigf_new_TpetraCrsMatrix__SWIG_21(rowmap, colmap, rowpointers, columnindices, values) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8609,11 +8658,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_19(rowmap, colmap, rowpointers, columni farg5%data = c_null_ptr farg5%size = 0 end if -fresult = swigc_new_TpetraCrsMatrix__SWIG_19(farg1, farg2, farg3, farg4, farg5) +fresult = swigc_new_TpetraCrsMatrix__SWIG_21(farg1, farg2, farg3, farg4, farg5) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_26(source, copyorview) & +function swigf_new_TpetraCrsMatrix__SWIG_30(source, copyorview) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8625,7 +8674,7 @@ function swigf_new_TpetraCrsMatrix__SWIG_26(source, copyorview) & farg1 = source%swigdata farg2 = copyorview -fresult = swigc_new_TpetraCrsMatrix__SWIG_26(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_30(farg1, farg2) self%swigdata = fresult end function diff --git a/src/fortpetra/generated/fortpetraFORTRAN_wrap.cxx b/src/fortpetra/generated/fortpetraFORTRAN_wrap.cxx index 6187939d..7fcaf7fb 100644 --- a/src/fortpetra/generated/fortpetraFORTRAN_wrap.cxx +++ b/src/fortpetra/generated/fortpetraFORTRAN_wrap.cxx @@ -9,7 +9,7 @@ * ----------------------------------------------------------------------------- */ /* - * Copyright 2017-2018, UT-Battelle, LLC + * Copyright 2017-2020, UT-Battelle, LLC * * SPDX-License-Identifier: BSD-3-Clause * License-Filename: LICENSE @@ -6530,7 +6530,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_13(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_14(SwigClassWrapper const *farg1) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_16(SwigClassWrapper const *farg1) { SwigClassWrapper fresult ; Tpetra::CrsGraph< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::local_ordinal_type,Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::global_ordinal_type,Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::node_type > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; @@ -9397,7 +9397,81 @@ SWIGEXPORT void _wrap_TpetraCrsGraph_op_assign__(SwigClassWrapper *farg1, SwigCl } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_0(SwigClassWrapper const *farg1, size_t const *farg2, int const *farg3, SwigClassWrapper const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_0(SwigClassWrapper const *farg1) { + SwigClassWrapper fresult ; + Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > *arg1 = 0 ; + Teuchos::RCP< Tpetra::CrsMatrix< SC,LO,GO,NO > const > *smartarg1 ; + Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; + + SWIG_check_sp_nonnull(farg1, "Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > *", "TpetraCrsMatrix", "Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > const &)", return SwigClassWrapper_uninitialized()) + smartarg1 = static_cast< Teuchos::RCP >* >(farg1->cptr); + arg1 = const_cast< Tpetra::CrsMatrix* >(smartarg1->get()); + { + // Make sure no unhandled exceptions exist before performing a new action + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > const &)");; + try + { + // Attempt the wrapped function call + result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > const &)*arg1); + } + catch (const std::range_error& e) + { + // Store a C++ exception + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > const &)", SWIG_IndexError, e.what(), return SwigClassWrapper_uninitialized()); + } + catch (const std::exception& e) + { + // Store a C++ exception + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > const &)", SWIG_RuntimeError, e.what(), return SwigClassWrapper_uninitialized()); + } + catch (...) + { + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > const &)", SWIG_UnknownError, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + } + } + fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsMatrix >(result SWIG_NO_NULL_DELETER_1) : NULL; + fresult.cmemflags = SWIG_MEM_OWN | SWIG_MEM_RVALUE | SWIG_sp_mem_flags; + return fresult; +} + + +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_1(SwigClassWrapper const *farg1) { + SwigClassWrapper fresult ; + Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > *arg1 = 0 ; + Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; + + SWIG_check_nonnull(*farg1, "Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > *", "SWIGTYPE_p_p_Tpetra__CrsMatrixT_double_int_long_long_ForT1YX8D6", "Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > &&)", return SwigClassWrapper_uninitialized()); + arg1 = *static_cast< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > ** >(farg1->cptr); + { + // Make sure no unhandled exceptions exist before performing a new action + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > &&)");; + try + { + // Attempt the wrapped function call + result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > &&)*arg1); + } + catch (const std::range_error& e) + { + // Store a C++ exception + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > &&)", SWIG_IndexError, e.what(), return SwigClassWrapper_uninitialized()); + } + catch (const std::exception& e) + { + // Store a C++ exception + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > &&)", SWIG_RuntimeError, e.what(), return SwigClassWrapper_uninitialized()); + } + catch (...) + { + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > &&)", SWIG_UnknownError, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + } + } + fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsMatrix >(result SWIG_NO_NULL_DELETER_1) : NULL; + fresult.cmemflags = SWIG_MEM_OWN | SWIG_MEM_RVALUE | SWIG_sp_mem_flags; + return fresult; +} + + +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_2(SwigClassWrapper const *farg1, size_t const *farg2, int const *farg3, SwigClassWrapper const *farg4) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; size_t arg2 ; @@ -9440,7 +9514,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_0(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_1(SwigClassWrapper const *farg1, size_t const *farg2, int const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_3(SwigClassWrapper const *farg1, size_t const *farg2, int const *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; size_t arg2 ; @@ -9480,7 +9554,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_1(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_2(SwigClassWrapper const *farg1, size_t const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_4(SwigClassWrapper const *farg1, size_t const *farg2) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; size_t arg2 ; @@ -9518,7 +9592,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_2(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_3(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, int const *farg3, SwigClassWrapper const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_5(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, int const *farg3, SwigClassWrapper const *farg4) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::ArrayView< std::size_t const > *arg2 = 0 ; @@ -9563,7 +9637,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_3(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_4(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, int const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_6(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, int const *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::ArrayView< std::size_t const > *arg2 = 0 ; @@ -9605,7 +9679,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_4(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_5(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_7(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::ArrayView< std::size_t const > *arg2 = 0 ; @@ -9645,7 +9719,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_5(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_6(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3, int const *farg4, SwigClassWrapper const *farg5) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_8(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3, int const *farg4, SwigClassWrapper const *farg5) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -9691,7 +9765,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_6(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_7(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3, int const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_9(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3, int const *farg4) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -9734,7 +9808,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_7(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_8(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_10(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -9775,7 +9849,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_8(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_9(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, int const *farg4, SwigClassWrapper const *farg5) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_11(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, int const *farg4, SwigClassWrapper const *farg5) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -9823,7 +9897,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_9(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_10(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, int const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_12(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, int const *farg4) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -9868,7 +9942,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_10(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_11(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_13(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -9911,7 +9985,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_11(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_12(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_14(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::crs_graph_type const > *arg1 = 0 ; Teuchos::RCP< Teuchos::ParameterList > *arg2 = 0 ; @@ -9950,7 +10024,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_12(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_13(SwigClassWrapper const *farg1) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_15(SwigClassWrapper const *farg1) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::crs_graph_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::crs_graph_type const > tempnull1 ; @@ -9986,7 +10060,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_13(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_18(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, SwigArrayWrapper *farg5, SwigClassWrapper const *farg6) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_20(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, SwigArrayWrapper *farg5, SwigClassWrapper const *farg6) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -10052,7 +10126,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_18(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_19(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, SwigArrayWrapper *farg5) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_21(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, SwigArrayWrapper *farg5) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -10115,7 +10189,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_19(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_26(SwigClassWrapper const *farg1, int const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_30(SwigClassWrapper const *farg1, int const *farg2) { SwigClassWrapper fresult ; Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > *arg1 = 0 ; Teuchos::DataAccess arg2 ; From ddf7c9740fc32772a41599299781a1f74e4770df Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Mon, 31 Aug 2020 18:19:16 -0400 Subject: [PATCH 3/4] Update Trilinos version in Dockerfile --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 32f45c48..72aab4c2 100644 --- 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} && \ From 93b737b5ebc47c07bb539e8f9aa91b70f3c4e110 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Tue, 1 Sep 2020 15:28:55 -0400 Subject: [PATCH 4/4] Remove gcc() from warnings plugin until we figure how to ignore Tribits warnings --- .jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins b/.jenkins index b8122029..c386f25d 100644 --- 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]], ) }