diff --git a/doc/install.rst b/doc/install.rst index 428114d6..0a1d0fad 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -38,14 +38,15 @@ in the committed version of the generated wrappers. .. _version_table: -.. table:: Version compatibility table for ForTrilinos. +.. table:: Guaranteed version compatibility table for ForTrilinos. =========== ============== ====================== ForTrilinos Trilinos SWIG =========== ============== ====================== + 2.2.0 13.4 4.1.1+fortran 2.1.0 13.2 4.1.0-dev1+fortran - 2.0.1 13.0:13.1 4.1.0-dev1+fortran - 2.0.0 13.0:13.1 4.0.2+fortran + 2.0.1 13.0:13.2 4.1.0-dev1+fortran + 2.0.0 13.0:13.2 4.0.2+fortran 2.0.0-dev3 12.18.1 4.0.2+fortran 2.0.0-dev2 12.18.1 4.0.0+fortran+15e6ed59 2.0.0-dev1 12.17+8a82b322 4.0.0+fortran+15e6ed59 diff --git a/docker/Dockerfile b/docker/Dockerfile index 192a03b5..91100a5d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -47,7 +47,7 @@ ENV PATH=${CMAKE_DIR}/bin:$PATH # Install Trilinos ENV TRILINOS_DIR=/opt/trilinos -RUN TRILINOS_VERSION=13-2-0 && \ +RUN TRILINOS_VERSION=13-4-1 && \ TRILINOS_URL=https://github.com/trilinos/Trilinos/archive/refs/tags/trilinos-release-${TRILINOS_VERSION}.tar.gz && \ TRILINOS_ARCHIVE=trilinos-${TRILINOS_VERSION}.tar.gz && \ SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \ diff --git a/example/PowerMethod.F90 b/example/PowerMethod.F90 index de98b77c..2050f07a 100644 --- a/example/PowerMethod.F90 +++ b/example/PowerMethod.F90 @@ -84,12 +84,12 @@ program main ! numerical algorithms that use Tpetra objects to be templated on the type of ! the TpetraOperator specialization. max_entries_per_row = 3 -A = TpetraCrsMatrix(map, max_entries_per_row, TpetraStaticProfile) +A = TpetraCrsMatrix(map, max_entries_per_row) ! Fill the sparse matrix, one row at a time. allocate(vals(3)) allocate(cols(3)) -num_my_elements = int(map%getNodeNumElements(), kind=kind(num_my_elements)) +num_my_elements = int(map%getLocalNumElements(), kind=kind(num_my_elements)) fill: do lcl_row = 1, num_my_elements gbl_row = map%getGlobalElement(lcl_row) if (gbl_row == 1) then diff --git a/scripts/build-yuri.sh b/scripts/build-yuri.sh index 104fba69..c178ce51 100755 --- a/scripts/build-yuri.sh +++ b/scripts/build-yuri.sh @@ -7,12 +7,14 @@ cd $SOURCE_DIR mkdir build 2>/dev/null || true cd build -module purge SPACK_VIEW=$SPACK_ROOT/var/spack/environments/fortrilinos/.spack-env/view export CMAKE_PREFIX_PATH=$SPACK_VIEW:$CMAKE_PREFIX_PATH export PATH=$SPACK_VIEW/bin:$PATH cmake -G Ninja \ + -DCMAKE_CXX_FLAGS:STRING=-fcolor-diagnostics \ + -DCMAKE_Fortran_FLAGS:STRING=-fdiagnostics-color \ + -DCMAKE_SHARED_LINKER_FLAGS:STRING=-Wl,-no_compact_unwind \ -DCMAKE_INSTALL_PREFIX:PATH=$SOURCE_DIR/install \ -DCMAKE_BUILD_TYPE:STRING=Debug \ -DBUILD_SHARED_LIBS:BOOL=ON \ diff --git a/src/forbelos/generated/forbelos.F90 b/src/forbelos/generated/forbelos.F90 index 758b91ee..5ef5a0dc 100644 --- a/src/forbelos/generated/forbelos.F90 +++ b/src/forbelos/generated/forbelos.F90 @@ -1,7 +1,7 @@ -! This file was automatically generated by SWIG (http://www.swig.org). -! Version 4.1.0+fortran +! This file was automatically generated by SWIG (https://www.swig.org). +! Version 4.1.1+fortran ! -! Do not make changes to this file unless you know what you are doing--modify +! Do not make changes to this file unless you know what you are doing - modify ! the SWIG interface file instead. ! Copyright 2017-2020, UT-Battelle, LLC diff --git a/src/forbelos/generated/forbelosFORTRAN_wrap.cxx b/src/forbelos/generated/forbelosFORTRAN_wrap.cxx index f78f9264..e9b5da74 100644 --- a/src/forbelos/generated/forbelosFORTRAN_wrap.cxx +++ b/src/forbelos/generated/forbelosFORTRAN_wrap.cxx @@ -1,11 +1,9 @@ /* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.1.0+fortran + * This file was automatically generated by SWIG (https://www.swig.org). + * Version 4.1.1+fortran * - * This file is not intended to be easily readable and contains a number of - * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * Do not make changes to this file unless you know what you are doing - modify + * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ /* @@ -15,12 +13,6 @@ * License-Filename: LICENSE */ - - -#ifndef SWIGFORTRAN -#define SWIGFORTRAN -#endif - /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -146,44 +138,6 @@ #endif -#ifdef __cplusplus -#include -/* SwigValueWrapper is described in swig.swg */ -template class SwigValueWrapper { - struct SwigSmartPointer { - T *ptr; - SwigSmartPointer(T *p) : ptr(p) { } - ~SwigSmartPointer() { delete ptr; } - SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } - } pointer; - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); - SwigValueWrapper(const SwigValueWrapper& rhs); -public: - SwigValueWrapper() : pointer(0) { } - SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } -#if __cplusplus >=201103L - SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } - operator T&&() const { return std::move(*pointer.ptr); } -#else - operator T&() const { return *pointer.ptr; } -#endif - T *operator&() const { return pointer.ptr; } -}; - -template T SwigValueInit() { - return T(); -} - - -#if __cplusplus >=201103L -# define SWIG_STD_MOVE(OBJ) std::move(OBJ) -#else -# define SWIG_STD_MOVE(OBJ) OBJ -#endif - -#endif - - #ifndef SWIGEXTERN # ifdef __cplusplus # define SWIGEXTERN extern @@ -242,8 +196,60 @@ enum AssignmentType { }; } + + +#define SWIG_VERSION 0x040101 +#define SWIGFORTRAN #define SWIGPOLICY_Belos_DefaultSolverParameters swig::ASSIGNMENT_DEFAULT +#ifdef __cplusplus +#include +/* SwigValueWrapper is described in swig.swg */ +template class SwigValueWrapper { + struct SwigSmartPointer { + T *ptr; + SwigSmartPointer(T *p) : ptr(p) { } + ~SwigSmartPointer() { delete ptr; } + SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); +public: + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } +#if __cplusplus >=201103L + SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } + operator T&&() const { return std::move(*pointer.ptr); } +#else + operator T&() const { return *pointer.ptr; } +#endif + T *operator&() const { return pointer.ptr; } + static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); } +}; + +/* + * SwigValueInit() is a generic initialisation solution as the following approach: + * + * T c_result = T(); + * + * doesn't compile for all types for example: + * + * unsigned int c_result = unsigned int(); + */ +template T SwigValueInit() { + return T(); +} + +#if __cplusplus >=201103L +# define SWIG_STD_MOVE(OBJ) std::move(OBJ) +#else +# define SWIG_STD_MOVE(OBJ) OBJ +#endif + +#endif + + #include @@ -256,10 +262,6 @@ enum AssignmentType { if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } -#define SWIGVERSION 0x040100 -#define SWIG_VERSION SWIGVERSION - - #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) diff --git a/src/forerror/generated/forerror.F90 b/src/forerror/generated/forerror.F90 index 83828667..6828bd76 100644 --- a/src/forerror/generated/forerror.F90 +++ b/src/forerror/generated/forerror.F90 @@ -1,7 +1,7 @@ -! This file was automatically generated by SWIG (http://www.swig.org). -! Version 4.1.0+fortran +! This file was automatically generated by SWIG (https://www.swig.org). +! Version 4.1.1+fortran ! -! Do not make changes to this file unless you know what you are doing--modify +! Do not make changes to this file unless you know what you are doing - modify ! the SWIG interface file instead. ! Copyright 2017-2020, UT-Battelle, LLC diff --git a/src/forerror/generated/forerrorFORTRAN_wrap.cxx b/src/forerror/generated/forerrorFORTRAN_wrap.cxx index f2353be4..a8b87507 100644 --- a/src/forerror/generated/forerrorFORTRAN_wrap.cxx +++ b/src/forerror/generated/forerrorFORTRAN_wrap.cxx @@ -1,11 +1,9 @@ /* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.1.0+fortran + * This file was automatically generated by SWIG (https://www.swig.org). + * Version 4.1.1+fortran * - * This file is not intended to be easily readable and contains a number of - * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * Do not make changes to this file unless you know what you are doing - modify + * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ /* @@ -15,12 +13,6 @@ * License-Filename: LICENSE */ - - -#ifndef SWIGFORTRAN -#define SWIGFORTRAN -#endif - /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -146,44 +138,6 @@ #endif -#ifdef __cplusplus -#include -/* SwigValueWrapper is described in swig.swg */ -template class SwigValueWrapper { - struct SwigSmartPointer { - T *ptr; - SwigSmartPointer(T *p) : ptr(p) { } - ~SwigSmartPointer() { delete ptr; } - SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } - } pointer; - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); - SwigValueWrapper(const SwigValueWrapper& rhs); -public: - SwigValueWrapper() : pointer(0) { } - SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } -#if __cplusplus >=201103L - SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } - operator T&&() const { return std::move(*pointer.ptr); } -#else - operator T&() const { return *pointer.ptr; } -#endif - T *operator&() const { return pointer.ptr; } -}; - -template T SwigValueInit() { - return T(); -} - - -#if __cplusplus >=201103L -# define SWIG_STD_MOVE(OBJ) std::move(OBJ) -#else -# define SWIG_STD_MOVE(OBJ) OBJ -#endif - -#endif - - #ifndef SWIGEXTERN # ifdef __cplusplus # define SWIGEXTERN extern @@ -228,6 +182,58 @@ SWIGEXPORT void SWIG_store_exception(const char* decl, int errcode, const char * SWIG_store_exception(DECL, CODE, MSG); RETURNNULL; + +#define SWIG_VERSION 0x040101 +#define SWIGFORTRAN + +#ifdef __cplusplus +#include +/* SwigValueWrapper is described in swig.swg */ +template class SwigValueWrapper { + struct SwigSmartPointer { + T *ptr; + SwigSmartPointer(T *p) : ptr(p) { } + ~SwigSmartPointer() { delete ptr; } + SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); +public: + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } +#if __cplusplus >=201103L + SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } + operator T&&() const { return std::move(*pointer.ptr); } +#else + operator T&() const { return *pointer.ptr; } +#endif + T *operator&() const { return pointer.ptr; } + static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); } +}; + +/* + * SwigValueInit() is a generic initialisation solution as the following approach: + * + * T c_result = T(); + * + * doesn't compile for all types for example: + * + * unsigned int c_result = unsigned int(); + */ +template T SwigValueInit() { + return T(); +} + +#if __cplusplus >=201103L +# define SWIG_STD_MOVE(OBJ) std::move(OBJ) +#else +# define SWIG_STD_MOVE(OBJ) OBJ +#endif + +#endif + + #include @@ -240,10 +246,6 @@ SWIGEXPORT void SWIG_store_exception(const char* decl, int errcode, const char * if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } -#define SWIGVERSION 0x040100 -#define SWIG_VERSION SWIGVERSION - - #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) @@ -300,10 +302,10 @@ SWIGEXPORT const char* fortrilinos_get_serr() { #include -extern "C" { - #include +extern "C" { + // Call this function before any new action SWIGEXPORT void SWIG_check_unhandled_exception_impl(const char* decl) { if (fortrilinos_ierr != 0) { diff --git a/src/forteuchos/generated/forteuchos.F90 b/src/forteuchos/generated/forteuchos.F90 index 93935386..6f664af4 100644 --- a/src/forteuchos/generated/forteuchos.F90 +++ b/src/forteuchos/generated/forteuchos.F90 @@ -1,7 +1,7 @@ -! This file was automatically generated by SWIG (http://www.swig.org). -! Version 4.1.0+fortran +! This file was automatically generated by SWIG (https://www.swig.org). +! Version 4.1.1+fortran ! -! Do not make changes to this file unless you know what you are doing--modify +! Do not make changes to this file unless you know what you are doing - modify ! the SWIG interface file instead. ! Copyright 2017-2020, UT-Battelle, LLC @@ -145,27 +145,27 @@ module forteuchos procedure :: get_arr_longlong => swigf_ParameterList_get_arr_longlong procedure :: release => swigf_ParameterList_release procedure, private :: swigf_ParameterList_op_assign__ - generic :: assignment(=) => swigf_ParameterList_op_assign__ generic :: set => swigf_ParameterList_set__SWIG_1, swigf_ParameterList_set__SWIG_2, swigf_ParameterList_set__SWIG_3, & swigf_ParameterList_set__SWIG_4, swigf_ParameterList_set__SWIG_5, swigf_ParameterList_set__SWIG_6, & swigf_ParameterList_set__SWIG_7, swigf_ParameterList_set__SWIG_8, swigf_ParameterList_set__SWIG_9 + generic :: assignment(=) => swigf_ParameterList_op_assign__ end type ParameterList public :: load_from_xml public :: save_to_xml - interface TeuchosArrayLongLong - module procedure swigf_new_TeuchosArrayLongLong - end interface interface TeuchosArrayInt module procedure swigf_new_TeuchosArrayInt end interface - interface TeuchosComm - module procedure swigf_new_TeuchosComm__SWIG_0, swigf_new_TeuchosComm__SWIG_1 + interface TeuchosArrayLongLong + module procedure swigf_new_TeuchosArrayLongLong + end interface + interface ParameterList + module procedure swigf_new_ParameterList__SWIG_0, swigf_new_ParameterList__SWIG_1 end interface interface TeuchosArrayDbl module procedure swigf_new_TeuchosArrayDbl end interface - interface ParameterList - module procedure swigf_new_ParameterList__SWIG_0, swigf_new_ParameterList__SWIG_1 + interface TeuchosComm + module procedure swigf_new_TeuchosComm__SWIG_0, swigf_new_TeuchosComm__SWIG_1 end interface ! WRAPPER DECLARATIONS @@ -174,8 +174,8 @@ function swigc_new_TeuchosArrayInt(farg1) & bind(C, name="_wrap_new_TeuchosArrayInt") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper) :: fresult end function @@ -183,8 +183,8 @@ function swigc_new_TeuchosArrayInt(farg1) & subroutine swigc_TeuchosArrayInt_assign(farg1, farg2) & bind(C, name="_wrap_TeuchosArrayInt_assign") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -218,8 +218,8 @@ function swigc_new_TeuchosArrayDbl(farg1) & bind(C, name="_wrap_new_TeuchosArrayDbl") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper) :: fresult end function @@ -227,8 +227,8 @@ function swigc_new_TeuchosArrayDbl(farg1) & subroutine swigc_TeuchosArrayDbl_assign(farg1, farg2) & bind(C, name="_wrap_TeuchosArrayDbl_assign") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -262,8 +262,8 @@ function swigc_new_TeuchosArrayLongLong(farg1) & bind(C, name="_wrap_new_TeuchosArrayLongLong") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper) :: fresult end function @@ -271,8 +271,8 @@ function swigc_new_TeuchosArrayLongLong(farg1) & subroutine swigc_TeuchosArrayLongLong_assign(farg1, farg2) & bind(C, name="_wrap_TeuchosArrayLongLong_assign") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -380,8 +380,8 @@ function swigc_new_ParameterList__SWIG_1(farg1) & bind(C, name="_wrap_new_ParameterList__SWIG_1") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper) :: fresult end function @@ -396,8 +396,8 @@ subroutine swigc_ParameterList_print(farg1) & subroutine swigc_ParameterList_remove(farg1, farg2) & bind(C, name="_wrap_ParameterList_remove") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -406,8 +406,8 @@ function swigc_ParameterList_is_parameter(farg1, farg2) & bind(C, name="_wrap_ParameterList_is_parameter") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_INT) :: fresult @@ -417,8 +417,8 @@ function swigc_ParameterList_sublist(farg1, farg2) & bind(C, name="_wrap_ParameterList_sublist") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper) :: fresult @@ -427,8 +427,8 @@ function swigc_ParameterList_sublist(farg1, farg2) & subroutine swigc_ParameterList_set__SWIG_1(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 real(C_DOUBLE), intent(in) :: farg3 @@ -437,8 +437,8 @@ subroutine swigc_ParameterList_set__SWIG_1(farg1, farg2, farg3) & subroutine swigc_ParameterList_set__SWIG_2(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_2") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_INT), intent(in) :: farg3 @@ -447,8 +447,8 @@ subroutine swigc_ParameterList_set__SWIG_2(farg1, farg2, farg3) & subroutine swigc_ParameterList_set__SWIG_3(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_3") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_LONG_LONG), intent(in) :: farg3 @@ -457,8 +457,8 @@ subroutine swigc_ParameterList_set__SWIG_3(farg1, farg2, farg3) & subroutine swigc_ParameterList_set__SWIG_4(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_4") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_INT), intent(in) :: farg3 @@ -467,8 +467,8 @@ subroutine swigc_ParameterList_set__SWIG_4(farg1, farg2, farg3) & subroutine swigc_ParameterList_set__SWIG_5(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_5") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -477,8 +477,8 @@ subroutine swigc_ParameterList_set__SWIG_5(farg1, farg2, farg3) & subroutine swigc_ParameterList_set__SWIG_6(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_6") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -487,8 +487,8 @@ subroutine swigc_ParameterList_set__SWIG_6(farg1, farg2, farg3) & subroutine swigc_ParameterList_set__SWIG_7(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_7") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -497,8 +497,8 @@ subroutine swigc_ParameterList_set__SWIG_7(farg1, farg2, farg3) & subroutine swigc_ParameterList_set__SWIG_8(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_8") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -507,8 +507,8 @@ subroutine swigc_ParameterList_set__SWIG_8(farg1, farg2, farg3) & subroutine swigc_ParameterList_set__SWIG_9(farg1, farg2, farg3) & bind(C, name="_wrap_ParameterList_set__SWIG_9") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -518,8 +518,8 @@ function swigc_ParameterList_get_real(farg1, farg2) & bind(C, name="_wrap_ParameterList_get_real") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 real(C_DOUBLE) :: fresult @@ -529,8 +529,8 @@ function swigc_ParameterList_get_integer(farg1, farg2) & bind(C, name="_wrap_ParameterList_get_integer") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_INT) :: fresult @@ -540,8 +540,8 @@ function swigc_ParameterList_get_longlong(farg1, farg2) & bind(C, name="_wrap_ParameterList_get_longlong") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_LONG_LONG) :: fresult @@ -551,8 +551,8 @@ function swigc_ParameterList_get_logical(farg1, farg2) & bind(C, name="_wrap_ParameterList_get_logical") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_INT) :: fresult @@ -625,8 +625,8 @@ subroutine swigc_ParameterList_op_assign__(farg1, farg2) & subroutine swigc_load_from_xml(farg1, farg2) & bind(C, name="_wrap_load_from_xml") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -634,8 +634,8 @@ subroutine swigc_load_from_xml(farg1, farg2) & subroutine swigc_save_to_xml(farg1, farg2) & bind(C, name="_wrap_save_to_xml") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine diff --git a/src/forteuchos/generated/forteuchosFORTRAN_wrap.cxx b/src/forteuchos/generated/forteuchosFORTRAN_wrap.cxx index 4adc2cd4..ca7aac99 100644 --- a/src/forteuchos/generated/forteuchosFORTRAN_wrap.cxx +++ b/src/forteuchos/generated/forteuchosFORTRAN_wrap.cxx @@ -1,11 +1,9 @@ /* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.1.0+fortran + * This file was automatically generated by SWIG (https://www.swig.org). + * Version 4.1.1+fortran * - * This file is not intended to be easily readable and contains a number of - * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * Do not make changes to this file unless you know what you are doing - modify + * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ /* @@ -15,12 +13,6 @@ * License-Filename: LICENSE */ - - -#ifndef SWIGFORTRAN -#define SWIGFORTRAN -#endif - /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -146,44 +138,6 @@ #endif -#ifdef __cplusplus -#include -/* SwigValueWrapper is described in swig.swg */ -template class SwigValueWrapper { - struct SwigSmartPointer { - T *ptr; - SwigSmartPointer(T *p) : ptr(p) { } - ~SwigSmartPointer() { delete ptr; } - SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } - } pointer; - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); - SwigValueWrapper(const SwigValueWrapper& rhs); -public: - SwigValueWrapper() : pointer(0) { } - SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } -#if __cplusplus >=201103L - SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } - operator T&&() const { return std::move(*pointer.ptr); } -#else - operator T&() const { return *pointer.ptr; } -#endif - T *operator&() const { return pointer.ptr; } -}; - -template T SwigValueInit() { - return T(); -} - - -#if __cplusplus >=201103L -# define SWIG_STD_MOVE(OBJ) std::move(OBJ) -#else -# define SWIG_STD_MOVE(OBJ) OBJ -#endif - -#endif - - #ifndef SWIGEXTERN # ifdef __cplusplus # define SWIGEXTERN extern @@ -260,6 +214,10 @@ enum AssignmentType { #define SWIG_sp_mem_flags 0 + + +#define SWIG_VERSION 0x040101 +#define SWIGFORTRAN #define SWIGPOLICY_Teuchos_ArrayView_Sl_int_Sg_ swig::ASSIGNMENT_DEFAULT #define SWIGPOLICY_Teuchos_ArrayView_Sl_int_SS_const_Sg_ swig::ASSIGNMENT_DEFAULT #define SWIGPOLICY_Teuchos_ArrayView_Sl_double_Sg_ swig::ASSIGNMENT_DEFAULT @@ -298,6 +256,54 @@ enum AssignmentType { #define SWIGPOLICY_Teuchos_RCP_Sl_Teuchos_ParameterList_SS_const_Sg_ swig::ASSIGNMENT_DEFAULT #define SWIGPOLICY_Teuchos_ParameterList swig::ASSIGNMENT_SMARTPTR +#ifdef __cplusplus +#include +/* SwigValueWrapper is described in swig.swg */ +template class SwigValueWrapper { + struct SwigSmartPointer { + T *ptr; + SwigSmartPointer(T *p) : ptr(p) { } + ~SwigSmartPointer() { delete ptr; } + SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); +public: + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } +#if __cplusplus >=201103L + SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } + operator T&&() const { return std::move(*pointer.ptr); } +#else + operator T&() const { return *pointer.ptr; } +#endif + T *operator&() const { return pointer.ptr; } + static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); } +}; + +/* + * SwigValueInit() is a generic initialisation solution as the following approach: + * + * T c_result = T(); + * + * doesn't compile for all types for example: + * + * unsigned int c_result = unsigned int(); + */ +template T SwigValueInit() { + return T(); +} + +#if __cplusplus >=201103L +# define SWIG_STD_MOVE(OBJ) std::move(OBJ) +#else +# define SWIG_STD_MOVE(OBJ) OBJ +#endif + +#endif + + #include @@ -310,10 +316,6 @@ enum AssignmentType { if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } -#define SWIGVERSION 0x040100 -#define SWIG_VERSION SWIGVERSION - - #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) @@ -381,10 +383,10 @@ SWIGINTERN SwigArrayWrapper SwigArrayWrapper_uninitialized() { return result; } -SWIGINTERN void Teuchos_Array_Sl_int_Sg__assign__SWIG(Teuchos::Array< int > *self,int const *DATA,Teuchos::Array< int >::size_type SIZE){ +SWIGINTERN void Teuchos_Array_Sl_int_Sg__assign(Teuchos::Array< int > *self,int const *DATA,Teuchos::Array< int >::size_type SIZE){ self->assign(DATA, DATA + SIZE); } -SWIGINTERN Teuchos::Array< int > &Teuchos_Array_Sl_int_Sg__view__SWIG(Teuchos::Array< int > *self){ +SWIGINTERN Teuchos::Array< int > &Teuchos_Array_Sl_int_Sg__view(Teuchos::Array< int > *self){ return *self; } @@ -504,16 +506,16 @@ SWIGINTERN void SWIG_free_rvalue(SwigClassWrapper other) { } -SWIGINTERN void Teuchos_Array_Sl_double_Sg__assign__SWIG(Teuchos::Array< double > *self,double const *DATA,Teuchos::Array< double >::size_type SIZE){ +SWIGINTERN void Teuchos_Array_Sl_double_Sg__assign(Teuchos::Array< double > *self,double const *DATA,Teuchos::Array< double >::size_type SIZE){ self->assign(DATA, DATA + SIZE); } -SWIGINTERN Teuchos::Array< double > &Teuchos_Array_Sl_double_Sg__view__SWIG(Teuchos::Array< double > *self){ +SWIGINTERN Teuchos::Array< double > &Teuchos_Array_Sl_double_Sg__view(Teuchos::Array< double > *self){ return *self; } -SWIGINTERN void Teuchos_Array_Sl_long_SS_long_Sg__assign__SWIG(Teuchos::Array< long long > *self,long long const *DATA,Teuchos::Array< long long >::size_type SIZE){ +SWIGINTERN void Teuchos_Array_Sl_long_SS_long_Sg__assign(Teuchos::Array< long long > *self,long long const *DATA,Teuchos::Array< long long >::size_type SIZE){ self->assign(DATA, DATA + SIZE); } -SWIGINTERN Teuchos::Array< long long > &Teuchos_Array_Sl_long_SS_long_Sg__view__SWIG(Teuchos::Array< long long > *self){ +SWIGINTERN Teuchos::Array< long long > &Teuchos_Array_Sl_long_SS_long_Sg__view(Teuchos::Array< long long > *self){ return *self; } @@ -545,7 +547,7 @@ SWIGINTERN Teuchos::Comm< int > *new_Teuchos_Comm_Sl_int_Sg___SWIG_1(){ return new Teuchos::SerialComm(); #endif } -SWIGINTERN MPI_Comm Teuchos_Comm_Sl_int_Sg__getRawMpiComm__SWIG(Teuchos::Comm< int > *self){ +SWIGINTERN MPI_Comm Teuchos_Comm_Sl_int_Sg__getRawMpiComm(Teuchos::Comm< int > *self){ #if FORTRILINOS_USE_MPI Teuchos::MpiComm& comm = dynamic_cast&>(*self); return *comm.getRawMpiComm(); @@ -628,7 +630,7 @@ SWIGEXPORT void _wrap_TeuchosArrayInt_assign(SwigClassWrapper *farg1, SwigArrayW try { // Attempt the wrapped function call - Teuchos_Array_Sl_int_Sg__assign__SWIG(arg1,(int const *)arg2,SWIG_STD_MOVE(arg3)); + Teuchos_Array_Sl_int_Sg__assign(arg1,(int const *)arg2,SWIG_STD_MOVE(arg3)); } catch (const std::range_error& e) { @@ -661,7 +663,7 @@ SWIGEXPORT SwigArrayWrapper _wrap_TeuchosArrayInt_view(SwigClassWrapper *farg1) try { // Attempt the wrapped function call - result = (Teuchos::Array< int > *) &Teuchos_Array_Sl_int_Sg__view__SWIG(arg1); + result = (Teuchos::Array< int > *) &Teuchos_Array_Sl_int_Sg__view(arg1); } catch (const std::range_error& e) { @@ -755,7 +757,7 @@ SWIGEXPORT void _wrap_TeuchosArrayDbl_assign(SwigClassWrapper *farg1, SwigArrayW try { // Attempt the wrapped function call - Teuchos_Array_Sl_double_Sg__assign__SWIG(arg1,(double const *)arg2,SWIG_STD_MOVE(arg3)); + Teuchos_Array_Sl_double_Sg__assign(arg1,(double const *)arg2,SWIG_STD_MOVE(arg3)); } catch (const std::range_error& e) { @@ -788,7 +790,7 @@ SWIGEXPORT SwigArrayWrapper _wrap_TeuchosArrayDbl_view(SwigClassWrapper *farg1) try { // Attempt the wrapped function call - result = (Teuchos::Array< double > *) &Teuchos_Array_Sl_double_Sg__view__SWIG(arg1); + result = (Teuchos::Array< double > *) &Teuchos_Array_Sl_double_Sg__view(arg1); } catch (const std::range_error& e) { @@ -882,7 +884,7 @@ SWIGEXPORT void _wrap_TeuchosArrayLongLong_assign(SwigClassWrapper *farg1, SwigA try { // Attempt the wrapped function call - Teuchos_Array_Sl_long_SS_long_Sg__assign__SWIG(arg1,(long long const *)arg2,SWIG_STD_MOVE(arg3)); + Teuchos_Array_Sl_long_SS_long_Sg__assign(arg1,(long long const *)arg2,SWIG_STD_MOVE(arg3)); } catch (const std::range_error& e) { @@ -915,7 +917,7 @@ SWIGEXPORT SwigArrayWrapper _wrap_TeuchosArrayLongLong_view(SwigClassWrapper *fa try { // Attempt the wrapped function call - result = (Teuchos::Array< long long > *) &Teuchos_Array_Sl_long_SS_long_Sg__view__SWIG(arg1); + result = (Teuchos::Array< long long > *) &Teuchos_Array_Sl_long_SS_long_Sg__view(arg1); } catch (const std::range_error& e) { @@ -1147,7 +1149,7 @@ SWIGEXPORT int _wrap_TeuchosComm_getRawMpiComm(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Teuchos_Comm_Sl_int_Sg__getRawMpiComm__SWIG(arg1); + result = Teuchos_Comm_Sl_int_Sg__getRawMpiComm(arg1); } catch (const std::range_error& e) { diff --git a/src/fortpetra/Tpetra_CrsGraph.i b/src/fortpetra/Tpetra_CrsGraph.i index 7cc4823a..a98e0b8f 100644 --- a/src/fortpetra/Tpetra_CrsGraph.i +++ b/src/fortpetra/Tpetra_CrsGraph.i @@ -96,16 +96,8 @@ // Make interface more Fortran friendly // ======================================================================= %extend Tpetra::CrsGraph { - // NOTE: This is semantically different function from Tpetra. Here, we *require* that user already allocated the arrays to store the data - void getNodeRowPtrs(Teuchos::ArrayView rowPointers) const { - auto rowPointersArrayRCP = $self->getNodeRowPtrs(); - TEUCHOS_TEST_FOR_EXCEPTION(rowPointersArrayRCP.size() != rowPointers.size(), std::runtime_error, "Wrong rowPointers size"); - auto n = rowPointers.size(); - for (int i = 0; i < n; i++) - rowPointers[i] = rowPointersArrayRCP[i]+1; - } - void getNodePackedIndices(Teuchos::ArrayView columnIndices) const { - auto columnIndicesArrayRCP = $self->getNodeRowPtrs(); + void getLocalPackedIndices(Teuchos::ArrayView columnIndices) const { + auto columnIndicesArrayRCP = $self->getLocalRowPtrsHost(); TEUCHOS_TEST_FOR_EXCEPTION(columnIndicesArrayRCP.size() != columnIndices.size(), std::runtime_error, "Wrong columnIndices size"); auto nnz = columnIndices.size(); for (int i = 0; i < nnz; i++) @@ -130,8 +122,6 @@ // Add doImport and doExport %tpetra_extend_with_import_export(Tpetra::CrsGraph) -%ignore Tpetra::CrsGraph::getNodeRowPtrs() const; -%ignore Tpetra::CrsGraph::getNodePackedIndices() const; %ignore Tpetra::CrsGraph::getLocalDiagOffsets; %ignore Tpetra::CrsGraph::setAllIndices (const typename local_graph_type::row_map_type &rowPointers, const typename local_graph_type::entries_type::non_const_type &columnIndices); diff --git a/src/fortpetra/Tpetra_CrsMatrix.i b/src/fortpetra/Tpetra_CrsMatrix.i index 91fcd410..4a3350ad 100644 --- a/src/fortpetra/Tpetra_CrsMatrix.i +++ b/src/fortpetra/Tpetra_CrsMatrix.i @@ -86,25 +86,24 @@ // Make interface more Fortran friendly // ======================================================================= %extend Tpetra::CrsMatrix { - // NOTE: This is semantically different function from Tpetra. Here, we *require* that user already allocated the arrays to store the data void getAllValues(Teuchos::ArrayView rowPointers, Teuchos::ArrayView columnIndices, Teuchos::ArrayView values) const { - Teuchos::ArrayRCP rowPointersArrayRCP; - Teuchos::ArrayRCP columnIndicesArrayRCP; - Teuchos::ArrayRCP valuesArrayRCP; - $self->getAllValues(rowPointersArrayRCP, columnIndicesArrayRCP, valuesArrayRCP); - TEUCHOS_TEST_FOR_EXCEPTION(rowPointersArrayRCP.size() != rowPointers.size(), std::runtime_error, "Wrong rowPointers size"); - TEUCHOS_TEST_FOR_EXCEPTION(columnIndicesArrayRCP.size() != columnIndices.size(), std::runtime_error, "Wrong columnIndices size"); - TEUCHOS_TEST_FOR_EXCEPTION(valuesArrayRCP.size() != values.size(), std::runtime_error, "Wrong values size"); - auto n = rowPointers.size(); - for (int i = 0; i < n; i++) - rowPointers[i] = rowPointersArrayRCP[i]+1; - auto nnz = columnIndices.size(); - for (int i = 0; i < nnz; i++) { - columnIndices[i] = columnIndicesArrayRCP[i]+1; - values [i] = valuesArrayRCP[i]; - } + auto rowptr = $self->getLocalRowPtrsHost(); + auto colidx = $self->getLocalIndicesHost(); + auto val = $self->getLocalValuesHost(Tpetra::Access::ReadOnly); + + TEUCHOS_TEST_FOR_EXCEPTION(rowptr.size() != rowPointers.size(), std::runtime_error, "Wrong rowPointers size"); + TEUCHOS_TEST_FOR_EXCEPTION(colidx.size() != columnIndices.size(), std::runtime_error, "Wrong columnIndices size"); + TEUCHOS_TEST_FOR_EXCEPTION(val.size() != values.size(), std::runtime_error, "Wrong values size"); + auto n = rowPointers.size(); + for (int i = 0; i < n; i++) + rowPointers[i] = rowptr[i]+1; + auto nnz = columnIndices.size(); + for (int i = 0; i < nnz; i++) { + columnIndices[i] = colidx[i]+1; + values [i] = val[i]; + } } - + // NOTE: This is semantically different function from Tpetra. Here, we *require* that user already allocated the arrays to store the data void getGlobalRowCopy (GO GlobalRow, const Teuchos::ArrayView& Indices, diff --git a/src/fortpetra/Tpetra_Map.i b/src/fortpetra/Tpetra_Map.i index 2f45f003..59448edc 100644 --- a/src/fortpetra/Tpetra_Map.i +++ b/src/fortpetra/Tpetra_Map.i @@ -32,7 +32,7 @@ // ======================================================================= // Function signatures for local quantities are incorrectly declared as size_t -%apply LO { size_t getNodeNumElements, +%apply LO { size_t getLocalNumElements, size_t numLocalElements }; // Convert from C to/from Fortran indices diff --git a/src/fortpetra/fortpetra.i b/src/fortpetra/fortpetra.i index cd3e46a8..ce8cbf9f 100644 --- a/src/fortpetra/fortpetra.i +++ b/src/fortpetra/fortpetra.i @@ -132,11 +132,12 @@ public :: norm_type %ignore *::getIndexBase; %ignore *::getNode; -// Ignore depreceated functions (CrsGraph, CrsMatrix) +// Ignore deprecated functions (CrsGraph, CrsMatrix) %ignore *::getGlobalNumDiags; %ignore *::getNodeNumDiags; %ignore *::isLowerTriangular; %ignore *::isUpperTriangular; +%ignore *::getNodeRowPtrs; // Order matters!!! %include "Tpetra_Map.i" diff --git a/src/fortpetra/generated/fortpetra.F90 b/src/fortpetra/generated/fortpetra.F90 index 761bd356..2dcbb89c 100644 --- a/src/fortpetra/generated/fortpetra.F90 +++ b/src/fortpetra/generated/fortpetra.F90 @@ -1,7 +1,7 @@ -! This file was automatically generated by SWIG (http://www.swig.org). -! Version 4.1.0+fortran +! This file was automatically generated by SWIG (https://www.swig.org). +! Version 4.1.1+fortran ! -! Do not make changes to this file unless you know what you are doing--modify +! Do not make changes to this file unless you know what you are doing - modify ! the SWIG interface file instead. ! Copyright 2017-2020, UT-Battelle, LLC @@ -60,12 +60,6 @@ module fortpetra end enum integer, parameter, public :: TpetraLookupStatus = kind(TpetraAllIDsPresent) public :: TpetraAllIDsPresent, TpetraIDNotPresent - ! enum Tpetra::ProfileType - enum, bind(c) - enumerator :: TpetraStaticProfile - end enum - integer, parameter, public :: TpetraProfileType = kind(TpetraStaticProfile) - public :: TpetraStaticProfile ! enum Tpetra::OptimizeOption enum, bind(c) enumerator :: TpetraDoOptimizeStorage @@ -115,7 +109,7 @@ module fortpetra procedure :: release => swigf_TpetraMap_release procedure :: isOneToOne => swigf_TpetraMap_isOneToOne procedure :: getGlobalNumElements => swigf_TpetraMap_getGlobalNumElements - procedure :: getNodeNumElements => swigf_TpetraMap_getNodeNumElements + procedure :: getLocalNumElements => swigf_TpetraMap_getLocalNumElements procedure :: getMinLocalIndex => swigf_TpetraMap_getMinLocalIndex procedure :: getMaxLocalIndex => swigf_TpetraMap_getMaxLocalIndex procedure :: getMinGlobalIndex => swigf_TpetraMap_getMinGlobalIndex @@ -126,7 +120,7 @@ module fortpetra procedure :: getGlobalElement => swigf_TpetraMap_getGlobalElement procedure, private :: swigf_TpetraMap_getRemoteIndexList__SWIG_0 procedure, private :: swigf_TpetraMap_getRemoteIndexList__SWIG_1 - procedure :: getNodeElementList => swigf_TpetraMap_getNodeElementList + procedure :: getLocalElementList => swigf_TpetraMap_getLocalElementList procedure :: isNodeLocalElement => swigf_TpetraMap_isNodeLocalElement procedure :: isNodeGlobalElement => swigf_TpetraMap_isNodeGlobalElement procedure :: isUniform => swigf_TpetraMap_isUniform @@ -232,21 +226,21 @@ module fortpetra procedure, private :: swigf_TpetraMultiVector_doExport__SWIG_0 procedure, private :: swigf_TpetraMultiVector_doExport__SWIG_1 procedure, private :: swigf_TpetraMultiVector_op_assign__ - generic :: assignment(=) => swigf_TpetraMultiVector_op_assign__ - generic :: randomize => swigf_TpetraMultiVector_randomize__SWIG_0, swigf_TpetraMultiVector_randomize__SWIG_1 - generic :: normInf => swigf_TpetraMultiVector_normInf__SWIG_1 - generic :: doImport => swigf_TpetraMultiVector_doImport__SWIG_0, swigf_TpetraMultiVector_doImport__SWIG_1 - generic :: sumIntoGlobalValue => swigf_TpetraMultiVector_sumIntoGlobalValue__SWIG_0, & - swigf_TpetraMultiVector_sumIntoGlobalValue__SWIG_1 generic :: sumIntoLocalValue => swigf_TpetraMultiVector_sumIntoLocalValue__SWIG_0, & swigf_TpetraMultiVector_sumIntoLocalValue__SWIG_1 generic :: dot => swigf_TpetraMultiVector_dot__SWIG_0 - generic :: norm1 => swigf_TpetraMultiVector_norm1__SWIG_1 + generic :: update => swigf_TpetraMultiVector_update__SWIG_0, swigf_TpetraMultiVector_update__SWIG_1 + generic :: randomize => swigf_TpetraMultiVector_randomize__SWIG_0, swigf_TpetraMultiVector_randomize__SWIG_1 generic :: doExport => swigf_TpetraMultiVector_doExport__SWIG_0, swigf_TpetraMultiVector_doExport__SWIG_1 + generic :: assignment(=) => swigf_TpetraMultiVector_op_assign__ + generic :: norm1 => swigf_TpetraMultiVector_norm1__SWIG_1 generic :: scale => swigf_TpetraMultiVector_scale__SWIG_0, swigf_TpetraMultiVector_scale__SWIG_1, & swigf_TpetraMultiVector_scale__SWIG_3 generic :: norm2 => swigf_TpetraMultiVector_norm2__SWIG_1 - generic :: update => swigf_TpetraMultiVector_update__SWIG_0, swigf_TpetraMultiVector_update__SWIG_1 + generic :: normInf => swigf_TpetraMultiVector_normInf__SWIG_1 + generic :: sumIntoGlobalValue => swigf_TpetraMultiVector_sumIntoGlobalValue__SWIG_0, & + swigf_TpetraMultiVector_sumIntoGlobalValue__SWIG_1 + generic :: doImport => swigf_TpetraMultiVector_doImport__SWIG_0, swigf_TpetraMultiVector_doImport__SWIG_1 end type TpetraMultiVector ! class Tpetra::Operator< SC,LO,GO,NO > type, public :: TpetraOperator @@ -330,17 +324,17 @@ module fortpetra procedure :: getExporter => swigf_TpetraCrsGraph_getExporter procedure :: getGlobalNumRows => swigf_TpetraCrsGraph_getGlobalNumRows procedure :: getGlobalNumCols => swigf_TpetraCrsGraph_getGlobalNumCols - procedure :: getNodeNumRows => swigf_TpetraCrsGraph_getNodeNumRows - procedure :: getNodeNumCols => swigf_TpetraCrsGraph_getNodeNumCols + procedure :: getLocalNumRows => swigf_TpetraCrsGraph_getLocalNumRows + procedure :: getLocalNumCols => swigf_TpetraCrsGraph_getLocalNumCols procedure :: getGlobalNumEntries => swigf_TpetraCrsGraph_getGlobalNumEntries - procedure :: getNodeNumEntries => swigf_TpetraCrsGraph_getNodeNumEntries + procedure :: getLocalNumEntries => swigf_TpetraCrsGraph_getLocalNumEntries procedure :: getNumEntriesInGlobalRow => swigf_TpetraCrsGraph_getNumEntriesInGlobalRow procedure :: getNumEntriesInLocalRow => swigf_TpetraCrsGraph_getNumEntriesInLocalRow - procedure :: getNodeAllocationSize => swigf_TpetraCrsGraph_getNodeAllocationSize + procedure :: getLocalAllocationSize => swigf_TpetraCrsGraph_getLocalAllocationSize procedure :: getNumAllocatedEntriesInGlobalRow => swigf_TpetraCrsGraph_getNumAllocatedEntriesInGlobalRow procedure :: getNumAllocatedEntriesInLocalRow => swigf_TpetraCrsGraph_getNumAllocatedEntriesInLocalRow procedure :: getGlobalMaxNumRowEntries => swigf_TpetraCrsGraph_getGlobalMaxNumRowEntries - procedure :: getNodeMaxNumRowEntries => swigf_TpetraCrsGraph_getNodeMaxNumRowEntries + procedure :: getLocalMaxNumRowEntries => swigf_TpetraCrsGraph_getLocalMaxNumRowEntries procedure :: hasColMap => swigf_TpetraCrsGraph_hasColMap procedure :: isLocallyIndexed => swigf_TpetraCrsGraph_isLocallyIndexed procedure :: isGloballyIndexed => swigf_TpetraCrsGraph_isGloballyIndexed @@ -348,7 +342,6 @@ module fortpetra procedure :: isFillActive => swigf_TpetraCrsGraph_isFillActive procedure :: isSorted => swigf_TpetraCrsGraph_isSorted procedure :: isStorageOptimized => swigf_TpetraCrsGraph_isStorageOptimized - procedure :: getProfileType => swigf_TpetraCrsGraph_getProfileType procedure :: supportsRowViews => swigf_TpetraCrsGraph_supportsRowViews procedure :: description => swigf_TpetraCrsGraph_description procedure :: packFillActive => swigf_TpetraCrsGraph_packFillActive @@ -372,8 +365,7 @@ module fortpetra procedure :: haveGlobalConstants => swigf_TpetraCrsGraph_haveGlobalConstants procedure :: computeGlobalConstants => swigf_TpetraCrsGraph_computeGlobalConstants procedure :: haveLocalOffRankOffsets => swigf_TpetraCrsGraph_haveLocalOffRankOffsets - procedure :: getNodeRowPtrs => swigf_TpetraCrsGraph_getNodeRowPtrs - procedure :: getNodePackedIndices => swigf_TpetraCrsGraph_getNodePackedIndices + procedure :: getLocalPackedIndices => swigf_TpetraCrsGraph_getLocalPackedIndices procedure, private :: swigf_TpetraCrsGraph_getLocalRowCopy__SWIG_1 procedure, private :: swigf_TpetraCrsGraph_getGlobalRowCopy__SWIG_1 procedure, private :: swigf_TpetraCrsGraph_doImport__SWIG_0 @@ -381,25 +373,25 @@ module fortpetra procedure, private :: swigf_TpetraCrsGraph_doExport__SWIG_0 procedure, private :: swigf_TpetraCrsGraph_doExport__SWIG_1 procedure, private :: swigf_TpetraCrsGraph_op_assign__ - generic :: getLocalRowCopy => swigf_TpetraCrsGraph_getLocalRowCopy__SWIG_1 - generic :: getGlobalRowCopy => swigf_TpetraCrsGraph_getGlobalRowCopy__SWIG_1 - generic :: assignment(=) => swigf_TpetraCrsGraph_op_assign__ + generic :: expertStaticFillComplete => swigf_TpetraCrsGraph_expertStaticFillComplete__SWIG_0, & + swigf_TpetraCrsGraph_expertStaticFillComplete__SWIG_1, swigf_TpetraCrsGraph_expertStaticFillComplete__SWIG_2, & + swigf_TpetraCrsGraph_expertStaticFillComplete__SWIG_3 + generic :: resumeFill => swigf_TpetraCrsGraph_resumeFill__SWIG_0, swigf_TpetraCrsGraph_resumeFill__SWIG_1 generic :: reindexColumns => swigf_TpetraCrsGraph_reindexColumns__SWIG_0, swigf_TpetraCrsGraph_reindexColumns__SWIG_1, & swigf_TpetraCrsGraph_reindexColumns__SWIG_2 - generic :: doImport => swigf_TpetraCrsGraph_doImport__SWIG_0, swigf_TpetraCrsGraph_doImport__SWIG_1 + generic :: exportAndFillComplete => swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_0, & + swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_1, swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_2, & + swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_3, swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_4 generic :: insertGlobalIndices => swigf_TpetraCrsGraph_insertGlobalIndices__SWIG_0 - generic :: resumeFill => swigf_TpetraCrsGraph_resumeFill__SWIG_0, swigf_TpetraCrsGraph_resumeFill__SWIG_1 generic :: doExport => swigf_TpetraCrsGraph_doExport__SWIG_0, swigf_TpetraCrsGraph_doExport__SWIG_1 generic :: fillComplete => swigf_TpetraCrsGraph_fillComplete__SWIG_0, swigf_TpetraCrsGraph_fillComplete__SWIG_1, & swigf_TpetraCrsGraph_fillComplete__SWIG_2, swigf_TpetraCrsGraph_fillComplete__SWIG_3 - generic :: expertStaticFillComplete => swigf_TpetraCrsGraph_expertStaticFillComplete__SWIG_0, & - swigf_TpetraCrsGraph_expertStaticFillComplete__SWIG_1, swigf_TpetraCrsGraph_expertStaticFillComplete__SWIG_2, & - swigf_TpetraCrsGraph_expertStaticFillComplete__SWIG_3 + generic :: getGlobalRowCopy => swigf_TpetraCrsGraph_getGlobalRowCopy__SWIG_1 + generic :: assignment(=) => swigf_TpetraCrsGraph_op_assign__ generic :: importAndFillComplete => swigf_TpetraCrsGraph_importAndFillComplete__SWIG_0, & swigf_TpetraCrsGraph_importAndFillComplete__SWIG_1, swigf_TpetraCrsGraph_importAndFillComplete__SWIG_2 - generic :: exportAndFillComplete => swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_0, & - swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_1, swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_2, & - swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_3, swigf_TpetraCrsGraph_exportAndFillComplete__SWIG_4 + generic :: getLocalRowCopy => swigf_TpetraCrsGraph_getLocalRowCopy__SWIG_1 + generic :: doImport => swigf_TpetraCrsGraph_doImport__SWIG_0, swigf_TpetraCrsGraph_doImport__SWIG_1 end type TpetraCrsGraph ! class Tpetra::CrsMatrix< SC,LO,GO,NO > type, public :: TpetraCrsMatrix @@ -407,7 +399,8 @@ module fortpetra contains procedure :: release => swigf_TpetraCrsMatrix_release procedure :: insertGlobalValues => swigf_TpetraCrsMatrix_insertGlobalValues - procedure :: insertLocalValues => swigf_TpetraCrsMatrix_insertLocalValues + procedure, private :: swigf_TpetraCrsMatrix_insertLocalValues__SWIG_0 + procedure, private :: swigf_TpetraCrsMatrix_insertLocalValues__SWIG_1 procedure, private :: swigf_TpetraCrsMatrix_replaceGlobalValues__SWIG_1 procedure, private :: swigf_TpetraCrsMatrix_replaceLocalValues__SWIG_1 procedure, private :: swigf_TpetraCrsMatrix_sumIntoGlobalValues__SWIG_0 @@ -438,21 +431,20 @@ module fortpetra procedure :: getCrsGraph => swigf_TpetraCrsMatrix_getCrsGraph procedure :: getGlobalNumRows => swigf_TpetraCrsMatrix_getGlobalNumRows procedure :: getGlobalNumCols => swigf_TpetraCrsMatrix_getGlobalNumCols - procedure :: getNodeNumRows => swigf_TpetraCrsMatrix_getNodeNumRows - procedure :: getNodeNumCols => swigf_TpetraCrsMatrix_getNodeNumCols + procedure :: getLocalNumRows => swigf_TpetraCrsMatrix_getLocalNumRows + procedure :: getLocalNumCols => swigf_TpetraCrsMatrix_getLocalNumCols procedure :: getGlobalNumEntries => swigf_TpetraCrsMatrix_getGlobalNumEntries - procedure :: getNodeNumEntries => swigf_TpetraCrsMatrix_getNodeNumEntries + procedure :: getLocalNumEntries => swigf_TpetraCrsMatrix_getLocalNumEntries procedure :: getNumEntriesInGlobalRow => swigf_TpetraCrsMatrix_getNumEntriesInGlobalRow procedure :: getNumEntriesInLocalRow => swigf_TpetraCrsMatrix_getNumEntriesInLocalRow procedure :: getGlobalMaxNumRowEntries => swigf_TpetraCrsMatrix_getGlobalMaxNumRowEntries - procedure :: getNodeMaxNumRowEntries => swigf_TpetraCrsMatrix_getNodeMaxNumRowEntries + procedure :: getLocalMaxNumRowEntries => swigf_TpetraCrsMatrix_getLocalMaxNumRowEntries procedure :: hasColMap => swigf_TpetraCrsMatrix_hasColMap procedure :: isLocallyIndexed => swigf_TpetraCrsMatrix_isLocallyIndexed procedure :: isGloballyIndexed => swigf_TpetraCrsMatrix_isGloballyIndexed procedure :: isFillComplete => swigf_TpetraCrsMatrix_isFillComplete procedure :: isFillActive => swigf_TpetraCrsMatrix_isFillActive procedure :: isStorageOptimized => swigf_TpetraCrsMatrix_isStorageOptimized - procedure :: getProfileType => swigf_TpetraCrsMatrix_getProfileType procedure :: isStaticGraph => swigf_TpetraCrsMatrix_isStaticGraph procedure :: getFrobeniusNorm => swigf_TpetraCrsMatrix_getFrobeniusNorm procedure :: supportsRowViews => swigf_TpetraCrsMatrix_supportsRowViews @@ -476,36 +468,36 @@ module fortpetra procedure, private :: swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_2 procedure, private :: swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_3 procedure, private :: swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_4 - procedure :: computeGlobalConstants => swigf_TpetraCrsMatrix_computeGlobalConstants procedure :: haveGlobalConstants => swigf_TpetraCrsMatrix_haveGlobalConstants - procedure, private :: swigf_TpetraCrsMatrix_getAllValues__SWIG_1 + procedure :: getAllValues => swigf_TpetraCrsMatrix_getAllValues procedure, private :: swigf_TpetraCrsMatrix_getGlobalRowCopy__SWIG_1 procedure, private :: swigf_TpetraCrsMatrix_getLocalRowCopy__SWIG_1 procedure, private :: swigf_TpetraCrsMatrix_op_assign__ - generic :: resumeFill => swigf_TpetraCrsMatrix_resumeFill__SWIG_0, swigf_TpetraCrsMatrix_resumeFill__SWIG_1 + generic :: setAllValues => swigf_TpetraCrsMatrix_setAllValues__SWIG_1 + generic :: replaceLocalValues => swigf_TpetraCrsMatrix_replaceLocalValues__SWIG_1 + generic :: localApply => swigf_TpetraCrsMatrix_localApply__SWIG_0, swigf_TpetraCrsMatrix_localApply__SWIG_1, & + swigf_TpetraCrsMatrix_localApply__SWIG_2, swigf_TpetraCrsMatrix_localApply__SWIG_3 generic :: getGlobalRowCopy => swigf_TpetraCrsMatrix_getGlobalRowCopy__SWIG_1 + generic :: sumIntoLocalValues => swigf_TpetraCrsMatrix_sumIntoLocalValues__SWIG_2 + generic :: resumeFill => swigf_TpetraCrsMatrix_resumeFill__SWIG_0, swigf_TpetraCrsMatrix_resumeFill__SWIG_1 generic :: getLocalRowCopy => swigf_TpetraCrsMatrix_getLocalRowCopy__SWIG_1 + generic :: sumIntoGlobalValues => swigf_TpetraCrsMatrix_sumIntoGlobalValues__SWIG_0 + generic :: apply => swigf_TpetraCrsMatrix_apply__SWIG_0, swigf_TpetraCrsMatrix_apply__SWIG_1, & + swigf_TpetraCrsMatrix_apply__SWIG_2, swigf_TpetraCrsMatrix_apply__SWIG_3 + generic :: insertLocalValues => swigf_TpetraCrsMatrix_insertLocalValues__SWIG_0, & + swigf_TpetraCrsMatrix_insertLocalValues__SWIG_1 + generic :: assignment(=) => swigf_TpetraCrsMatrix_op_assign__ generic :: exportAndFillComplete => swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_0, & swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_1, swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_2, & swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_3, swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_4 - generic :: importAndFillComplete => swigf_TpetraCrsMatrix_importAndFillComplete__SWIG_0, & - swigf_TpetraCrsMatrix_importAndFillComplete__SWIG_1, swigf_TpetraCrsMatrix_importAndFillComplete__SWIG_2 + generic :: replaceGlobalValues => swigf_TpetraCrsMatrix_replaceGlobalValues__SWIG_1 generic :: expertStaticFillComplete => swigf_TpetraCrsMatrix_expertStaticFillComplete__SWIG_0, & swigf_TpetraCrsMatrix_expertStaticFillComplete__SWIG_1, swigf_TpetraCrsMatrix_expertStaticFillComplete__SWIG_2, & swigf_TpetraCrsMatrix_expertStaticFillComplete__SWIG_3 generic :: fillComplete => swigf_TpetraCrsMatrix_fillComplete__SWIG_0, swigf_TpetraCrsMatrix_fillComplete__SWIG_1, & swigf_TpetraCrsMatrix_fillComplete__SWIG_2, swigf_TpetraCrsMatrix_fillComplete__SWIG_3 - generic :: assignment(=) => swigf_TpetraCrsMatrix_op_assign__ - generic :: apply => swigf_TpetraCrsMatrix_apply__SWIG_0, swigf_TpetraCrsMatrix_apply__SWIG_1, & - swigf_TpetraCrsMatrix_apply__SWIG_2, swigf_TpetraCrsMatrix_apply__SWIG_3 - generic :: getAllValues => swigf_TpetraCrsMatrix_getAllValues__SWIG_1 - generic :: setAllValues => swigf_TpetraCrsMatrix_setAllValues__SWIG_1 - generic :: sumIntoLocalValues => swigf_TpetraCrsMatrix_sumIntoLocalValues__SWIG_2 - generic :: sumIntoGlobalValues => swigf_TpetraCrsMatrix_sumIntoGlobalValues__SWIG_0 - generic :: replaceLocalValues => swigf_TpetraCrsMatrix_replaceLocalValues__SWIG_1 - generic :: replaceGlobalValues => swigf_TpetraCrsMatrix_replaceGlobalValues__SWIG_1 - generic :: localApply => swigf_TpetraCrsMatrix_localApply__SWIG_0, swigf_TpetraCrsMatrix_localApply__SWIG_1, & - swigf_TpetraCrsMatrix_localApply__SWIG_2, swigf_TpetraCrsMatrix_localApply__SWIG_3 + generic :: importAndFillComplete => swigf_TpetraCrsMatrix_importAndFillComplete__SWIG_0, & + swigf_TpetraCrsMatrix_importAndFillComplete__SWIG_1, swigf_TpetraCrsMatrix_importAndFillComplete__SWIG_2 end type TpetraCrsMatrix public :: operator_to_matrix public :: matrix_to_operator @@ -527,13 +519,13 @@ module fortpetra procedure, nopass :: readMapFile => swigf_TpetraReader_readMapFile procedure :: release => swigf_TpetraReader_release procedure, private :: swigf_TpetraReader_op_assign__ + generic :: readSparseFile => swigf_TpetraReader_readSparseFile__SWIG_0, swigf_TpetraReader_readSparseFile__SWIG_1, & + swigf_TpetraReader_readSparseFile__SWIG_2, swigf_TpetraReader_readSparseFile__SWIG_3, & + swigf_TpetraReader_readSparseFile__SWIG_4 generic :: assignment(=) => swigf_TpetraReader_op_assign__ generic :: readSparseGraphFile => swigf_TpetraReader_readSparseGraphFile__SWIG_0, & swigf_TpetraReader_readSparseGraphFile__SWIG_1, swigf_TpetraReader_readSparseGraphFile__SWIG_2, & swigf_TpetraReader_readSparseGraphFile__SWIG_3, swigf_TpetraReader_readSparseGraphFile__SWIG_4 - generic :: readSparseFile => swigf_TpetraReader_readSparseFile__SWIG_0, swigf_TpetraReader_readSparseFile__SWIG_1, & - swigf_TpetraReader_readSparseFile__SWIG_2, swigf_TpetraReader_readSparseFile__SWIG_3, & - swigf_TpetraReader_readSparseFile__SWIG_4 end type TpetraReader ! class Tpetra::MatrixMarket::Writer< Tpetra::CrsMatrix< SC,LO,GO,NO > > type, public :: TpetraWriter @@ -547,29 +539,23 @@ module fortpetra procedure, private, nopass :: swigf_TpetraWriter_writeDenseFile__SWIG_1 procedure :: release => swigf_TpetraWriter_release procedure, private :: swigf_TpetraWriter_op_assign__ + generic :: writeSparseFile => swigf_TpetraWriter_writeSparseFile__SWIG_0, swigf_TpetraWriter_writeSparseFile__SWIG_1 generic :: assignment(=) => swigf_TpetraWriter_op_assign__ + generic :: writeDenseFile => swigf_TpetraWriter_writeDenseFile__SWIG_0, swigf_TpetraWriter_writeDenseFile__SWIG_1 generic :: writeSparseGraphFile => swigf_TpetraWriter_writeSparseGraphFile__SWIG_0, & swigf_TpetraWriter_writeSparseGraphFile__SWIG_1 - generic :: writeSparseFile => swigf_TpetraWriter_writeSparseFile__SWIG_0, swigf_TpetraWriter_writeSparseFile__SWIG_1 - generic :: writeDenseFile => swigf_TpetraWriter_writeDenseFile__SWIG_0, swigf_TpetraWriter_writeDenseFile__SWIG_1 end type TpetraWriter interface TpetraCrsGraph - module procedure swigf_new_TpetraCrsGraph__SWIG_0, swigf_new_TpetraCrsGraph__SWIG_1, swigf_new_TpetraCrsGraph__SWIG_2, & - swigf_new_TpetraCrsGraph__SWIG_6, swigf_new_TpetraCrsGraph__SWIG_7, swigf_new_TpetraCrsGraph__SWIG_8, & - swigf_new_TpetraCrsGraph__SWIG_9, swigf_new_TpetraCrsGraph__SWIG_10, swigf_new_TpetraCrsGraph__SWIG_11, & - swigf_new_TpetraCrsGraph__SWIG_15, swigf_new_TpetraCrsGraph__SWIG_16, swigf_new_TpetraCrsGraph__SWIG_17, & - swigf_new_TpetraCrsGraph__SWIG_18, swigf_new_TpetraCrsGraph__SWIG_19, swigf_new_TpetraCrsGraph__SWIG_22, & - swigf_new_TpetraCrsGraph__SWIG_23, swigf_new_TpetraCrsGraph__SWIG_31 - end interface - interface TpetraMap - module procedure swigf_new_TpetraMap__SWIG_0, swigf_new_TpetraMap__SWIG_1, swigf_new_TpetraMap__SWIG_2, & - swigf_new_TpetraMap__SWIG_5, swigf_new_TpetraMap__SWIG_6, swigf_new_TpetraMap__SWIG_7 + module procedure swigf_new_TpetraCrsGraph__SWIG_0, swigf_new_TpetraCrsGraph__SWIG_1, swigf_new_TpetraCrsGraph__SWIG_4, & + swigf_new_TpetraCrsGraph__SWIG_5, swigf_new_TpetraCrsGraph__SWIG_6, swigf_new_TpetraCrsGraph__SWIG_7, & + swigf_new_TpetraCrsGraph__SWIG_10, swigf_new_TpetraCrsGraph__SWIG_11, swigf_new_TpetraCrsGraph__SWIG_12, & + swigf_new_TpetraCrsGraph__SWIG_13, swigf_new_TpetraCrsGraph__SWIG_16, swigf_new_TpetraCrsGraph__SWIG_17, & + swigf_new_TpetraCrsGraph__SWIG_25 end interface - interface TpetraMultiVector - module procedure swigf_new_TpetraMultiVector__SWIG_0, swigf_new_TpetraMultiVector__SWIG_1, & - swigf_new_TpetraMultiVector__SWIG_2, swigf_new_TpetraMultiVector__SWIG_3, swigf_new_TpetraMultiVector__SWIG_4, & - swigf_new_TpetraMultiVector__SWIG_5, swigf_new_TpetraMultiVector__SWIG_6, swigf_new_TpetraMultiVector__SWIG_7 + interface TpetraMatrixMatrixAdd + module procedure swigf_TpetraMatrixMatrixAdd__SWIG_0, swigf_TpetraMatrixMatrixAdd__SWIG_1 end interface + public :: TpetraMatrixMatrixAdd interface TpetraImport module procedure swigf_new_TpetraImport__SWIG_0, swigf_new_TpetraImport__SWIG_1, swigf_new_TpetraImport__SWIG_2, & swigf_new_TpetraImport__SWIG_3 @@ -577,39 +563,43 @@ module fortpetra interface ForTpetraOperator module procedure swigf_new_ForTpetraOperator end interface - interface RowInfo - module procedure swigf_new_RowInfo - end interface - interface TpetraMatrixMatrixAdd - module procedure swigf_TpetraMatrixMatrixAdd__SWIG_0, swigf_TpetraMatrixMatrixAdd__SWIG_1 + interface TpetraMap + module procedure swigf_new_TpetraMap__SWIG_0, swigf_new_TpetraMap__SWIG_1, swigf_new_TpetraMap__SWIG_2, & + swigf_new_TpetraMap__SWIG_5, swigf_new_TpetraMap__SWIG_6, swigf_new_TpetraMap__SWIG_7 end interface - public :: TpetraMatrixMatrixAdd interface TpetraExport module procedure swigf_new_TpetraExport__SWIG_0, swigf_new_TpetraExport__SWIG_1, swigf_new_TpetraExport__SWIG_2, & swigf_new_TpetraExport__SWIG_3 end interface + interface TpetraMatrixMatrixMultiply + module procedure swigf_TpetraMatrixMatrixMultiply__SWIG_0, swigf_TpetraMatrixMatrixMultiply__SWIG_1, & + swigf_TpetraMatrixMatrixMultiply__SWIG_2, swigf_TpetraMatrixMatrixMultiply__SWIG_3 + end interface + public :: TpetraMatrixMatrixMultiply interface TpetraCrsMatrix module procedure swigf_new_TpetraCrsMatrix__SWIG_0, swigf_new_TpetraCrsMatrix__SWIG_2, swigf_new_TpetraCrsMatrix__SWIG_3, & swigf_new_TpetraCrsMatrix__SWIG_4, swigf_new_TpetraCrsMatrix__SWIG_5, swigf_new_TpetraCrsMatrix__SWIG_6, & swigf_new_TpetraCrsMatrix__SWIG_7, swigf_new_TpetraCrsMatrix__SWIG_8, swigf_new_TpetraCrsMatrix__SWIG_9, & swigf_new_TpetraCrsMatrix__SWIG_10, swigf_new_TpetraCrsMatrix__SWIG_11, swigf_new_TpetraCrsMatrix__SWIG_12, & - swigf_new_TpetraCrsMatrix__SWIG_13, swigf_new_TpetraCrsMatrix__SWIG_14, swigf_new_TpetraCrsMatrix__SWIG_15, & - swigf_new_TpetraCrsMatrix__SWIG_16, swigf_new_TpetraCrsMatrix__SWIG_17, swigf_new_TpetraCrsMatrix__SWIG_22, & - swigf_new_TpetraCrsMatrix__SWIG_23, swigf_new_TpetraCrsMatrix__SWIG_32 + swigf_new_TpetraCrsMatrix__SWIG_13, swigf_new_TpetraCrsMatrix__SWIG_18, swigf_new_TpetraCrsMatrix__SWIG_19, & + swigf_new_TpetraCrsMatrix__SWIG_28 end interface - interface TpetraMatrixMatrixMultiply - module procedure swigf_TpetraMatrixMatrixMultiply__SWIG_0, swigf_TpetraMatrixMatrixMultiply__SWIG_1, & - swigf_TpetraMatrixMatrixMultiply__SWIG_2, swigf_TpetraMatrixMatrixMultiply__SWIG_3 + interface TpetraMultiVector + module procedure swigf_new_TpetraMultiVector__SWIG_0, swigf_new_TpetraMultiVector__SWIG_1, & + swigf_new_TpetraMultiVector__SWIG_2, swigf_new_TpetraMultiVector__SWIG_3, swigf_new_TpetraMultiVector__SWIG_4, & + swigf_new_TpetraMultiVector__SWIG_5, swigf_new_TpetraMultiVector__SWIG_6, swigf_new_TpetraMultiVector__SWIG_7 + end interface + interface RowInfo + module procedure swigf_new_RowInfo end interface - public :: TpetraMatrixMatrixMultiply ! WRAPPER DECLARATIONS interface subroutine swigc_setCombineModeParameter(farg1, farg2) & bind(C, name="_wrap_setCombineModeParameter") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -664,8 +654,8 @@ function swigc_new_TpetraMap__SWIG_5(farg1, farg2, farg4) & bind(C, name="_wrap_new_TpetraMap__SWIG_5") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper integer(C_SIZE_T), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper), intent(in) :: farg4 @@ -714,8 +704,8 @@ function swigc_TpetraMap_getGlobalNumElements(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraMap_getNodeNumElements(farg1) & -bind(C, name="_wrap_TpetraMap_getNodeNumElements") & +function swigc_TpetraMap_getLocalNumElements(farg1) & +bind(C, name="_wrap_TpetraMap_getLocalNumElements") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -801,8 +791,8 @@ function swigc_TpetraMap_getRemoteIndexList__SWIG_0(farg1, farg2, farg3, farg4) bind(C, name="_wrap_TpetraMap_getRemoteIndexList__SWIG_0") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -814,16 +804,16 @@ function swigc_TpetraMap_getRemoteIndexList__SWIG_1(farg1, farg2, farg3) & bind(C, name="_wrap_TpetraMap_getRemoteIndexList__SWIG_1") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 integer(C_INT) :: fresult end function -function swigc_TpetraMap_getNodeElementList(farg1) & -bind(C, name="_wrap_TpetraMap_getNodeElementList") & +function swigc_TpetraMap_getLocalElementList(farg1) & +bind(C, name="_wrap_TpetraMap_getLocalElementList") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigarraywrapper @@ -1253,8 +1243,8 @@ function swigc_new_TpetraMultiVector__SWIG_4(farg1, farg2, farg3, farg4) & bind(C, name="_wrap_new_TpetraMultiVector__SWIG_4") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_SIZE_T), intent(in) :: farg3 @@ -1412,8 +1402,8 @@ function swigc_TpetraMultiVector_subCopy(farg1, farg2) & bind(C, name="_wrap_TpetraMultiVector_subCopy") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper) :: fresult @@ -1423,8 +1413,8 @@ function swigc_TpetraMultiVector_subView(farg1, farg2) & bind(C, name="_wrap_TpetraMultiVector_subView") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper) :: fresult @@ -1434,8 +1424,8 @@ function swigc_TpetraMultiVector_subViewNonConst(farg1, farg2) & bind(C, name="_wrap_TpetraMultiVector_subViewNonConst") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper) :: fresult @@ -1488,8 +1478,8 @@ function swigc_TpetraMultiVector_getDataNonConst(farg1, farg2) & subroutine swigc_TpetraMultiVector_get1dCopy(farg1, farg2, farg3) & bind(C, name="_wrap_TpetraMultiVector_get1dCopy") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 integer(C_SIZE_T), intent(in) :: farg3 @@ -1518,8 +1508,8 @@ function swigc_TpetraMultiVector_get1dViewNonConst(farg1) & subroutine swigc_TpetraMultiVector_dot__SWIG_0(farg1, farg2, farg3) & bind(C, name="_wrap_TpetraMultiVector_dot__SWIG_0") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -1552,8 +1542,8 @@ subroutine swigc_TpetraMultiVector_scale__SWIG_0(farg1, farg2) & subroutine swigc_TpetraMultiVector_scale__SWIG_1(farg1, farg2) & bind(C, name="_wrap_TpetraMultiVector_scale__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -1592,8 +1582,8 @@ subroutine swigc_TpetraMultiVector_update__SWIG_1(farg1, farg2, farg3, farg4, fa subroutine swigc_TpetraMultiVector_norm1__SWIG_1(farg1, farg2) & bind(C, name="_wrap_TpetraMultiVector_norm1__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -1601,8 +1591,8 @@ subroutine swigc_TpetraMultiVector_norm1__SWIG_1(farg1, farg2) & subroutine swigc_TpetraMultiVector_norm2__SWIG_1(farg1, farg2) & bind(C, name="_wrap_TpetraMultiVector_norm2__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -1610,8 +1600,8 @@ subroutine swigc_TpetraMultiVector_norm2__SWIG_1(farg1, farg2) & subroutine swigc_TpetraMultiVector_normInf__SWIG_1(farg1, farg2) & bind(C, name="_wrap_TpetraMultiVector_normInf__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -1619,8 +1609,8 @@ subroutine swigc_TpetraMultiVector_normInf__SWIG_1(farg1, farg2) & subroutine swigc_TpetraMultiVector_meanValue(farg1, farg2) & bind(C, name="_wrap_TpetraMultiVector_meanValue") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -1962,102 +1952,64 @@ subroutine swigc_RowInfo_op_assign__(farg1, farg2) & type(SwigClassWrapper), intent(in) :: farg2 end subroutine -function swigc_new_TpetraCrsGraph__SWIG_0(farg1, farg2, farg3, farg4) & +function swigc_new_TpetraCrsGraph__SWIG_0(farg1, farg2, farg3) & bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_0") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_SIZE_T), intent(in) :: farg2 -integer(C_INT), intent(in) :: farg3 -type(SwigClassWrapper), intent(in) :: farg4 +type(SwigClassWrapper), intent(in) :: farg3 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_1(farg1, farg2, farg3) & +function swigc_new_TpetraCrsGraph__SWIG_1(farg1, farg2) & bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_1") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_SIZE_T), intent(in) :: farg2 -integer(C_INT), intent(in) :: farg3 -type(SwigClassWrapper) :: fresult -end function - -function swigc_new_TpetraCrsGraph__SWIG_2(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_2") & -result(fresult) -use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper -type(SwigClassWrapper), intent(in) :: farg1 -integer(C_SIZE_T), intent(in) :: farg2 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_6(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_6") & +function swigc_new_TpetraCrsGraph__SWIG_4(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_4") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper -type(SwigClassWrapper), intent(in) :: farg1 -type(SwigArrayWrapper) :: farg2 -integer(C_INT), intent(in) :: farg3 -type(SwigClassWrapper), intent(in) :: farg4 -type(SwigClassWrapper) :: fresult -end function - -function swigc_new_TpetraCrsGraph__SWIG_7(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_7") & -result(fresult) -use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper -import :: swigarraywrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 -integer(C_INT), intent(in) :: farg3 +type(SwigClassWrapper), intent(in) :: farg3 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_8(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_8") & +function swigc_new_TpetraCrsGraph__SWIG_5(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_5") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper -type(SwigClassWrapper), intent(in) :: farg1 -type(SwigArrayWrapper) :: farg2 -type(SwigClassWrapper) :: fresult -end function - -function swigc_new_TpetraCrsGraph__SWIG_9(farg1, farg2, farg3, farg4, farg5) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_9") & -result(fresult) -use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 -type(SwigClassWrapper), intent(in) :: farg2 -integer(C_SIZE_T), intent(in) :: farg3 -integer(C_INT), intent(in) :: farg4 -type(SwigClassWrapper), intent(in) :: farg5 +type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_10(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_10") & +function swigc_new_TpetraCrsGraph__SWIG_6(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_6") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 integer(C_SIZE_T), intent(in) :: farg3 -integer(C_INT), intent(in) :: farg4 +type(SwigClassWrapper), intent(in) :: farg4 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_11(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_11") & +function swigc_new_TpetraCrsGraph__SWIG_7(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_7") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2067,47 +2019,33 @@ function swigc_new_TpetraCrsGraph__SWIG_11(farg1, farg2, farg3) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_15(farg1, farg2, farg3, farg4, farg5) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_15") & +function swigc_new_TpetraCrsGraph__SWIG_10(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_10") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper -type(SwigClassWrapper), intent(in) :: farg1 -type(SwigClassWrapper), intent(in) :: farg2 -type(SwigArrayWrapper) :: farg3 -integer(C_INT), intent(in) :: farg4 -type(SwigClassWrapper), intent(in) :: farg5 -type(SwigClassWrapper) :: fresult -end function - -function swigc_new_TpetraCrsGraph__SWIG_16(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_16") & -result(fresult) -use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper -import :: swigarraywrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 -integer(C_INT), intent(in) :: farg4 +type(SwigClassWrapper), intent(in) :: farg4 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_17(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_17") & +function swigc_new_TpetraCrsGraph__SWIG_11(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_11") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_18(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_18") & +function swigc_new_TpetraCrsGraph__SWIG_12(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_12") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2117,8 +2055,8 @@ function swigc_new_TpetraCrsGraph__SWIG_18(farg1, farg2, farg3) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_19(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_19") & +function swigc_new_TpetraCrsGraph__SWIG_13(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_13") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2127,12 +2065,12 @@ function swigc_new_TpetraCrsGraph__SWIG_19(farg1, farg2) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_22(farg1, farg2, farg3, farg4, farg5) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_22") & +function swigc_new_TpetraCrsGraph__SWIG_16(farg1, farg2, farg3, farg4, farg5) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_16") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -2141,12 +2079,12 @@ function swigc_new_TpetraCrsGraph__SWIG_22(farg1, farg2, farg3, farg4, farg5) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_23(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_23") & +function swigc_new_TpetraCrsGraph__SWIG_17(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_17") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -2154,8 +2092,8 @@ function swigc_new_TpetraCrsGraph__SWIG_23(farg1, farg2, farg3, farg4) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsGraph__SWIG_31(farg1) & -bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_31") & +function swigc_new_TpetraCrsGraph__SWIG_25(farg1) & +bind(C, name="_wrap_new_TpetraCrsGraph__SWIG_25") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2200,8 +2138,8 @@ function swigc_TpetraCrsGraph_getValidParameters(farg1) & subroutine swigc_TpetraCrsGraph_insertGlobalIndices__SWIG_0(farg1, farg2, farg3) & bind(C, name="_wrap_TpetraCrsGraph_insertGlobalIndices__SWIG_0") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_LONG_LONG), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -2210,8 +2148,8 @@ subroutine swigc_TpetraCrsGraph_insertGlobalIndices__SWIG_0(farg1, farg2, farg3) subroutine swigc_TpetraCrsGraph_insertLocalIndices(farg1, farg2, farg3) & bind(C, name="_wrap_TpetraCrsGraph_insertLocalIndices") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_INT), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -2404,8 +2342,8 @@ function swigc_TpetraCrsGraph_getGlobalNumCols(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraCrsGraph_getNodeNumRows(farg1) & -bind(C, name="_wrap_TpetraCrsGraph_getNodeNumRows") & +function swigc_TpetraCrsGraph_getLocalNumRows(farg1) & +bind(C, name="_wrap_TpetraCrsGraph_getLocalNumRows") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2413,8 +2351,8 @@ function swigc_TpetraCrsGraph_getNodeNumRows(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraCrsGraph_getNodeNumCols(farg1) & -bind(C, name="_wrap_TpetraCrsGraph_getNodeNumCols") & +function swigc_TpetraCrsGraph_getLocalNumCols(farg1) & +bind(C, name="_wrap_TpetraCrsGraph_getLocalNumCols") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2431,8 +2369,8 @@ function swigc_TpetraCrsGraph_getGlobalNumEntries(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraCrsGraph_getNodeNumEntries(farg1) & -bind(C, name="_wrap_TpetraCrsGraph_getNodeNumEntries") & +function swigc_TpetraCrsGraph_getLocalNumEntries(farg1) & +bind(C, name="_wrap_TpetraCrsGraph_getLocalNumEntries") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2460,8 +2398,8 @@ function swigc_TpetraCrsGraph_getNumEntriesInLocalRow(farg1, farg2) & integer(C_INT) :: fresult end function -function swigc_TpetraCrsGraph_getNodeAllocationSize(farg1) & -bind(C, name="_wrap_TpetraCrsGraph_getNodeAllocationSize") & +function swigc_TpetraCrsGraph_getLocalAllocationSize(farg1) & +bind(C, name="_wrap_TpetraCrsGraph_getLocalAllocationSize") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2498,8 +2436,8 @@ function swigc_TpetraCrsGraph_getGlobalMaxNumRowEntries(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraCrsGraph_getNodeMaxNumRowEntries(farg1) & -bind(C, name="_wrap_TpetraCrsGraph_getNodeMaxNumRowEntries") & +function swigc_TpetraCrsGraph_getLocalMaxNumRowEntries(farg1) & +bind(C, name="_wrap_TpetraCrsGraph_getLocalMaxNumRowEntries") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -2570,15 +2508,6 @@ function swigc_TpetraCrsGraph_isStorageOptimized(farg1) & integer(C_INT) :: fresult end function -function swigc_TpetraCrsGraph_getProfileType(farg1) & -bind(C, name="_wrap_TpetraCrsGraph_getProfileType") & -result(fresult) -use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper -type(SwigClassWrapper), intent(in) :: farg1 -integer(C_INT) :: fresult -end function - function swigc_TpetraCrsGraph_supportsRowViews(farg1) & bind(C, name="_wrap_TpetraCrsGraph_supportsRowViews") & result(fresult) @@ -2601,8 +2530,8 @@ function swigc_TpetraCrsGraph_description(farg1) & subroutine swigc_TpetraCrsGraph_packFillActive(farg1, farg2, farg3, farg4, farg5) & bind(C, name="_wrap_TpetraCrsGraph_packFillActive") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -2803,20 +2732,11 @@ function swigc_TpetraCrsGraph_haveLocalOffRankOffsets(farg1) & integer(C_INT) :: fresult end function -subroutine swigc_TpetraCrsGraph_getNodeRowPtrs(farg1, farg2) & -bind(C, name="_wrap_TpetraCrsGraph_getNodeRowPtrs") +subroutine swigc_TpetraCrsGraph_getLocalPackedIndices(farg1, farg2) & +bind(C, name="_wrap_TpetraCrsGraph_getLocalPackedIndices") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper -type(SwigClassWrapper), intent(in) :: farg1 -type(SwigArrayWrapper) :: farg2 -end subroutine - -subroutine swigc_TpetraCrsGraph_getNodePackedIndices(farg1, farg2) & -bind(C, name="_wrap_TpetraCrsGraph_getNodePackedIndices") -use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper -import :: swigarraywrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 end subroutine @@ -2824,8 +2744,8 @@ subroutine swigc_TpetraCrsGraph_getNodePackedIndices(farg1, farg2) & subroutine swigc_TpetraCrsGraph_getLocalRowCopy__SWIG_1(farg1, farg2, farg3, farg4) & bind(C, name="_wrap_TpetraCrsGraph_getLocalRowCopy__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_INT), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -2835,8 +2755,8 @@ subroutine swigc_TpetraCrsGraph_getLocalRowCopy__SWIG_1(farg1, farg2, farg3, far subroutine swigc_TpetraCrsGraph_getGlobalRowCopy__SWIG_1(farg1, farg2, farg3, farg4) & bind(C, name="_wrap_TpetraCrsGraph_getGlobalRowCopy__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_LONG_LONG), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -2900,102 +2820,64 @@ function swigc_new_TpetraCrsMatrix__SWIG_0(farg1) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2, farg3, farg4) & +function swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2, farg3) & bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_2") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_SIZE_T), intent(in) :: farg2 -integer(C_INT), intent(in) :: farg3 -type(SwigClassWrapper), intent(in) :: farg4 +type(SwigClassWrapper), intent(in) :: farg3 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2, farg3) & +function swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2) & bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_3") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_SIZE_T), intent(in) :: farg2 -integer(C_INT), intent(in) :: farg3 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2) & +function swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2, farg3) & bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_4") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper -type(SwigClassWrapper), intent(in) :: farg1 -integer(C_SIZE_T), intent(in) :: farg2 -type(SwigClassWrapper) :: fresult -end function - -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 import :: swigarraywrapper -type(SwigClassWrapper), intent(in) :: farg1 -type(SwigArrayWrapper) :: farg2 -integer(C_INT), intent(in) :: farg3 -type(SwigClassWrapper), intent(in) :: farg4 -type(SwigClassWrapper) :: fresult -end function - -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 -import :: swigarraywrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 -integer(C_INT), intent(in) :: farg3 +type(SwigClassWrapper), intent(in) :: farg3 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_7") & +function swigc_new_TpetraCrsMatrix__SWIG_5(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_5") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper -type(SwigClassWrapper), intent(in) :: farg1 -type(SwigArrayWrapper) :: farg2 -type(SwigClassWrapper) :: fresult -end function - -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 type(SwigClassWrapper), intent(in) :: farg1 -type(SwigClassWrapper), intent(in) :: farg2 -integer(C_SIZE_T), intent(in) :: farg3 -integer(C_INT), intent(in) :: farg4 -type(SwigClassWrapper), intent(in) :: farg5 +type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_9") & +function swigc_new_TpetraCrsMatrix__SWIG_6(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_6") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 integer(C_SIZE_T), intent(in) :: farg3 -integer(C_INT), intent(in) :: farg4 +type(SwigClassWrapper), intent(in) :: farg4 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_10") & +function swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_7") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3005,47 +2887,33 @@ function swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2, farg3, farg4, farg5) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_11") & +function swigc_new_TpetraCrsMatrix__SWIG_8(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_8") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper -type(SwigClassWrapper), intent(in) :: farg1 -type(SwigClassWrapper), intent(in) :: farg2 -type(SwigArrayWrapper) :: farg3 -integer(C_INT), intent(in) :: farg4 -type(SwigClassWrapper), intent(in) :: farg5 -type(SwigClassWrapper) :: fresult -end function - -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 -import :: swigarraywrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 -integer(C_INT), intent(in) :: farg4 +type(SwigClassWrapper), intent(in) :: farg4 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_13(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_13") & +function swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_9") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_14(farg1, farg2, farg3) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_14") & +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 @@ -3055,8 +2923,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_14(farg1, farg2, farg3) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_15(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_15") & +function swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_11") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3065,8 +2933,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_15(farg1, farg2) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_16(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_16") & +function swigc_new_TpetraCrsMatrix__SWIG_12(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_12") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3075,8 +2943,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_16(farg1, farg2) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_17(farg1) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_17") & +function swigc_new_TpetraCrsMatrix__SWIG_13(farg1) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_13") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3084,12 +2952,12 @@ function swigc_new_TpetraCrsMatrix__SWIG_17(farg1) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_22(farg1, farg2, farg3, farg4, farg5, farg6) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_22") & +function swigc_new_TpetraCrsMatrix__SWIG_18(farg1, farg2, farg3, farg4, farg5, farg6) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_18") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3099,12 +2967,12 @@ function swigc_new_TpetraCrsMatrix__SWIG_22(farg1, farg2, farg3, farg4, farg5, f type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_23(farg1, farg2, farg3, farg4, farg5) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_23") & +function swigc_new_TpetraCrsMatrix__SWIG_19(farg1, farg2, farg3, farg4, farg5) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_19") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3113,8 +2981,8 @@ function swigc_new_TpetraCrsMatrix__SWIG_23(farg1, farg2, farg3, farg4, farg5) & type(SwigClassWrapper) :: fresult end function -function swigc_new_TpetraCrsMatrix__SWIG_32(farg1, farg2) & -bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_32") & +function swigc_new_TpetraCrsMatrix__SWIG_28(farg1, farg2) & +bind(C, name="_wrap_new_TpetraCrsMatrix__SWIG_28") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3133,19 +3001,31 @@ subroutine swigc_delete_TpetraCrsMatrix(farg1) & subroutine swigc_TpetraCrsMatrix_insertGlobalValues(farg1, farg2, farg3, farg4) & bind(C, name="_wrap_TpetraCrsMatrix_insertGlobalValues") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_LONG_LONG), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 type(SwigArrayWrapper) :: farg4 end subroutine -subroutine swigc_TpetraCrsMatrix_insertLocalValues(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_TpetraCrsMatrix_insertLocalValues") +subroutine swigc_TpetraCrsMatrix_insertLocalValues__SWIG_0(farg1, farg2, farg3, farg4, farg5) & +bind(C, name="_wrap_TpetraCrsMatrix_insertLocalValues__SWIG_0") use, intrinsic :: ISO_C_BINDING +import :: swigarraywrapper import :: swigclasswrapper +type(SwigClassWrapper), intent(in) :: farg1 +integer(C_INT), intent(in) :: farg2 +type(SwigArrayWrapper) :: farg3 +type(SwigArrayWrapper) :: farg4 +integer(C_INT), intent(in) :: farg5 +end subroutine + +subroutine swigc_TpetraCrsMatrix_insertLocalValues__SWIG_1(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_TpetraCrsMatrix_insertLocalValues__SWIG_1") +use, intrinsic :: ISO_C_BINDING import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_INT), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3156,8 +3036,8 @@ function swigc_TpetraCrsMatrix_replaceGlobalValues__SWIG_1(farg1, farg2, farg3, bind(C, name="_wrap_TpetraCrsMatrix_replaceGlobalValues__SWIG_1") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_LONG_LONG), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3169,8 +3049,8 @@ function swigc_TpetraCrsMatrix_replaceLocalValues__SWIG_1(farg1, farg2, farg3, f bind(C, name="_wrap_TpetraCrsMatrix_replaceLocalValues__SWIG_1") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_INT), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3182,8 +3062,8 @@ function swigc_TpetraCrsMatrix_sumIntoGlobalValues__SWIG_0(farg1, farg2, farg3, bind(C, name="_wrap_TpetraCrsMatrix_sumIntoGlobalValues__SWIG_0") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_LONG_LONG), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3195,8 +3075,8 @@ function swigc_TpetraCrsMatrix_sumIntoLocalValues__SWIG_2(farg1, farg2, farg3, f bind(C, name="_wrap_TpetraCrsMatrix_sumIntoLocalValues__SWIG_2") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_INT), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3223,8 +3103,8 @@ subroutine swigc_TpetraCrsMatrix_scale(farg1, farg2) & subroutine swigc_TpetraCrsMatrix_setAllValues__SWIG_1(farg1, farg2, farg3, farg4) & bind(C, name="_wrap_TpetraCrsMatrix_setAllValues__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3433,8 +3313,8 @@ function swigc_TpetraCrsMatrix_getGlobalNumCols(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraCrsMatrix_getNodeNumRows(farg1) & -bind(C, name="_wrap_TpetraCrsMatrix_getNodeNumRows") & +function swigc_TpetraCrsMatrix_getLocalNumRows(farg1) & +bind(C, name="_wrap_TpetraCrsMatrix_getLocalNumRows") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3442,8 +3322,8 @@ function swigc_TpetraCrsMatrix_getNodeNumRows(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraCrsMatrix_getNodeNumCols(farg1) & -bind(C, name="_wrap_TpetraCrsMatrix_getNodeNumCols") & +function swigc_TpetraCrsMatrix_getLocalNumCols(farg1) & +bind(C, name="_wrap_TpetraCrsMatrix_getLocalNumCols") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3460,8 +3340,8 @@ function swigc_TpetraCrsMatrix_getGlobalNumEntries(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraCrsMatrix_getNodeNumEntries(farg1) & -bind(C, name="_wrap_TpetraCrsMatrix_getNodeNumEntries") & +function swigc_TpetraCrsMatrix_getLocalNumEntries(farg1) & +bind(C, name="_wrap_TpetraCrsMatrix_getLocalNumEntries") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3498,8 +3378,8 @@ function swigc_TpetraCrsMatrix_getGlobalMaxNumRowEntries(farg1) & integer(C_SIZE_T) :: fresult end function -function swigc_TpetraCrsMatrix_getNodeMaxNumRowEntries(farg1) & -bind(C, name="_wrap_TpetraCrsMatrix_getNodeMaxNumRowEntries") & +function swigc_TpetraCrsMatrix_getLocalMaxNumRowEntries(farg1) & +bind(C, name="_wrap_TpetraCrsMatrix_getLocalMaxNumRowEntries") & result(fresult) use, intrinsic :: ISO_C_BINDING import :: swigclasswrapper @@ -3561,15 +3441,6 @@ function swigc_TpetraCrsMatrix_isStorageOptimized(farg1) & integer(C_INT) :: fresult end function -function swigc_TpetraCrsMatrix_getProfileType(farg1) & -bind(C, name="_wrap_TpetraCrsMatrix_getProfileType") & -result(fresult) -use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper -type(SwigClassWrapper), intent(in) :: farg1 -integer(C_INT) :: fresult -end function - function swigc_TpetraCrsMatrix_isStaticGraph(farg1) & bind(C, name="_wrap_TpetraCrsMatrix_isStaticGraph") & result(fresult) @@ -3809,13 +3680,6 @@ subroutine swigc_TpetraCrsMatrix_exportAndFillComplete__SWIG_4(farg1, farg2, far type(SwigClassWrapper), intent(in) :: farg7 end subroutine -subroutine swigc_TpetraCrsMatrix_computeGlobalConstants(farg1) & -bind(C, name="_wrap_TpetraCrsMatrix_computeGlobalConstants") -use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper -type(SwigClassWrapper), intent(in) :: farg1 -end subroutine - function swigc_TpetraCrsMatrix_haveGlobalConstants(farg1) & bind(C, name="_wrap_TpetraCrsMatrix_haveGlobalConstants") & result(fresult) @@ -3825,11 +3689,11 @@ function swigc_TpetraCrsMatrix_haveGlobalConstants(farg1) & integer(C_INT) :: fresult end function -subroutine swigc_TpetraCrsMatrix_getAllValues__SWIG_1(farg1, farg2, farg3, farg4) & -bind(C, name="_wrap_TpetraCrsMatrix_getAllValues__SWIG_1") +subroutine swigc_TpetraCrsMatrix_getAllValues(farg1, farg2, farg3, farg4) & +bind(C, name="_wrap_TpetraCrsMatrix_getAllValues") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3839,8 +3703,8 @@ subroutine swigc_TpetraCrsMatrix_getAllValues__SWIG_1(farg1, farg2, farg3, farg4 subroutine swigc_TpetraCrsMatrix_getGlobalRowCopy__SWIG_1(farg1, farg2, farg3, farg4, farg5) & bind(C, name="_wrap_TpetraCrsMatrix_getGlobalRowCopy__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_LONG_LONG), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3851,8 +3715,8 @@ subroutine swigc_TpetraCrsMatrix_getGlobalRowCopy__SWIG_1(farg1, farg2, farg3, f subroutine swigc_TpetraCrsMatrix_getLocalRowCopy__SWIG_1(farg1, farg2, farg3, farg4, farg5) & bind(C, name="_wrap_TpetraCrsMatrix_getLocalRowCopy__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_INT), intent(in) :: farg2 type(SwigArrayWrapper) :: farg3 @@ -3890,8 +3754,8 @@ function swigc_TpetraReader_readSparseGraphFile__SWIG_0(farg1, farg2, farg3) & bind(C, name="_wrap_TpetraReader_readSparseGraphFile__SWIG_0") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 integer(C_INT), intent(in) :: farg3 @@ -3902,8 +3766,8 @@ function swigc_TpetraReader_readSparseGraphFile__SWIG_1(farg1, farg2) & bind(C, name="_wrap_TpetraReader_readSparseGraphFile__SWIG_1") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper) :: fresult @@ -3913,8 +3777,8 @@ function swigc_TpetraReader_readSparseGraphFile__SWIG_2(farg1, farg2, farg3, far bind(C, name="_wrap_TpetraReader_readSparseGraphFile__SWIG_2") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -3926,8 +3790,8 @@ function swigc_TpetraReader_readSparseGraphFile__SWIG_3(farg1, farg2, farg3, far bind(C, name="_wrap_TpetraReader_readSparseGraphFile__SWIG_3") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -3941,8 +3805,8 @@ function swigc_TpetraReader_readSparseGraphFile__SWIG_4(farg1, farg2, farg3, far bind(C, name="_wrap_TpetraReader_readSparseGraphFile__SWIG_4") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -3955,8 +3819,8 @@ function swigc_TpetraReader_readSparseFile__SWIG_0(farg1, farg2, farg3) & bind(C, name="_wrap_TpetraReader_readSparseFile__SWIG_0") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 integer(C_INT), intent(in) :: farg3 @@ -3967,8 +3831,8 @@ function swigc_TpetraReader_readSparseFile__SWIG_1(farg1, farg2) & bind(C, name="_wrap_TpetraReader_readSparseFile__SWIG_1") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper) :: fresult @@ -3978,8 +3842,8 @@ function swigc_TpetraReader_readSparseFile__SWIG_2(farg1, farg2, farg3, farg4) & bind(C, name="_wrap_TpetraReader_readSparseFile__SWIG_2") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -3991,8 +3855,8 @@ function swigc_TpetraReader_readSparseFile__SWIG_3(farg1, farg2, farg3, farg4, f bind(C, name="_wrap_TpetraReader_readSparseFile__SWIG_3") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -4006,8 +3870,8 @@ function swigc_TpetraReader_readSparseFile__SWIG_4(farg1, farg2, farg3, farg4, f bind(C, name="_wrap_TpetraReader_readSparseFile__SWIG_4") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -4020,8 +3884,8 @@ function swigc_TpetraReader_readDenseFile(farg1, farg2, farg3) & bind(C, name="_wrap_TpetraReader_readDenseFile") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -4032,8 +3896,8 @@ function swigc_TpetraReader_readMapFile(farg1, farg2) & bind(C, name="_wrap_TpetraReader_readMapFile") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigArrayWrapper) :: farg1 type(SwigClassWrapper), intent(in) :: farg2 type(SwigClassWrapper) :: fresult @@ -4132,8 +3996,8 @@ subroutine swigc_TpetraWriter_op_assign__(farg1, farg2) & subroutine swigc_TpetraMatrixMatrixMultiply__SWIG_0(farg1, farg2, farg3, farg4, farg5, farg6, farg7, farg8) & bind(C, name="_wrap_TpetraMatrixMatrixMultiply__SWIG_0") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_INT), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -4147,8 +4011,8 @@ subroutine swigc_TpetraMatrixMatrixMultiply__SWIG_0(farg1, farg2, farg3, farg4, subroutine swigc_TpetraMatrixMatrixMultiply__SWIG_1(farg1, farg2, farg3, farg4, farg5, farg6, farg7) & bind(C, name="_wrap_TpetraMatrixMatrixMultiply__SWIG_1") use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 integer(C_INT), intent(in) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 @@ -4429,7 +4293,7 @@ function swigf_TpetraMap_getGlobalNumElements(self) & swig_result = fresult end function -function swigf_TpetraMap_getNodeNumElements(self) & +function swigf_TpetraMap_getLocalNumElements(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer :: swig_result @@ -4438,7 +4302,7 @@ function swigf_TpetraMap_getNodeNumElements(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraMap_getNodeNumElements(farg1) +fresult = swigc_TpetraMap_getLocalNumElements(farg1) swig_result = int(fresult) end function @@ -4620,7 +4484,7 @@ subroutine SWIGTM_fout_long_SS_long_Sb__SB_(imout, fout) fout => NULL() endif end subroutine -function swigf_TpetraMap_getNodeElementList(self) & +function swigf_TpetraMap_getLocalElementList(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_LONG_LONG), dimension(:), pointer :: swig_result @@ -4629,7 +4493,7 @@ function swigf_TpetraMap_getNodeElementList(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraMap_getNodeElementList(farg1) +fresult = swigc_TpetraMap_getLocalElementList(farg1) call SWIGTM_fout_long_SS_long_Sb__SB_(fresult, swig_result) end function @@ -6576,48 +6440,26 @@ subroutine swigf_RowInfo_op_assign__(self, other) self%swigdata = farg1 end subroutine -function swigf_new_TpetraCrsGraph__SWIG_0(rowmap, maxnumentriesperrow, pftype, params) & +function swigf_new_TpetraCrsGraph__SWIG_0(rowmap, maxnumentriesperrow, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self class(TpetraMap), intent(in) :: rowmap integer(C_SIZE_T), intent(in) :: maxnumentriesperrow -integer(TpetraProfileType), intent(in) :: pftype class(ParameterList), intent(in) :: params type(SwigClassWrapper) :: fresult type(SwigClassWrapper) :: farg1 integer(C_SIZE_T) :: farg2 -integer(C_INT) :: farg3 -type(SwigClassWrapper) :: farg4 - -farg1 = rowmap%swigdata -farg2 = maxnumentriesperrow -farg3 = pftype -farg4 = params%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_0(farg1, farg2, farg3, farg4) -self%swigdata = fresult -end function - -function swigf_new_TpetraCrsGraph__SWIG_1(rowmap, maxnumentriesperrow, pftype) & -result(self) -use, intrinsic :: ISO_C_BINDING -type(TpetraCrsGraph) :: self -class(TpetraMap), intent(in) :: rowmap -integer(C_SIZE_T), intent(in) :: maxnumentriesperrow -integer(TpetraProfileType), intent(in) :: pftype -type(SwigClassWrapper) :: fresult -type(SwigClassWrapper) :: farg1 -integer(C_SIZE_T) :: farg2 -integer(C_INT) :: farg3 +type(SwigClassWrapper) :: farg3 farg1 = rowmap%swigdata farg2 = maxnumentriesperrow -farg3 = pftype -fresult = swigc_new_TpetraCrsGraph__SWIG_1(farg1, farg2, farg3) +farg3 = params%swigdata +fresult = swigc_new_TpetraCrsGraph__SWIG_0(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_2(rowmap, maxnumentriesperrow) & +function swigf_new_TpetraCrsGraph__SWIG_1(rowmap, maxnumentriesperrow) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6629,52 +6471,30 @@ function swigf_new_TpetraCrsGraph__SWIG_2(rowmap, maxnumentriesperrow) & farg1 = rowmap%swigdata farg2 = maxnumentriesperrow -fresult = swigc_new_TpetraCrsGraph__SWIG_2(farg1, farg2) +fresult = swigc_new_TpetraCrsGraph__SWIG_1(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_6(rowmap, numentperrow, pftype, params) & +function swigf_new_TpetraCrsGraph__SWIG_4(rowmap, numentperrow, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self class(TpetraMap), intent(in) :: rowmap integer(C_SIZE_T), dimension(:), target :: numentperrow -integer(TpetraProfileType), intent(in) :: pftype class(ParameterList), intent(in) :: params type(SwigClassWrapper) :: fresult type(SwigClassWrapper) :: farg1 type(SwigArrayWrapper) :: farg2 -integer(C_INT) :: farg3 -type(SwigClassWrapper) :: farg4 - -farg1 = rowmap%swigdata -call SWIGTM_fin_size_t_Sb__SB_(numentperrow, farg2) -farg3 = pftype -farg4 = params%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_6(farg1, farg2, farg3, farg4) -self%swigdata = fresult -end function - -function swigf_new_TpetraCrsGraph__SWIG_7(rowmap, numentperrow, pftype) & -result(self) -use, intrinsic :: ISO_C_BINDING -type(TpetraCrsGraph) :: self -class(TpetraMap), intent(in) :: rowmap -integer(C_SIZE_T), dimension(:), target :: numentperrow -integer(TpetraProfileType), intent(in) :: pftype -type(SwigClassWrapper) :: fresult -type(SwigClassWrapper) :: farg1 -type(SwigArrayWrapper) :: farg2 -integer(C_INT) :: farg3 +type(SwigClassWrapper) :: farg3 farg1 = rowmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(numentperrow, farg2) -farg3 = pftype -fresult = swigc_new_TpetraCrsGraph__SWIG_7(farg1, farg2, farg3) +farg3 = params%swigdata +fresult = swigc_new_TpetraCrsGraph__SWIG_4(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_8(rowmap, numentperrow) & +function swigf_new_TpetraCrsGraph__SWIG_5(rowmap, numentperrow) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6686,58 +6506,33 @@ function swigf_new_TpetraCrsGraph__SWIG_8(rowmap, numentperrow) & farg1 = rowmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(numentperrow, farg2) -fresult = swigc_new_TpetraCrsGraph__SWIG_8(farg1, farg2) +fresult = swigc_new_TpetraCrsGraph__SWIG_5(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_9(rowmap, colmap, maxnumentriesperrow, pftype, params) & +function swigf_new_TpetraCrsGraph__SWIG_6(rowmap, colmap, maxnumentriesperrow, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self class(TpetraMap), intent(in) :: rowmap class(TpetraMap), intent(in) :: colmap integer(C_SIZE_T), intent(in) :: maxnumentriesperrow -integer(TpetraProfileType), intent(in) :: pftype class(ParameterList), intent(in) :: params type(SwigClassWrapper) :: fresult type(SwigClassWrapper) :: farg1 type(SwigClassWrapper) :: farg2 integer(C_SIZE_T) :: farg3 -integer(C_INT) :: farg4 -type(SwigClassWrapper) :: farg5 - -farg1 = rowmap%swigdata -farg2 = colmap%swigdata -farg3 = maxnumentriesperrow -farg4 = pftype -farg5 = params%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_9(farg1, farg2, farg3, farg4, farg5) -self%swigdata = fresult -end function - -function swigf_new_TpetraCrsGraph__SWIG_10(rowmap, colmap, maxnumentriesperrow, pftype) & -result(self) -use, intrinsic :: ISO_C_BINDING -type(TpetraCrsGraph) :: self -class(TpetraMap), intent(in) :: rowmap -class(TpetraMap), intent(in) :: colmap -integer(C_SIZE_T), intent(in) :: maxnumentriesperrow -integer(TpetraProfileType), intent(in) :: pftype -type(SwigClassWrapper) :: fresult -type(SwigClassWrapper) :: farg1 -type(SwigClassWrapper) :: farg2 -integer(C_SIZE_T) :: farg3 -integer(C_INT) :: farg4 +type(SwigClassWrapper) :: farg4 farg1 = rowmap%swigdata farg2 = colmap%swigdata farg3 = maxnumentriesperrow -farg4 = pftype -fresult = swigc_new_TpetraCrsGraph__SWIG_10(farg1, farg2, farg3, farg4) +farg4 = params%swigdata +fresult = swigc_new_TpetraCrsGraph__SWIG_6(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_11(rowmap, colmap, maxnumentriesperrow) & +function swigf_new_TpetraCrsGraph__SWIG_7(rowmap, colmap, maxnumentriesperrow) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6752,58 +6547,33 @@ function swigf_new_TpetraCrsGraph__SWIG_11(rowmap, colmap, maxnumentriesperrow) farg1 = rowmap%swigdata farg2 = colmap%swigdata farg3 = maxnumentriesperrow -fresult = swigc_new_TpetraCrsGraph__SWIG_11(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsGraph__SWIG_7(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_15(rowmap, colmap, numentperrow, pftype, params) & +function swigf_new_TpetraCrsGraph__SWIG_10(rowmap, colmap, numentperrow, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self class(TpetraMap), intent(in) :: rowmap class(TpetraMap), intent(in) :: colmap integer(C_SIZE_T), dimension(:), target :: numentperrow -integer(TpetraProfileType), intent(in) :: pftype class(ParameterList), intent(in) :: params type(SwigClassWrapper) :: fresult type(SwigClassWrapper) :: farg1 type(SwigClassWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 -integer(C_INT) :: farg4 -type(SwigClassWrapper) :: farg5 - -farg1 = rowmap%swigdata -farg2 = colmap%swigdata -call SWIGTM_fin_size_t_Sb__SB_(numentperrow, farg3) -farg4 = pftype -farg5 = params%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_15(farg1, farg2, farg3, farg4, farg5) -self%swigdata = fresult -end function - -function swigf_new_TpetraCrsGraph__SWIG_16(rowmap, colmap, numentperrow, pftype) & -result(self) -use, intrinsic :: ISO_C_BINDING -type(TpetraCrsGraph) :: self -class(TpetraMap), intent(in) :: rowmap -class(TpetraMap), intent(in) :: colmap -integer(C_SIZE_T), dimension(:), target :: numentperrow -integer(TpetraProfileType), intent(in) :: pftype -type(SwigClassWrapper) :: fresult -type(SwigClassWrapper) :: farg1 -type(SwigClassWrapper) :: farg2 -type(SwigArrayWrapper) :: farg3 -integer(C_INT) :: farg4 +type(SwigClassWrapper) :: farg4 farg1 = rowmap%swigdata farg2 = colmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(numentperrow, farg3) -farg4 = pftype -fresult = swigc_new_TpetraCrsGraph__SWIG_16(farg1, farg2, farg3, farg4) +farg4 = params%swigdata +fresult = swigc_new_TpetraCrsGraph__SWIG_10(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_17(rowmap, colmap, numentperrow) & +function swigf_new_TpetraCrsGraph__SWIG_11(rowmap, colmap, numentperrow) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6818,11 +6588,11 @@ function swigf_new_TpetraCrsGraph__SWIG_17(rowmap, colmap, numentperrow) & farg1 = rowmap%swigdata farg2 = colmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(numentperrow, farg3) -fresult = swigc_new_TpetraCrsGraph__SWIG_17(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsGraph__SWIG_11(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_18(originalgraph, rowmap, params) & +function swigf_new_TpetraCrsGraph__SWIG_12(originalgraph, rowmap, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6837,11 +6607,11 @@ function swigf_new_TpetraCrsGraph__SWIG_18(originalgraph, rowmap, params) & farg1 = originalgraph%swigdata farg2 = rowmap%swigdata farg3 = params%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_18(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsGraph__SWIG_12(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_19(originalgraph, rowmap) & +function swigf_new_TpetraCrsGraph__SWIG_13(originalgraph, rowmap) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6853,11 +6623,11 @@ function swigf_new_TpetraCrsGraph__SWIG_19(originalgraph, rowmap) & farg1 = originalgraph%swigdata farg2 = rowmap%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_19(farg1, farg2) +fresult = swigc_new_TpetraCrsGraph__SWIG_13(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_22(rowmap, colmap, rowpointers, columnindices, params) & +function swigf_new_TpetraCrsGraph__SWIG_16(rowmap, colmap, rowpointers, columnindices, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6878,11 +6648,11 @@ function swigf_new_TpetraCrsGraph__SWIG_22(rowmap, colmap, rowpointers, columnin call SWIGTM_fin_size_t_Sb__SB_(rowpointers, farg3) call SWIGTM_fin_int_Sb__SB_(columnindices, farg4) farg5 = params%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_22(farg1, farg2, farg3, farg4, farg5) +fresult = swigc_new_TpetraCrsGraph__SWIG_16(farg1, farg2, farg3, farg4, farg5) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_23(rowmap, colmap, rowpointers, columnindices) & +function swigf_new_TpetraCrsGraph__SWIG_17(rowmap, colmap, rowpointers, columnindices) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6900,11 +6670,11 @@ function swigf_new_TpetraCrsGraph__SWIG_23(rowmap, colmap, rowpointers, columnin farg2 = colmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(rowpointers, farg3) call SWIGTM_fin_int_Sb__SB_(columnindices, farg4) -fresult = swigc_new_TpetraCrsGraph__SWIG_23(farg1, farg2, farg3, farg4) +fresult = swigc_new_TpetraCrsGraph__SWIG_17(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsGraph__SWIG_31(arg0) & +function swigf_new_TpetraCrsGraph__SWIG_25(arg0) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsGraph) :: self @@ -6913,7 +6683,7 @@ function swigf_new_TpetraCrsGraph__SWIG_31(arg0) & type(SwigClassWrapper) :: farg1 farg1 = arg0%swigdata -fresult = swigc_new_TpetraCrsGraph__SWIG_31(farg1) +fresult = swigc_new_TpetraCrsGraph__SWIG_25(farg1) self%swigdata = fresult end function @@ -7293,7 +7063,7 @@ function swigf_TpetraCrsGraph_getGlobalNumCols(self) & swig_result = fresult end function -function swigf_TpetraCrsGraph_getNodeNumRows(self) & +function swigf_TpetraCrsGraph_getLocalNumRows(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -7302,11 +7072,11 @@ function swigf_TpetraCrsGraph_getNodeNumRows(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsGraph_getNodeNumRows(farg1) +fresult = swigc_TpetraCrsGraph_getLocalNumRows(farg1) swig_result = fresult end function -function swigf_TpetraCrsGraph_getNodeNumCols(self) & +function swigf_TpetraCrsGraph_getLocalNumCols(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -7315,7 +7085,7 @@ function swigf_TpetraCrsGraph_getNodeNumCols(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsGraph_getNodeNumCols(farg1) +fresult = swigc_TpetraCrsGraph_getLocalNumCols(farg1) swig_result = fresult end function @@ -7332,7 +7102,7 @@ function swigf_TpetraCrsGraph_getGlobalNumEntries(self) & swig_result = fresult end function -function swigf_TpetraCrsGraph_getNodeNumEntries(self) & +function swigf_TpetraCrsGraph_getLocalNumEntries(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -7341,7 +7111,7 @@ function swigf_TpetraCrsGraph_getNodeNumEntries(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsGraph_getNodeNumEntries(farg1) +fresult = swigc_TpetraCrsGraph_getLocalNumEntries(farg1) swig_result = fresult end function @@ -7377,7 +7147,7 @@ function swigf_TpetraCrsGraph_getNumEntriesInLocalRow(self, localrow) & swig_result = int(fresult) end function -function swigf_TpetraCrsGraph_getNodeAllocationSize(self) & +function swigf_TpetraCrsGraph_getLocalAllocationSize(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -7386,7 +7156,7 @@ function swigf_TpetraCrsGraph_getNodeAllocationSize(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsGraph_getNodeAllocationSize(farg1) +fresult = swigc_TpetraCrsGraph_getLocalAllocationSize(farg1) swig_result = fresult end function @@ -7435,7 +7205,7 @@ function swigf_TpetraCrsGraph_getGlobalMaxNumRowEntries(self) & swig_result = fresult end function -function swigf_TpetraCrsGraph_getNodeMaxNumRowEntries(self) & +function swigf_TpetraCrsGraph_getLocalMaxNumRowEntries(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -7444,7 +7214,7 @@ function swigf_TpetraCrsGraph_getNodeMaxNumRowEntries(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsGraph_getNodeMaxNumRowEntries(farg1) +fresult = swigc_TpetraCrsGraph_getLocalMaxNumRowEntries(farg1) swig_result = fresult end function @@ -7539,19 +7309,6 @@ function swigf_TpetraCrsGraph_isStorageOptimized(self) & call SWIGTM_fout_bool(fresult, swig_result) end function -function swigf_TpetraCrsGraph_getProfileType(self) & -result(swig_result) -use, intrinsic :: ISO_C_BINDING -integer(TpetraProfileType) :: swig_result -class(TpetraCrsGraph), intent(in) :: self -integer(C_INT) :: fresult -type(SwigClassWrapper) :: farg1 - -farg1 = self%swigdata -fresult = swigc_TpetraCrsGraph_getProfileType(farg1) -swig_result = fresult -end function - function swigf_TpetraCrsGraph_supportsRowViews(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING @@ -7937,19 +7694,7 @@ function swigf_TpetraCrsGraph_haveLocalOffRankOffsets(self) & call SWIGTM_fout_bool(fresult, swig_result) end function -subroutine swigf_TpetraCrsGraph_getNodeRowPtrs(self, rowpointers) -use, intrinsic :: ISO_C_BINDING -class(TpetraCrsGraph), intent(in) :: self -integer(C_SIZE_T), dimension(:), target :: rowpointers -type(SwigClassWrapper) :: farg1 -type(SwigArrayWrapper) :: farg2 - -farg1 = self%swigdata -call SWIGTM_fin_size_t_Sb__SB_(rowpointers, farg2) -call swigc_TpetraCrsGraph_getNodeRowPtrs(farg1, farg2) -end subroutine - -subroutine swigf_TpetraCrsGraph_getNodePackedIndices(self, columnindices) +subroutine swigf_TpetraCrsGraph_getLocalPackedIndices(self, columnindices) use, intrinsic :: ISO_C_BINDING class(TpetraCrsGraph), intent(in) :: self integer(C_SIZE_T), dimension(:), target :: columnindices @@ -7958,7 +7703,7 @@ subroutine swigf_TpetraCrsGraph_getNodePackedIndices(self, columnindices) farg1 = self%swigdata call SWIGTM_fin_size_t_Sb__SB_(columnindices, farg2) -call swigc_TpetraCrsGraph_getNodePackedIndices(farg1, farg2) +call swigc_TpetraCrsGraph_getLocalPackedIndices(farg1, farg2) end subroutine subroutine swigf_TpetraCrsGraph_getLocalRowCopy__SWIG_1(self, lclrow, lclcolinds, numcolinds) @@ -8095,48 +7840,26 @@ function swigf_new_TpetraCrsMatrix__SWIG_0(arg0) & self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_2(rowmap, maxnumentriesperrow, pftype, params) & +function swigf_new_TpetraCrsMatrix__SWIG_2(rowmap, maxnumentriesperrow, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self class(TpetraMap), intent(in) :: rowmap integer(C_SIZE_T), intent(in) :: maxnumentriesperrow -integer(TpetraProfileType), intent(in) :: pftype class(ParameterList), intent(in) :: params type(SwigClassWrapper) :: fresult type(SwigClassWrapper) :: farg1 integer(C_SIZE_T) :: farg2 -integer(C_INT) :: farg3 -type(SwigClassWrapper) :: farg4 - -farg1 = rowmap%swigdata -farg2 = maxnumentriesperrow -farg3 = pftype -farg4 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2, farg3, farg4) -self%swigdata = fresult -end function - -function swigf_new_TpetraCrsMatrix__SWIG_3(rowmap, maxnumentriesperrow, pftype) & -result(self) -use, intrinsic :: ISO_C_BINDING -type(TpetraCrsMatrix) :: self -class(TpetraMap), intent(in) :: rowmap -integer(C_SIZE_T), intent(in) :: maxnumentriesperrow -integer(TpetraProfileType), intent(in) :: pftype -type(SwigClassWrapper) :: fresult -type(SwigClassWrapper) :: farg1 -integer(C_SIZE_T) :: farg2 -integer(C_INT) :: farg3 +type(SwigClassWrapper) :: farg3 farg1 = rowmap%swigdata farg2 = maxnumentriesperrow -farg3 = pftype -fresult = swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2, farg3) +farg3 = params%swigdata +fresult = swigc_new_TpetraCrsMatrix__SWIG_2(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_4(rowmap, maxnumentriesperrow) & +function swigf_new_TpetraCrsMatrix__SWIG_3(rowmap, maxnumentriesperrow) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8148,52 +7871,30 @@ function swigf_new_TpetraCrsMatrix__SWIG_4(rowmap, maxnumentriesperrow) & farg1 = rowmap%swigdata farg2 = maxnumentriesperrow -fresult = swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_3(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_5(rowmap, numentperrowtoalloc, pftype, params) & +function swigf_new_TpetraCrsMatrix__SWIG_4(rowmap, numentperrowtoalloc, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self class(TpetraMap), intent(in) :: rowmap integer(C_SIZE_T), dimension(:), target :: numentperrowtoalloc -integer(TpetraProfileType), intent(in) :: pftype class(ParameterList), intent(in) :: params type(SwigClassWrapper) :: fresult type(SwigClassWrapper) :: farg1 type(SwigArrayWrapper) :: farg2 -integer(C_INT) :: farg3 -type(SwigClassWrapper) :: farg4 - -farg1 = rowmap%swigdata -call SWIGTM_fin_size_t_Sb__SB_(numentperrowtoalloc, farg2) -farg3 = pftype -farg4 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_5(farg1, farg2, farg3, farg4) -self%swigdata = fresult -end function - -function swigf_new_TpetraCrsMatrix__SWIG_6(rowmap, numentperrowtoalloc, pftype) & -result(self) -use, intrinsic :: ISO_C_BINDING -type(TpetraCrsMatrix) :: self -class(TpetraMap), intent(in) :: rowmap -integer(C_SIZE_T), dimension(:), target :: numentperrowtoalloc -integer(TpetraProfileType), intent(in) :: pftype -type(SwigClassWrapper) :: fresult -type(SwigClassWrapper) :: farg1 -type(SwigArrayWrapper) :: farg2 -integer(C_INT) :: farg3 +type(SwigClassWrapper) :: farg3 farg1 = rowmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(numentperrowtoalloc, farg2) -farg3 = pftype -fresult = swigc_new_TpetraCrsMatrix__SWIG_6(farg1, farg2, farg3) +farg3 = params%swigdata +fresult = swigc_new_TpetraCrsMatrix__SWIG_4(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_7(rowmap, numentperrowtoalloc) & +function swigf_new_TpetraCrsMatrix__SWIG_5(rowmap, numentperrowtoalloc) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8205,58 +7906,33 @@ function swigf_new_TpetraCrsMatrix__SWIG_7(rowmap, numentperrowtoalloc) & farg1 = rowmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(numentperrowtoalloc, farg2) -fresult = swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_5(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_8(rowmap, colmap, maxnumentperrow, pftype, params) & +function swigf_new_TpetraCrsMatrix__SWIG_6(rowmap, colmap, maxnumentperrow, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self class(TpetraMap), intent(in) :: rowmap class(TpetraMap), intent(in) :: colmap integer(C_SIZE_T), intent(in) :: maxnumentperrow -integer(TpetraProfileType), intent(in) :: pftype class(ParameterList), intent(in) :: params type(SwigClassWrapper) :: fresult type(SwigClassWrapper) :: farg1 type(SwigClassWrapper) :: farg2 integer(C_SIZE_T) :: farg3 -integer(C_INT) :: farg4 -type(SwigClassWrapper) :: farg5 - -farg1 = rowmap%swigdata -farg2 = colmap%swigdata -farg3 = maxnumentperrow -farg4 = pftype -farg5 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_8(farg1, farg2, farg3, farg4, farg5) -self%swigdata = fresult -end function - -function swigf_new_TpetraCrsMatrix__SWIG_9(rowmap, colmap, maxnumentperrow, pftype) & -result(self) -use, intrinsic :: ISO_C_BINDING -type(TpetraCrsMatrix) :: self -class(TpetraMap), intent(in) :: rowmap -class(TpetraMap), intent(in) :: colmap -integer(C_SIZE_T), intent(in) :: maxnumentperrow -integer(TpetraProfileType), intent(in) :: pftype -type(SwigClassWrapper) :: fresult -type(SwigClassWrapper) :: farg1 -type(SwigClassWrapper) :: farg2 -integer(C_SIZE_T) :: farg3 -integer(C_INT) :: farg4 +type(SwigClassWrapper) :: farg4 farg1 = rowmap%swigdata farg2 = colmap%swigdata farg3 = maxnumentperrow -farg4 = pftype -fresult = swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3, farg4) +farg4 = params%swigdata +fresult = swigc_new_TpetraCrsMatrix__SWIG_6(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_10(rowmap, colmap, maxnumentperrow) & +function swigf_new_TpetraCrsMatrix__SWIG_7(rowmap, colmap, maxnumentperrow) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8271,58 +7947,33 @@ function swigf_new_TpetraCrsMatrix__SWIG_10(rowmap, colmap, maxnumentperrow) & farg1 = rowmap%swigdata farg2 = colmap%swigdata farg3 = maxnumentperrow -fresult = swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsMatrix__SWIG_7(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_11(rowmap, colmap, numentperrowtoalloc, pftype, params) & +function swigf_new_TpetraCrsMatrix__SWIG_8(rowmap, colmap, numentperrowtoalloc, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self class(TpetraMap), intent(in) :: rowmap class(TpetraMap), intent(in) :: colmap integer(C_SIZE_T), dimension(:), target :: numentperrowtoalloc -integer(TpetraProfileType), intent(in) :: pftype class(ParameterList), intent(in) :: params type(SwigClassWrapper) :: fresult type(SwigClassWrapper) :: farg1 type(SwigClassWrapper) :: farg2 type(SwigArrayWrapper) :: farg3 -integer(C_INT) :: farg4 -type(SwigClassWrapper) :: farg5 - -farg1 = rowmap%swigdata -farg2 = colmap%swigdata -call SWIGTM_fin_size_t_Sb__SB_(numentperrowtoalloc, farg3) -farg4 = pftype -farg5 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2, farg3, farg4, farg5) -self%swigdata = fresult -end function - -function swigf_new_TpetraCrsMatrix__SWIG_12(rowmap, colmap, numentperrowtoalloc, pftype) & -result(self) -use, intrinsic :: ISO_C_BINDING -type(TpetraCrsMatrix) :: self -class(TpetraMap), intent(in) :: rowmap -class(TpetraMap), intent(in) :: colmap -integer(C_SIZE_T), dimension(:), target :: numentperrowtoalloc -integer(TpetraProfileType), intent(in) :: pftype -type(SwigClassWrapper) :: fresult -type(SwigClassWrapper) :: farg1 -type(SwigClassWrapper) :: farg2 -type(SwigArrayWrapper) :: farg3 -integer(C_INT) :: farg4 +type(SwigClassWrapper) :: farg4 farg1 = rowmap%swigdata farg2 = colmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(numentperrowtoalloc, farg3) -farg4 = pftype -fresult = swigc_new_TpetraCrsMatrix__SWIG_12(farg1, farg2, farg3, farg4) +farg4 = params%swigdata +fresult = swigc_new_TpetraCrsMatrix__SWIG_8(farg1, farg2, farg3, farg4) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_13(rowmap, colmap, numentperrowtoalloc) & +function swigf_new_TpetraCrsMatrix__SWIG_9(rowmap, colmap, numentperrowtoalloc) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8337,11 +7988,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_13(rowmap, colmap, numentperrowtoalloc) farg1 = rowmap%swigdata farg2 = colmap%swigdata call SWIGTM_fin_size_t_Sb__SB_(numentperrowtoalloc, farg3) -fresult = swigc_new_TpetraCrsMatrix__SWIG_13(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsMatrix__SWIG_9(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_14(matrix, graph, params) & +function swigf_new_TpetraCrsMatrix__SWIG_10(matrix, graph, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8356,11 +8007,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_14(matrix, graph, params) & farg1 = matrix%swigdata farg2 = graph%swigdata farg3 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_14(farg1, farg2, farg3) +fresult = swigc_new_TpetraCrsMatrix__SWIG_10(farg1, farg2, farg3) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_15(matrix, graph) & +function swigf_new_TpetraCrsMatrix__SWIG_11(matrix, graph) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8372,11 +8023,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_15(matrix, graph) & farg1 = matrix%swigdata farg2 = graph%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_15(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_11(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_16(graph, params) & +function swigf_new_TpetraCrsMatrix__SWIG_12(graph, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8388,11 +8039,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_16(graph, params) & farg1 = graph%swigdata farg2 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_16(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_12(farg1, farg2) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_17(graph) & +function swigf_new_TpetraCrsMatrix__SWIG_13(graph) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8401,11 +8052,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_17(graph) & type(SwigClassWrapper) :: farg1 farg1 = graph%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_17(farg1) +fresult = swigc_new_TpetraCrsMatrix__SWIG_13(farg1) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_22(rowmap, colmap, rowpointers, columnindices, values, params) & +function swigf_new_TpetraCrsMatrix__SWIG_18(rowmap, colmap, rowpointers, columnindices, values, params) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8429,11 +8080,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_22(rowmap, colmap, rowpointers, columni call SWIGTM_fin_int_Sb__SB_(columnindices, farg4) call SWIGTM_fin_double_Sb__SB_(values, farg5) farg6 = params%swigdata -fresult = swigc_new_TpetraCrsMatrix__SWIG_22(farg1, farg2, farg3, farg4, farg5, farg6) +fresult = swigc_new_TpetraCrsMatrix__SWIG_18(farg1, farg2, farg3, farg4, farg5, farg6) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_23(rowmap, colmap, rowpointers, columnindices, values) & +function swigf_new_TpetraCrsMatrix__SWIG_19(rowmap, colmap, rowpointers, columnindices, values) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8454,11 +8105,11 @@ function swigf_new_TpetraCrsMatrix__SWIG_23(rowmap, colmap, rowpointers, columni call SWIGTM_fin_size_t_Sb__SB_(rowpointers, farg3) call SWIGTM_fin_int_Sb__SB_(columnindices, farg4) call SWIGTM_fin_double_Sb__SB_(values, farg5) -fresult = swigc_new_TpetraCrsMatrix__SWIG_23(farg1, farg2, farg3, farg4, farg5) +fresult = swigc_new_TpetraCrsMatrix__SWIG_19(farg1, farg2, farg3, farg4, farg5) self%swigdata = fresult end function -function swigf_new_TpetraCrsMatrix__SWIG_32(source, copyorview) & +function swigf_new_TpetraCrsMatrix__SWIG_28(source, copyorview) & result(self) use, intrinsic :: ISO_C_BINDING type(TpetraCrsMatrix) :: self @@ -8470,7 +8121,7 @@ function swigf_new_TpetraCrsMatrix__SWIG_32(source, copyorview) & farg1 = source%swigdata farg2 = copyorview -fresult = swigc_new_TpetraCrsMatrix__SWIG_32(farg1, farg2) +fresult = swigc_new_TpetraCrsMatrix__SWIG_28(farg1, farg2) self%swigdata = fresult end function @@ -8506,7 +8157,28 @@ subroutine swigf_TpetraCrsMatrix_insertGlobalValues(self, globalrow, cols, vals) call swigc_TpetraCrsMatrix_insertGlobalValues(farg1, farg2, farg3, farg4) end subroutine -subroutine swigf_TpetraCrsMatrix_insertLocalValues(self, localrow, cols, vals) +subroutine swigf_TpetraCrsMatrix_insertLocalValues__SWIG_0(self, localrow, cols, vals, cm) +use, intrinsic :: ISO_C_BINDING +class(TpetraCrsMatrix), intent(in) :: self +integer, intent(in) :: localrow +integer(C_INT), dimension(:), target :: cols +real(C_DOUBLE), dimension(:), target :: vals +integer(TpetraCombineMode), intent(in) :: cm +type(SwigClassWrapper) :: farg1 +integer(C_INT) :: farg2 +type(SwigArrayWrapper) :: farg3 +type(SwigArrayWrapper) :: farg4 +integer(C_INT) :: farg5 + +farg1 = self%swigdata +farg2 = int(localrow, C_INT) +call SWIGTM_fin_int_Sb__SB_(cols, farg3) +call SWIGTM_fin_double_Sb__SB_(vals, farg4) +farg5 = cm +call swigc_TpetraCrsMatrix_insertLocalValues__SWIG_0(farg1, farg2, farg3, farg4, farg5) +end subroutine + +subroutine swigf_TpetraCrsMatrix_insertLocalValues__SWIG_1(self, localrow, cols, vals) use, intrinsic :: ISO_C_BINDING class(TpetraCrsMatrix), intent(in) :: self integer, intent(in) :: localrow @@ -8521,7 +8193,7 @@ subroutine swigf_TpetraCrsMatrix_insertLocalValues(self, localrow, cols, vals) farg2 = int(localrow, C_INT) call SWIGTM_fin_int_Sb__SB_(cols, farg3) call SWIGTM_fin_double_Sb__SB_(vals, farg4) -call swigc_TpetraCrsMatrix_insertLocalValues(farg1, farg2, farg3, farg4) +call swigc_TpetraCrsMatrix_insertLocalValues__SWIG_1(farg1, farg2, farg3, farg4) end subroutine function swigf_TpetraCrsMatrix_replaceGlobalValues__SWIG_1(self, globalrow, cols, vals) & @@ -8972,7 +8644,7 @@ function swigf_TpetraCrsMatrix_getGlobalNumCols(self) & swig_result = fresult end function -function swigf_TpetraCrsMatrix_getNodeNumRows(self) & +function swigf_TpetraCrsMatrix_getLocalNumRows(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -8981,11 +8653,11 @@ function swigf_TpetraCrsMatrix_getNodeNumRows(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsMatrix_getNodeNumRows(farg1) +fresult = swigc_TpetraCrsMatrix_getLocalNumRows(farg1) swig_result = fresult end function -function swigf_TpetraCrsMatrix_getNodeNumCols(self) & +function swigf_TpetraCrsMatrix_getLocalNumCols(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -8994,7 +8666,7 @@ function swigf_TpetraCrsMatrix_getNodeNumCols(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsMatrix_getNodeNumCols(farg1) +fresult = swigc_TpetraCrsMatrix_getLocalNumCols(farg1) swig_result = fresult end function @@ -9011,7 +8683,7 @@ function swigf_TpetraCrsMatrix_getGlobalNumEntries(self) & swig_result = fresult end function -function swigf_TpetraCrsMatrix_getNodeNumEntries(self) & +function swigf_TpetraCrsMatrix_getLocalNumEntries(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -9020,7 +8692,7 @@ function swigf_TpetraCrsMatrix_getNodeNumEntries(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsMatrix_getNodeNumEntries(farg1) +fresult = swigc_TpetraCrsMatrix_getLocalNumEntries(farg1) swig_result = fresult end function @@ -9069,7 +8741,7 @@ function swigf_TpetraCrsMatrix_getGlobalMaxNumRowEntries(self) & swig_result = fresult end function -function swigf_TpetraCrsMatrix_getNodeMaxNumRowEntries(self) & +function swigf_TpetraCrsMatrix_getLocalMaxNumRowEntries(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING integer(C_SIZE_T) :: swig_result @@ -9078,7 +8750,7 @@ function swigf_TpetraCrsMatrix_getNodeMaxNumRowEntries(self) & type(SwigClassWrapper) :: farg1 farg1 = self%swigdata -fresult = swigc_TpetraCrsMatrix_getNodeMaxNumRowEntries(farg1) +fresult = swigc_TpetraCrsMatrix_getLocalMaxNumRowEntries(farg1) swig_result = fresult end function @@ -9160,19 +8832,6 @@ function swigf_TpetraCrsMatrix_isStorageOptimized(self) & call SWIGTM_fout_bool(fresult, swig_result) end function -function swigf_TpetraCrsMatrix_getProfileType(self) & -result(swig_result) -use, intrinsic :: ISO_C_BINDING -integer(TpetraProfileType) :: swig_result -class(TpetraCrsMatrix), intent(in) :: self -integer(C_INT) :: fresult -type(SwigClassWrapper) :: farg1 - -farg1 = self%swigdata -fresult = swigc_TpetraCrsMatrix_getProfileType(farg1) -swig_result = fresult -end function - function swigf_TpetraCrsMatrix_isStaticGraph(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING @@ -9600,15 +9259,6 @@ subroutine swigf_TpetraCrsMatrix_exportAndFillComplete__SWIG_4(self, destmatrix, call swigc_TpetraCrsMatrix_exportAndFillComplete__SWIG_4(farg1, farg2, farg3, farg4, farg5, farg6, farg7) end subroutine -subroutine swigf_TpetraCrsMatrix_computeGlobalConstants(self) -use, intrinsic :: ISO_C_BINDING -class(TpetraCrsMatrix), intent(in) :: self -type(SwigClassWrapper) :: farg1 - -farg1 = self%swigdata -call swigc_TpetraCrsMatrix_computeGlobalConstants(farg1) -end subroutine - function swigf_TpetraCrsMatrix_haveGlobalConstants(self) & result(swig_result) use, intrinsic :: ISO_C_BINDING @@ -9622,7 +9272,7 @@ function swigf_TpetraCrsMatrix_haveGlobalConstants(self) & call SWIGTM_fout_bool(fresult, swig_result) end function -subroutine swigf_TpetraCrsMatrix_getAllValues__SWIG_1(self, rowpointers, columnindices, values) +subroutine swigf_TpetraCrsMatrix_getAllValues(self, rowpointers, columnindices, values) use, intrinsic :: ISO_C_BINDING class(TpetraCrsMatrix), intent(in) :: self integer(C_SIZE_T), dimension(:), target :: rowpointers @@ -9637,7 +9287,7 @@ subroutine swigf_TpetraCrsMatrix_getAllValues__SWIG_1(self, rowpointers, columni call SWIGTM_fin_size_t_Sb__SB_(rowpointers, farg2) call SWIGTM_fin_int_Sb__SB_(columnindices, farg3) call SWIGTM_fin_double_Sb__SB_(values, farg4) -call swigc_TpetraCrsMatrix_getAllValues__SWIG_1(farg1, farg2, farg3, farg4) +call swigc_TpetraCrsMatrix_getAllValues(farg1, farg2, farg3, farg4) end subroutine subroutine swigf_TpetraCrsMatrix_getGlobalRowCopy__SWIG_1(self, globalrow, indices, values, numentries) diff --git a/src/fortpetra/generated/fortpetraFORTRAN_wrap.cxx b/src/fortpetra/generated/fortpetraFORTRAN_wrap.cxx index 43d1d00c..c61f977b 100644 --- a/src/fortpetra/generated/fortpetraFORTRAN_wrap.cxx +++ b/src/fortpetra/generated/fortpetraFORTRAN_wrap.cxx @@ -1,11 +1,9 @@ /* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.1.0+fortran + * This file was automatically generated by SWIG (https://www.swig.org). + * Version 4.1.1+fortran * - * This file is not intended to be easily readable and contains a number of - * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * Do not make changes to this file unless you know what you are doing - modify + * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ /* @@ -15,12 +13,6 @@ * License-Filename: LICENSE */ - - -#ifndef SWIGFORTRAN -#define SWIGFORTRAN -#endif - /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -146,44 +138,6 @@ #endif -#ifdef __cplusplus -#include -/* SwigValueWrapper is described in swig.swg */ -template class SwigValueWrapper { - struct SwigSmartPointer { - T *ptr; - SwigSmartPointer(T *p) : ptr(p) { } - ~SwigSmartPointer() { delete ptr; } - SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } - } pointer; - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); - SwigValueWrapper(const SwigValueWrapper& rhs); -public: - SwigValueWrapper() : pointer(0) { } - SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } -#if __cplusplus >=201103L - SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } - operator T&&() const { return std::move(*pointer.ptr); } -#else - operator T&() const { return *pointer.ptr; } -#endif - T *operator&() const { return pointer.ptr; } -}; - -template T SwigValueInit() { - return T(); -} - - -#if __cplusplus >=201103L -# define SWIG_STD_MOVE(OBJ) std::move(OBJ) -#else -# define SWIG_STD_MOVE(OBJ) OBJ -#endif - -#endif - - #ifndef SWIGEXTERN # ifdef __cplusplus # define SWIGEXTERN extern @@ -260,6 +214,10 @@ enum AssignmentType { }; } + + +#define SWIG_VERSION 0x040101 +#define SWIGFORTRAN #define SWIGPOLICY_Teuchos_ArrayView_Sl_int_Sg_ swig::ASSIGNMENT_DEFAULT #define SWIGPOLICY_Teuchos_ArrayView_Sl_int_SS_const_Sg_ swig::ASSIGNMENT_DEFAULT #define SWIGPOLICY_Teuchos_ArrayView_Sl_double_Sg_ swig::ASSIGNMENT_DEFAULT @@ -332,6 +290,54 @@ enum AssignmentType { #define SWIGPOLICY_Tpetra_MatrixMarket_Reader_Sl_Tpetra_CrsMatrix_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg__Sg_ swig::ASSIGNMENT_SMARTPTR #define SWIGPOLICY_Tpetra_MatrixMarket_Writer_Sl_Tpetra_CrsMatrix_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg__Sg_ swig::ASSIGNMENT_SMARTPTR +#ifdef __cplusplus +#include +/* SwigValueWrapper is described in swig.swg */ +template class SwigValueWrapper { + struct SwigSmartPointer { + T *ptr; + SwigSmartPointer(T *p) : ptr(p) { } + ~SwigSmartPointer() { delete ptr; } + SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); +public: + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } +#if __cplusplus >=201103L + SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } + operator T&&() const { return std::move(*pointer.ptr); } +#else + operator T&() const { return *pointer.ptr; } +#endif + T *operator&() const { return pointer.ptr; } + static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); } +}; + +/* + * SwigValueInit() is a generic initialisation solution as the following approach: + * + * T c_result = T(); + * + * doesn't compile for all types for example: + * + * unsigned int c_result = unsigned int(); + */ +template T SwigValueInit() { + return T(); +} + +#if __cplusplus >=201103L +# define SWIG_STD_MOVE(OBJ) std::move(OBJ) +#else +# define SWIG_STD_MOVE(OBJ) OBJ +#endif + +#endif + + #include @@ -344,10 +350,6 @@ enum AssignmentType { if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } -#define SWIGVERSION 0x040100 -#define SWIG_VERSION SWIGVERSION - - #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) @@ -540,40 +542,40 @@ SWIGINTERN void SWIG_free_rvalue(SwigClassWrapper other) { #include #include -SWIGINTERN size_t Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumSameIDs__SWIG(Tpetra::Import< LO,GO,NO > const *self){ +SWIGINTERN size_t Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumSameIDs(Tpetra::Import< LO,GO,NO > const *self){ return self->getNumSameIDs(); } -SWIGINTERN size_t Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumPermuteIDs__SWIG(Tpetra::Import< LO,GO,NO > const *self){ +SWIGINTERN size_t Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumPermuteIDs(Tpetra::Import< LO,GO,NO > const *self){ return self->getNumPermuteIDs(); } -SWIGINTERN size_t Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumRemoteIDs__SWIG(Tpetra::Import< LO,GO,NO > const *self){ +SWIGINTERN size_t Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumRemoteIDs(Tpetra::Import< LO,GO,NO > const *self){ return self->getNumRemoteIDs(); } -SWIGINTERN size_t Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumExportIDs__SWIG(Tpetra::Import< LO,GO,NO > const *self){ +SWIGINTERN size_t Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumExportIDs(Tpetra::Import< LO,GO,NO > const *self){ return self->getNumExportIDs(); } -SWIGINTERN Teuchos::RCP< Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType >::map_type const > Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getSourceMap__SWIG(Tpetra::Import< LO,GO,NO > const *self){ +SWIGINTERN Teuchos::RCP< Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType >::map_type const > Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getSourceMap(Tpetra::Import< LO,GO,NO > const *self){ return self->getSourceMap(); } -SWIGINTERN Teuchos::RCP< Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType >::map_type const > Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getTargetMap__SWIG(Tpetra::Import< LO,GO,NO > const *self){ +SWIGINTERN Teuchos::RCP< Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType >::map_type const > Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getTargetMap(Tpetra::Import< LO,GO,NO > const *self){ return self->getTargetMap(); } -SWIGINTERN size_t Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumSameIDs__SWIG(Tpetra::Export< LO,GO,NO > const *self){ +SWIGINTERN size_t Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumSameIDs(Tpetra::Export< LO,GO,NO > const *self){ return self->getNumSameIDs(); } -SWIGINTERN size_t Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumPermuteIDs__SWIG(Tpetra::Export< LO,GO,NO > const *self){ +SWIGINTERN size_t Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumPermuteIDs(Tpetra::Export< LO,GO,NO > const *self){ return self->getNumPermuteIDs(); } -SWIGINTERN size_t Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumRemoteIDs__SWIG(Tpetra::Export< LO,GO,NO > const *self){ +SWIGINTERN size_t Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumRemoteIDs(Tpetra::Export< LO,GO,NO > const *self){ return self->getNumRemoteIDs(); } -SWIGINTERN size_t Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumExportIDs__SWIG(Tpetra::Export< LO,GO,NO > const *self){ +SWIGINTERN size_t Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumExportIDs(Tpetra::Export< LO,GO,NO > const *self){ return self->getNumExportIDs(); } -SWIGINTERN Teuchos::RCP< Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType >::map_type const > Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getSourceMap__SWIG(Tpetra::Export< LO,GO,NO > const *self){ +SWIGINTERN Teuchos::RCP< Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType >::map_type const > Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getSourceMap(Tpetra::Export< LO,GO,NO > const *self){ return self->getSourceMap(); } -SWIGINTERN Teuchos::RCP< Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType >::map_type const > Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getTargetMap__SWIG(Tpetra::Export< LO,GO,NO > const *self){ +SWIGINTERN Teuchos::RCP< Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType >::map_type const > Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getTargetMap(Tpetra::Export< LO,GO,NO > const *self){ return self->getTargetMap(); } @@ -694,15 +696,8 @@ SwigClassWrapper swigd_ForTpetraOperator_getRangeMap( #include -SWIGINTERN void Tpetra_CrsGraph_Sl_LO_Sc_GO_Sc_NO_Sg__getNodeRowPtrs__SWIG(Tpetra::CrsGraph< LO,GO,NO > const *self,Teuchos::ArrayView< size_t > rowPointers){ - auto rowPointersArrayRCP = self->getNodeRowPtrs(); - TEUCHOS_TEST_FOR_EXCEPTION(rowPointersArrayRCP.size() != rowPointers.size(), std::runtime_error, "Wrong rowPointers size"); - auto n = rowPointers.size(); - for (int i = 0; i < n; i++) - rowPointers[i] = rowPointersArrayRCP[i]+1; - } -SWIGINTERN void Tpetra_CrsGraph_Sl_LO_Sc_GO_Sc_NO_Sg__getNodePackedIndices__SWIG(Tpetra::CrsGraph< LO,GO,NO > const *self,Teuchos::ArrayView< size_t > columnIndices){ - auto columnIndicesArrayRCP = self->getNodeRowPtrs(); +SWIGINTERN void Tpetra_CrsGraph_Sl_LO_Sc_GO_Sc_NO_Sg__getLocalPackedIndices(Tpetra::CrsGraph< LO,GO,NO > const *self,Teuchos::ArrayView< size_t > columnIndices){ + auto columnIndicesArrayRCP = self->getLocalRowPtrsHost(); TEUCHOS_TEST_FOR_EXCEPTION(columnIndicesArrayRCP.size() != columnIndices.size(), std::runtime_error, "Wrong columnIndices size"); auto nnz = columnIndices.size(); for (int i = 0; i < nnz; i++) @@ -731,22 +726,22 @@ SWIGINTERN void Tpetra_CrsGraph_Sl_LO_Sc_GO_Sc_NO_Sg__doExport__SWIG_1(Tpetra::C #include -SWIGINTERN void Tpetra_CrsMatrix_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg__getAllValues__SWIG_1(Tpetra::CrsMatrix< SC,LO,GO,NO > const *self,Teuchos::ArrayView< size_t > rowPointers,Teuchos::ArrayView< LO > columnIndices,Teuchos::ArrayView< SC > values){ - Teuchos::ArrayRCP rowPointersArrayRCP; - Teuchos::ArrayRCP columnIndicesArrayRCP; - Teuchos::ArrayRCP valuesArrayRCP; - self->getAllValues(rowPointersArrayRCP, columnIndicesArrayRCP, valuesArrayRCP); - TEUCHOS_TEST_FOR_EXCEPTION(rowPointersArrayRCP.size() != rowPointers.size(), std::runtime_error, "Wrong rowPointers size"); - TEUCHOS_TEST_FOR_EXCEPTION(columnIndicesArrayRCP.size() != columnIndices.size(), std::runtime_error, "Wrong columnIndices size"); - TEUCHOS_TEST_FOR_EXCEPTION(valuesArrayRCP.size() != values.size(), std::runtime_error, "Wrong values size"); - auto n = rowPointers.size(); - for (int i = 0; i < n; i++) - rowPointers[i] = rowPointersArrayRCP[i]+1; - auto nnz = columnIndices.size(); - for (int i = 0; i < nnz; i++) { - columnIndices[i] = columnIndicesArrayRCP[i]+1; - values [i] = valuesArrayRCP[i]; - } +SWIGINTERN void Tpetra_CrsMatrix_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg__getAllValues(Tpetra::CrsMatrix< SC,LO,GO,NO > const *self,Teuchos::ArrayView< size_t > rowPointers,Teuchos::ArrayView< LO > columnIndices,Teuchos::ArrayView< SC > values){ + auto rowptr = self->getLocalRowPtrsHost(); + auto colidx = self->getLocalIndicesHost(); + auto val = self->getLocalValuesHost(Tpetra::Access::ReadOnly); + + TEUCHOS_TEST_FOR_EXCEPTION(rowptr.size() != rowPointers.size(), std::runtime_error, "Wrong rowPointers size"); + TEUCHOS_TEST_FOR_EXCEPTION(colidx.size() != columnIndices.size(), std::runtime_error, "Wrong columnIndices size"); + TEUCHOS_TEST_FOR_EXCEPTION(val.size() != values.size(), std::runtime_error, "Wrong values size"); + auto n = rowPointers.size(); + for (int i = 0; i < n; i++) + rowPointers[i] = rowptr[i]+1; + auto nnz = columnIndices.size(); + for (int i = 0; i < nnz; i++) { + columnIndices[i] = colidx[i]+1; + values [i] = val[i]; + } } SWIGINTERN void Tpetra_CrsMatrix_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg__getGlobalRowCopy__SWIG_1(Tpetra::CrsMatrix< SC,LO,GO,NO > const *self,GO GlobalRow,Teuchos::ArrayView< GO > const &Indices,Teuchos::ArrayView< SC > const &Values,size_t &NumEntries){ Tpetra::CrsMatrix::nonconst_global_inds_host_view_type temp_i(Indices.data(), Indices.size()); @@ -1188,7 +1183,7 @@ SWIGEXPORT size_t _wrap_TpetraMap_getGlobalNumElements(SwigClassWrapper *farg1) } -SWIGEXPORT int _wrap_TpetraMap_getNodeNumElements(SwigClassWrapper *farg1) { +SWIGEXPORT int _wrap_TpetraMap_getLocalNumElements(SwigClassWrapper *farg1) { int fresult ; Tpetra::Map< LO,GO,NO > *arg1 = (Tpetra::Map< LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::Map< LO,GO,NO > const > *smartarg1 ; @@ -1198,25 +1193,25 @@ SWIGEXPORT int _wrap_TpetraMap_getNodeNumElements(SwigClassWrapper *farg1) { arg1 = smartarg1 ? (Tpetra::Map*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::Map< LO,GO,NO >::getNodeNumElements() const");; + SWIG_check_unhandled_exception_impl("Tpetra::Map< LO,GO,NO >::getLocalNumElements() const");; try { // Attempt the wrapped function call - result = ((Tpetra::Map< LO,GO,NO > const *)arg1)->getNodeNumElements(); + result = ((Tpetra::Map< LO,GO,NO > const *)arg1)->getLocalNumElements(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getNodeNumElements() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getLocalNumElements() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getNodeNumElements() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getLocalNumElements() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getNodeNumElements() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getLocalNumElements() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -1614,7 +1609,7 @@ SWIGEXPORT int _wrap_TpetraMap_getRemoteIndexList__SWIG_1(SwigClassWrapper *farg } -SWIGEXPORT SwigArrayWrapper _wrap_TpetraMap_getNodeElementList(SwigClassWrapper *farg1) { +SWIGEXPORT SwigArrayWrapper _wrap_TpetraMap_getLocalElementList(SwigClassWrapper *farg1) { SwigArrayWrapper fresult ; Tpetra::Map< LO,GO,NO > *arg1 = (Tpetra::Map< LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::Map< LO,GO,NO > const > *smartarg1 ; @@ -1624,25 +1619,25 @@ SWIGEXPORT SwigArrayWrapper _wrap_TpetraMap_getNodeElementList(SwigClassWrapper arg1 = smartarg1 ? (Tpetra::Map*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::Map< LO,GO,NO >::getNodeElementList() const");; + SWIG_check_unhandled_exception_impl("Tpetra::Map< LO,GO,NO >::getLocalElementList() const");; try { // Attempt the wrapped function call - result = ((Tpetra::Map< LO,GO,NO > const *)arg1)->getNodeElementList(); + result = ((Tpetra::Map< LO,GO,NO > const *)arg1)->getLocalElementList(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getNodeElementList() const", -4, e.what(), return SwigArrayWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getLocalElementList() const", -4, e.what(), return SwigArrayWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getNodeElementList() const", -3, e.what(), return SwigArrayWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getLocalElementList() const", -3, e.what(), return SwigArrayWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getNodeElementList() const", -1, "An unknown exception occurred", return SwigArrayWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::Map< LO,GO,NO >::getLocalElementList() const", -1, "An unknown exception occurred", return SwigArrayWrapper_uninitialized()); } } fresult.data = (void*)(&result)->getRawPtr(); @@ -2454,7 +2449,7 @@ SWIGEXPORT size_t _wrap_TpetraImport_getNumSameIDs(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumSameIDs__SWIG((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumSameIDs((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2490,7 +2485,7 @@ SWIGEXPORT size_t _wrap_TpetraImport_getNumPermuteIDs(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumPermuteIDs__SWIG((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumPermuteIDs((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2526,7 +2521,7 @@ SWIGEXPORT size_t _wrap_TpetraImport_getNumRemoteIDs(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumRemoteIDs__SWIG((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumRemoteIDs((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2562,7 +2557,7 @@ SWIGEXPORT size_t _wrap_TpetraImport_getNumExportIDs(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumExportIDs__SWIG((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getNumExportIDs((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2598,7 +2593,7 @@ SWIGEXPORT SwigClassWrapper _wrap_TpetraImport_getSourceMap(SwigClassWrapper *fa try { // Attempt the wrapped function call - result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getSourceMap__SWIG((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getSourceMap((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2635,7 +2630,7 @@ SWIGEXPORT SwigClassWrapper _wrap_TpetraImport_getTargetMap(SwigClassWrapper *fa try { // Attempt the wrapped function call - result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getTargetMap__SWIG((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Import_Sl_LO_Sc_GO_Sc_NO_Sg__getTargetMap((Tpetra::Import< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2848,7 +2843,7 @@ SWIGEXPORT size_t _wrap_TpetraExport_getNumSameIDs(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumSameIDs__SWIG((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumSameIDs((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2884,7 +2879,7 @@ SWIGEXPORT size_t _wrap_TpetraExport_getNumPermuteIDs(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumPermuteIDs__SWIG((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumPermuteIDs((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2920,7 +2915,7 @@ SWIGEXPORT size_t _wrap_TpetraExport_getNumRemoteIDs(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumRemoteIDs__SWIG((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumRemoteIDs((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2956,7 +2951,7 @@ SWIGEXPORT size_t _wrap_TpetraExport_getNumExportIDs(SwigClassWrapper *farg1) { try { // Attempt the wrapped function call - result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumExportIDs__SWIG((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getNumExportIDs((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -2992,7 +2987,7 @@ SWIGEXPORT SwigClassWrapper _wrap_TpetraExport_getSourceMap(SwigClassWrapper *fa try { // Attempt the wrapped function call - result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getSourceMap__SWIG((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getSourceMap((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -3029,7 +3024,7 @@ SWIGEXPORT SwigClassWrapper _wrap_TpetraExport_getTargetMap(SwigClassWrapper *fa try { // Attempt the wrapped function call - result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getTargetMap__SWIG((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); + result = Tpetra_Export_Sl_LO_Sc_GO_Sc_NO_Sg__getTargetMap((Tpetra::Export< int,long long,ForTrilinos::DefaultNodeType > const *)arg1); } catch (const std::range_error& e) { @@ -5753,81 +5748,39 @@ SWIGEXPORT void _wrap_RowInfo_op_assign__(SwigClassWrapper *farg1, SwigClassWrap } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_0(SwigClassWrapper const *farg1, size_t const *farg2, int const *farg3, SwigClassWrapper const *farg4) { - SwigClassWrapper fresult ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; - size_t arg2 ; - Tpetra::ProfileType arg3 ; - Teuchos::RCP< Teuchos::ParameterList > *arg4 = 0 ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; - Teuchos::RCP< Teuchos::ParameterList > tempnull4 ; - Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; - - arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; - arg2 = (size_t)(*farg2); - arg3 = (Tpetra::ProfileType)(*farg3); - arg4 = farg4->cptr ? static_cast * >(farg4->cptr) : &tempnull4; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)");; - try - { - // Attempt the wrapped function call - result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,arg2,arg3,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg4); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); - } - } - fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsGraph >(result SWIG_NO_NULL_DELETER_1) : NULL; - fresult.cmemflags = SWIG_MEM_OWN | SWIG_MEM_RVALUE; - return fresult; -} - - -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_1(SwigClassWrapper const *farg1, size_t const *farg2, int const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_0(SwigClassWrapper const *farg1, size_t const *farg2, SwigClassWrapper const *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; size_t arg2 ; - Tpetra::ProfileType arg3 ; + Teuchos::RCP< Teuchos::ParameterList > *arg3 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; + Teuchos::RCP< Teuchos::ParameterList > tempnull3 ; Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; arg2 = (size_t)(*farg2); - arg3 = (Tpetra::ProfileType)(*farg3); + arg3 = farg3->cptr ? static_cast * >(farg3->cptr) : &tempnull3; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)");; try { // Attempt the wrapped function call - result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,arg2,arg3); + result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,arg2,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg3); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -4, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -3, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); } } fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsGraph >(result SWIG_NO_NULL_DELETER_1) : NULL; @@ -5836,7 +5789,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_1(SwigClassWrapper co } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_2(SwigClassWrapper const *farg1, size_t const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_1(SwigClassWrapper const *farg1, size_t const *farg2) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; size_t arg2 ; @@ -5874,85 +5827,41 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_2(SwigClassWrapper co } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_6(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, int const *farg3, SwigClassWrapper const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_4(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, SwigClassWrapper const *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::ArrayView< size_t const > *arg2 = 0 ; - Tpetra::ProfileType arg3 ; - Teuchos::RCP< Teuchos::ParameterList > *arg4 = 0 ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; - Teuchos::ArrayView< size_t const > tmpview2 ; - Teuchos::RCP< Teuchos::ParameterList > tempnull4 ; - Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; - - arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; - tmpview2 = Teuchos::ArrayView(static_cast(farg2->data), farg2->size); - arg2 = &tmpview2; - arg3 = (Tpetra::ProfileType)(*farg3); - arg4 = farg4->cptr ? static_cast * >(farg4->cptr) : &tempnull4; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)");; - try - { - // Attempt the wrapped function call - result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::ArrayView< size_t const > const &)*arg2,arg3,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg4); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); - } - } - fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsGraph >(result SWIG_NO_NULL_DELETER_1) : NULL; - fresult.cmemflags = SWIG_MEM_OWN | SWIG_MEM_RVALUE; - return fresult; -} - - -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_7(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, int const *farg3) { - SwigClassWrapper fresult ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; - Teuchos::ArrayView< size_t const > *arg2 = 0 ; - Tpetra::ProfileType arg3 ; + Teuchos::RCP< Teuchos::ParameterList > *arg3 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; Teuchos::ArrayView< size_t const > tmpview2 ; + Teuchos::RCP< Teuchos::ParameterList > tempnull3 ; Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; tmpview2 = Teuchos::ArrayView(static_cast(farg2->data), farg2->size); arg2 = &tmpview2; - arg3 = (Tpetra::ProfileType)(*farg3); + arg3 = farg3->cptr ? static_cast * >(farg3->cptr) : &tempnull3; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)");; try { // Attempt the wrapped function call - result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::ArrayView< size_t const > const &)*arg2,arg3); + result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::ArrayView< size_t const > const &)*arg2,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg3); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -4, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -3, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); } } fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsGraph >(result SWIG_NO_NULL_DELETER_1) : NULL; @@ -5961,7 +5870,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_7(SwigClassWrapper co } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_8(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_5(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::ArrayView< size_t const > *arg2 = 0 ; @@ -6001,87 +5910,42 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_8(SwigClassWrapper co } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_9(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3, int const *farg4, SwigClassWrapper const *farg5) { - SwigClassWrapper fresult ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; - size_t arg3 ; - Tpetra::ProfileType arg4 ; - Teuchos::RCP< Teuchos::ParameterList > *arg5 = 0 ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull2 ; - Teuchos::RCP< Teuchos::ParameterList > tempnull5 ; - Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; - - arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; - arg2 = farg2->cptr ? static_cast::map_type const > * >(farg2->cptr) : &tempnull2; - arg3 = (size_t)(*farg3); - arg4 = (Tpetra::ProfileType)(*farg4); - arg5 = farg5->cptr ? static_cast * >(farg5->cptr) : &tempnull5; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)");; - try - { - // Attempt the wrapped function call - result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,arg3,arg4,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg5); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); - } - } - fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsGraph >(result SWIG_NO_NULL_DELETER_1) : NULL; - fresult.cmemflags = SWIG_MEM_OWN | SWIG_MEM_RVALUE; - return fresult; -} - - -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_10(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3, int const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_6(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3, SwigClassWrapper const *farg4) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; size_t arg3 ; - Tpetra::ProfileType arg4 ; + Teuchos::RCP< Teuchos::ParameterList > *arg4 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull2 ; + Teuchos::RCP< Teuchos::ParameterList > tempnull4 ; Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; arg2 = farg2->cptr ? static_cast::map_type const > * >(farg2->cptr) : &tempnull2; arg3 = (size_t)(*farg3); - arg4 = (Tpetra::ProfileType)(*farg4); + arg4 = farg4->cptr ? static_cast * >(farg4->cptr) : &tempnull4; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)");; try { // Attempt the wrapped function call - result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,arg3,arg4); + result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,arg3,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg4); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -4, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -3, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); } } fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsGraph >(result SWIG_NO_NULL_DELETER_1) : NULL; @@ -6090,7 +5954,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_10(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_11(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_7(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -6131,91 +5995,44 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_11(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_15(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, int const *farg4, SwigClassWrapper const *farg5) { - SwigClassWrapper fresult ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; - Teuchos::ArrayView< size_t const > *arg3 = 0 ; - Tpetra::ProfileType arg4 ; - Teuchos::RCP< Teuchos::ParameterList > *arg5 = 0 ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; - Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull2 ; - Teuchos::ArrayView< size_t const > tmpview3 ; - Teuchos::RCP< Teuchos::ParameterList > tempnull5 ; - Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; - - arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; - arg2 = farg2->cptr ? static_cast::map_type const > * >(farg2->cptr) : &tempnull2; - tmpview3 = Teuchos::ArrayView(static_cast(farg3->data), farg3->size); - arg3 = &tmpview3; - arg4 = (Tpetra::ProfileType)(*farg4); - arg5 = farg5->cptr ? static_cast * >(farg5->cptr) : &tempnull5; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)");; - try - { - // Attempt the wrapped function call - result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,(Teuchos::ArrayView< size_t const > const &)*arg3,arg4,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg5); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); - } - } - fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsGraph >(result SWIG_NO_NULL_DELETER_1) : NULL; - fresult.cmemflags = SWIG_MEM_OWN | SWIG_MEM_RVALUE; - return fresult; -} - - -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_16(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, int const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_10(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigClassWrapper const *farg4) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; Teuchos::ArrayView< size_t const > *arg3 = 0 ; - Tpetra::ProfileType arg4 ; + Teuchos::RCP< Teuchos::ParameterList > *arg4 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull2 ; Teuchos::ArrayView< size_t const > tmpview3 ; + Teuchos::RCP< Teuchos::ParameterList > tempnull4 ; Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; arg2 = farg2->cptr ? static_cast::map_type const > * >(farg2->cptr) : &tempnull2; tmpview3 = Teuchos::ArrayView(static_cast(farg3->data), farg3->size); arg3 = &tmpview3; - arg4 = (Tpetra::ProfileType)(*farg4); + arg4 = farg4->cptr ? static_cast * >(farg4->cptr) : &tempnull4; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)");; try { // Attempt the wrapped function call - result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,(Teuchos::ArrayView< size_t const > const &)*arg3,arg4); + result = (Tpetra::CrsGraph< LO,GO,NO > *)new Tpetra::CrsGraph< LO,GO,NO >((Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,(Teuchos::ArrayView< size_t const > const &)*arg3,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg4); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -4, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -3, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::CrsGraph(Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); } } fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsGraph >(result SWIG_NO_NULL_DELETER_1) : NULL; @@ -6224,7 +6041,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_16(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_17(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_11(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -6267,7 +6084,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_17(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_18(SwigClassWrapper *farg1, SwigClassWrapper const *farg2, SwigClassWrapper const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_12(SwigClassWrapper *farg1, SwigClassWrapper const *farg2, SwigClassWrapper const *farg3) { 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< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -6309,7 +6126,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_18(SwigClassWrapper * } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_19(SwigClassWrapper *farg1, SwigClassWrapper const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_13(SwigClassWrapper *farg1, SwigClassWrapper const *farg2) { 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< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -6348,7 +6165,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_19(SwigClassWrapper * } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_22(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, SwigClassWrapper const *farg5) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_16(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, SwigClassWrapper const *farg5) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -6410,7 +6227,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_22(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_23(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_17(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg2 = 0 ; @@ -6469,7 +6286,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_23(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_31(SwigClassWrapper *farg1) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsGraph__SWIG_25(SwigClassWrapper *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 ; Tpetra::CrsGraph< LO,GO,NO > *result = 0 ; @@ -7488,7 +7305,7 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getGlobalNumCols(SwigClassWrapper *farg1) } -SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeNumRows(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsGraph_getLocalNumRows(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; @@ -7498,25 +7315,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeNumRows(SwigClassWrapper *farg1) { arg1 = smartarg1 ? (Tpetra::CrsGraph*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumRows() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumRows() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getNodeNumRows(); + result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getLocalNumRows(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumRows() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumRows() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumRows() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumRows() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumRows() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumRows() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -7524,7 +7341,7 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeNumRows(SwigClassWrapper *farg1) { } -SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeNumCols(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsGraph_getLocalNumCols(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; @@ -7534,25 +7351,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeNumCols(SwigClassWrapper *farg1) { arg1 = smartarg1 ? (Tpetra::CrsGraph*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumCols() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumCols() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getNodeNumCols(); + result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getLocalNumCols(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumCols() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumCols() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumCols() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumCols() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumCols() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumCols() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -7596,7 +7413,7 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getGlobalNumEntries(SwigClassWrapper *far } -SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeNumEntries(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsGraph_getLocalNumEntries(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; @@ -7606,25 +7423,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeNumEntries(SwigClassWrapper *farg1 arg1 = smartarg1 ? (Tpetra::CrsGraph*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumEntries() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumEntries() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getNodeNumEntries(); + result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getLocalNumEntries(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumEntries() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumEntries() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumEntries() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumEntries() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeNumEntries() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalNumEntries() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -7708,7 +7525,7 @@ SWIGEXPORT int _wrap_TpetraCrsGraph_getNumEntriesInLocalRow(SwigClassWrapper *fa } -SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeAllocationSize(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsGraph_getLocalAllocationSize(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; @@ -7718,25 +7535,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeAllocationSize(SwigClassWrapper *f arg1 = smartarg1 ? (Tpetra::CrsGraph*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeAllocationSize() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalAllocationSize() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getNodeAllocationSize(); + result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getLocalAllocationSize(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeAllocationSize() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalAllocationSize() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeAllocationSize() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalAllocationSize() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeAllocationSize() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalAllocationSize() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -7856,7 +7673,7 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getGlobalMaxNumRowEntries(SwigClassWrappe } -SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeMaxNumRowEntries(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsGraph_getLocalMaxNumRowEntries(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; @@ -7866,25 +7683,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsGraph_getNodeMaxNumRowEntries(SwigClassWrapper arg1 = smartarg1 ? (Tpetra::CrsGraph*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeMaxNumRowEntries() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalMaxNumRowEntries() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getNodeMaxNumRowEntries(); + result = ((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getLocalMaxNumRowEntries(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeMaxNumRowEntries() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalMaxNumRowEntries() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeMaxNumRowEntries() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalMaxNumRowEntries() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeMaxNumRowEntries() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalMaxNumRowEntries() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -8144,57 +7961,21 @@ SWIGEXPORT int _wrap_TpetraCrsGraph_isStorageOptimized(SwigClassWrapper *farg1) } -SWIGEXPORT int _wrap_TpetraCrsGraph_getProfileType(SwigClassWrapper *farg1) { +SWIGEXPORT int _wrap_TpetraCrsGraph_supportsRowViews(SwigClassWrapper *farg1) { int fresult ; Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; - Tpetra::ProfileType result; + bool result; smartarg1 = (Teuchos::RCP >*)(farg1->cptr); arg1 = smartarg1 ? (Tpetra::CrsGraph*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getProfileType() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::supportsRowViews() const");; try { // Attempt the wrapped function call - result = (Tpetra::ProfileType)((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->getProfileType(); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getProfileType() const", -4, e.what(), return 0); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getProfileType() const", -3, e.what(), return 0); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getProfileType() const", -1, "An unknown exception occurred", return 0); - } - } - fresult = (int)(result); - return fresult; -} - - -SWIGEXPORT int _wrap_TpetraCrsGraph_supportsRowViews(SwigClassWrapper *farg1) { - int fresult ; - Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; - Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; - bool result; - - smartarg1 = (Teuchos::RCP >*)(farg1->cptr); - arg1 = smartarg1 ? (Tpetra::CrsGraph*)(smartarg1->get()) : NULL; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::supportsRowViews() const");; - try - { - // Attempt the wrapped function call - result = (bool)((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->supportsRowViews(); + result = (bool)((Tpetra::CrsGraph< LO,GO,NO > const *)arg1)->supportsRowViews(); } catch (const std::range_error& e) { @@ -9097,7 +8878,7 @@ SWIGEXPORT int _wrap_TpetraCrsGraph_haveLocalOffRankOffsets(SwigClassWrapper *fa } -SWIGEXPORT void _wrap_TpetraCrsGraph_getNodeRowPtrs(SwigClassWrapper *farg1, SwigArrayWrapper *farg2) { +SWIGEXPORT void _wrap_TpetraCrsGraph_getLocalPackedIndices(SwigClassWrapper *farg1, SwigArrayWrapper *farg2) { Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; Teuchos::ArrayView< size_t > arg2 ; Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; @@ -9107,59 +8888,25 @@ SWIGEXPORT void _wrap_TpetraCrsGraph_getNodeRowPtrs(SwigClassWrapper *farg1, Swi arg2 = Teuchos::ArrayView(static_cast(farg2->data), farg2->size); { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeRowPtrs(Teuchos::ArrayView< size_t >) const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalPackedIndices(Teuchos::ArrayView< size_t >) const");; try { // Attempt the wrapped function call - Tpetra_CrsGraph_Sl_LO_Sc_GO_Sc_NO_Sg__getNodeRowPtrs__SWIG((Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType > const *)arg1,SWIG_STD_MOVE(arg2)); + Tpetra_CrsGraph_Sl_LO_Sc_GO_Sc_NO_Sg__getLocalPackedIndices((Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType > const *)arg1,SWIG_STD_MOVE(arg2)); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeRowPtrs(Teuchos::ArrayView< size_t >) const", -4, e.what(), return ); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalPackedIndices(Teuchos::ArrayView< size_t >) const", -4, e.what(), return ); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeRowPtrs(Teuchos::ArrayView< size_t >) const", -3, e.what(), return ); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalPackedIndices(Teuchos::ArrayView< size_t >) const", -3, e.what(), return ); } catch (...) { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodeRowPtrs(Teuchos::ArrayView< size_t >) const", -1, "An unknown exception occurred", return ); - } - } -} - - -SWIGEXPORT void _wrap_TpetraCrsGraph_getNodePackedIndices(SwigClassWrapper *farg1, SwigArrayWrapper *farg2) { - Tpetra::CrsGraph< LO,GO,NO > *arg1 = (Tpetra::CrsGraph< LO,GO,NO > *) 0 ; - Teuchos::ArrayView< size_t > arg2 ; - Teuchos::RCP< Tpetra::CrsGraph< LO,GO,NO > const > *smartarg1 ; - - smartarg1 = (Teuchos::RCP >*)(farg1->cptr); - arg1 = smartarg1 ? (Tpetra::CrsGraph*)(smartarg1->get()) : NULL; - arg2 = Teuchos::ArrayView(static_cast(farg2->data), farg2->size); - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodePackedIndices(Teuchos::ArrayView< size_t >) const");; - try - { - // Attempt the wrapped function call - Tpetra_CrsGraph_Sl_LO_Sc_GO_Sc_NO_Sg__getNodePackedIndices__SWIG((Tpetra::CrsGraph< int,long long,ForTrilinos::DefaultNodeType > const *)arg1,SWIG_STD_MOVE(arg2)); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodePackedIndices(Teuchos::ArrayView< size_t >) const", -4, e.what(), return ); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodePackedIndices(Teuchos::ArrayView< size_t >) const", -3, e.what(), return ); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getNodePackedIndices(Teuchos::ArrayView< size_t >) const", -1, "An unknown exception occurred", return ); + SWIG_exception_impl("Tpetra::CrsGraph< LO,GO,NO >::getLocalPackedIndices(Teuchos::ArrayView< size_t >) const", -1, "An unknown exception occurred", return ); } } } @@ -9456,81 +9203,39 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_0(SwigClassWrapper * } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_2(SwigClassWrapper const *farg1, size_t const *farg2, int const *farg3, SwigClassWrapper const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_2(SwigClassWrapper const *farg1, size_t const *farg2, SwigClassWrapper const *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; size_t arg2 ; - Tpetra::ProfileType arg3 ; - Teuchos::RCP< Teuchos::ParameterList > *arg4 = 0 ; - Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; - Teuchos::RCP< Teuchos::ParameterList > tempnull4 ; - Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; - - arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; - arg2 = (size_t)(*farg2); - arg3 = (Tpetra::ProfileType)(*farg3); - arg4 = farg4->cptr ? static_cast * >(farg4->cptr) : &tempnull4; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)");; - try - { - // Attempt the wrapped function call - result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,arg2,arg3,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg4); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "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; - return fresult; -} - - -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 ; - Tpetra::ProfileType arg3 ; + Teuchos::RCP< Teuchos::ParameterList > *arg3 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; + Teuchos::RCP< Teuchos::ParameterList > tempnull3 ; Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; arg2 = (size_t)(*farg2); - arg3 = (Tpetra::ProfileType)(*farg3); + arg3 = farg3->cptr ? static_cast * >(farg3->cptr) : &tempnull3; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)");; try { // Attempt the wrapped function call - result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,arg2,arg3); + result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,arg2,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg3); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -4, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -3, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); } } fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsMatrix >(result SWIG_NO_NULL_DELETER_1) : NULL; @@ -9539,7 +9244,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_3(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_4(SwigClassWrapper const *farg1, size_t const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_3(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 ; @@ -9577,85 +9282,41 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_4(SwigClassWrapper c } -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< size_t const > *arg2 = 0 ; - Tpetra::ProfileType arg3 ; - Teuchos::RCP< Teuchos::ParameterList > *arg4 = 0 ; - Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; - Teuchos::ArrayView< size_t const > tmpview2 ; - Teuchos::RCP< Teuchos::ParameterList > tempnull4 ; - Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; - - arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; - tmpview2 = Teuchos::ArrayView(static_cast(farg2->data), farg2->size); - arg2 = &tmpview2; - arg3 = (Tpetra::ProfileType)(*farg3); - arg4 = farg4->cptr ? static_cast * >(farg4->cptr) : &tempnull4; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)");; - try - { - // Attempt the wrapped function call - result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::ArrayView< size_t const > const &)*arg2,arg3,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg4); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "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; - return fresult; -} - - -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_6(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, int const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_4(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2, SwigClassWrapper const *farg3) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::ArrayView< size_t const > *arg2 = 0 ; - Tpetra::ProfileType arg3 ; + Teuchos::RCP< Teuchos::ParameterList > *arg3 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; Teuchos::ArrayView< size_t const > tmpview2 ; + Teuchos::RCP< Teuchos::ParameterList > tempnull3 ; Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; tmpview2 = Teuchos::ArrayView(static_cast(farg2->data), farg2->size); arg2 = &tmpview2; - arg3 = (Tpetra::ProfileType)(*farg3); + arg3 = farg3->cptr ? static_cast * >(farg3->cptr) : &tempnull3; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)");; try { // Attempt the wrapped function call - result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::ArrayView< size_t const > const &)*arg2,arg3); + result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::ArrayView< size_t const > const &)*arg2,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg3); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -4, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -3, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); } } fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsMatrix >(result SWIG_NO_NULL_DELETER_1) : NULL; @@ -9664,7 +9325,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_6(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_7(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_5(SwigClassWrapper const *farg1, SwigArrayWrapper *farg2) { SwigClassWrapper fresult ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > *arg1 = 0 ; Teuchos::ArrayView< size_t const > *arg2 = 0 ; @@ -9704,87 +9365,42 @@ 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, int const *farg4, SwigClassWrapper const *farg5) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_6(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3, SwigClassWrapper 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 ; size_t arg3 ; - Tpetra::ProfileType arg4 ; - Teuchos::RCP< Teuchos::ParameterList > *arg5 = 0 ; - Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; - Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull2 ; - Teuchos::RCP< Teuchos::ParameterList > tempnull5 ; - Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; - - arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; - arg2 = farg2->cptr ? static_cast::map_type const > * >(farg2->cptr) : &tempnull2; - arg3 = (size_t)(*farg3); - arg4 = (Tpetra::ProfileType)(*farg4); - arg5 = farg5->cptr ? static_cast * >(farg5->cptr) : &tempnull5; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)");; - try - { - // Attempt the wrapped function call - result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,arg3,arg4,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg5); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "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; - return fresult; -} - - -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 ; - size_t arg3 ; - Tpetra::ProfileType arg4 ; + Teuchos::RCP< Teuchos::ParameterList > *arg4 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull2 ; + Teuchos::RCP< Teuchos::ParameterList > tempnull4 ; Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; arg2 = farg2->cptr ? static_cast::map_type const > * >(farg2->cptr) : &tempnull2; arg3 = (size_t)(*farg3); - arg4 = (Tpetra::ProfileType)(*farg4); + arg4 = farg4->cptr ? static_cast * >(farg4->cptr) : &tempnull4; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)");; try { // Attempt the wrapped function call - result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,arg3,arg4); + result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,arg3,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg4); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -4, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -3, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Tpetra::ProfileType const)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,size_t const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); } } fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsMatrix >(result SWIG_NO_NULL_DELETER_1) : NULL; @@ -9793,7 +9409,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_9(SwigClassWrapper c } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_10(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, size_t const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_7(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 ; @@ -9834,91 +9450,44 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_10(SwigClassWrapper } -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 ; - Teuchos::ArrayView< size_t const > *arg3 = 0 ; - Tpetra::ProfileType arg4 ; - Teuchos::RCP< Teuchos::ParameterList > *arg5 = 0 ; - Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; - Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull2 ; - Teuchos::ArrayView< size_t const > tmpview3 ; - Teuchos::RCP< Teuchos::ParameterList > tempnull5 ; - Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; - - arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; - arg2 = farg2->cptr ? static_cast::map_type const > * >(farg2->cptr) : &tempnull2; - tmpview3 = Teuchos::ArrayView(static_cast(farg3->data), farg3->size); - arg3 = &tmpview3; - arg4 = (Tpetra::ProfileType)(*farg4); - arg5 = farg5->cptr ? static_cast * >(farg5->cptr) : &tempnull5; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)");; - try - { - // Attempt the wrapped function call - result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,(Teuchos::ArrayView< size_t const > const &)*arg3,arg4,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg5); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "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; - return fresult; -} - - -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_12(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, int const *farg4) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_8(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigClassWrapper 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 ; Teuchos::ArrayView< size_t const > *arg3 = 0 ; - Tpetra::ProfileType arg4 ; + Teuchos::RCP< Teuchos::ParameterList > *arg4 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull1 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > tempnull2 ; Teuchos::ArrayView< size_t const > tmpview3 ; + Teuchos::RCP< Teuchos::ParameterList > tempnull4 ; Tpetra::CrsMatrix< SC,LO,GO,NO > *result = 0 ; arg1 = farg1->cptr ? static_cast::map_type const > * >(farg1->cptr) : &tempnull1; arg2 = farg2->cptr ? static_cast::map_type const > * >(farg2->cptr) : &tempnull2; tmpview3 = Teuchos::ArrayView(static_cast(farg3->data), farg3->size); arg3 = &tmpview3; - arg4 = (Tpetra::ProfileType)(*farg4); + arg4 = farg4->cptr ? static_cast * >(farg4->cptr) : &tempnull4; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)");; try { // Attempt the wrapped function call - result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,(Teuchos::ArrayView< size_t const > const &)*arg3,arg4); + result = (Tpetra::CrsMatrix< SC,LO,GO,NO > *)new Tpetra::CrsMatrix< SC,LO,GO,NO >((Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg1,(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &)*arg2,(Teuchos::ArrayView< size_t const > const &)*arg3,(Teuchos::RCP< Teuchos::ParameterList > const &)*arg4); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -4, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -4, e.what(), return SwigClassWrapper_uninitialized()); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -3, e.what(), return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -3, e.what(), return SwigClassWrapper_uninitialized()); } catch (...) { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Tpetra::ProfileType const)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::CrsMatrix(Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::map_type const > const &,Teuchos::ArrayView< size_t const > const &,Teuchos::RCP< Teuchos::ParameterList > const &)", -1, "An unknown exception occurred", return SwigClassWrapper_uninitialized()); } } fresult.cptr = result ? new Teuchos::RCP< Tpetra::CrsMatrix >(result SWIG_NO_NULL_DELETER_1) : NULL; @@ -9927,7 +9496,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_12(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_13(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_9(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 ; @@ -9970,7 +9539,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_13(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_14(SwigClassWrapper *farg1, SwigClassWrapper const *farg2, SwigClassWrapper const *farg3) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_10(SwigClassWrapper *farg1, SwigClassWrapper const *farg2, SwigClassWrapper const *farg3) { SwigClassWrapper fresult ; Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::crs_graph_type const > *arg2 = 0 ; @@ -10012,7 +9581,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_14(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_15(SwigClassWrapper *farg1, SwigClassWrapper const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_11(SwigClassWrapper *farg1, SwigClassWrapper const *farg2) { SwigClassWrapper fresult ; Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > *arg1 = 0 ; Teuchos::RCP< Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType >::crs_graph_type const > *arg2 = 0 ; @@ -10051,7 +9620,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_15(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_16(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_12(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 ; @@ -10090,7 +9659,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_16(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_17(SwigClassWrapper const *farg1) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_13(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 ; @@ -10126,7 +9695,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_17(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_22(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, SwigArrayWrapper *farg5, SwigClassWrapper const *farg6) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_18(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 ; @@ -10192,7 +9761,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_22(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_23(SwigClassWrapper const *farg1, SwigClassWrapper const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, SwigArrayWrapper *farg5) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_19(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 ; @@ -10255,7 +9824,7 @@ SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_23(SwigClassWrapper } -SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_32(SwigClassWrapper *farg1, int const *farg2) { +SWIGEXPORT SwigClassWrapper _wrap_new_TpetraCrsMatrix__SWIG_28(SwigClassWrapper *farg1, int const *farg2) { SwigClassWrapper fresult ; Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > *arg1 = 0 ; Teuchos::DataAccess arg2 ; @@ -10345,7 +9914,57 @@ SWIGEXPORT void _wrap_TpetraCrsMatrix_insertGlobalValues(SwigClassWrapper *farg1 } -SWIGEXPORT void _wrap_TpetraCrsMatrix_insertLocalValues(SwigClassWrapper *farg1, int const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4) { +SWIGEXPORT void _wrap_TpetraCrsMatrix_insertLocalValues__SWIG_0(SwigClassWrapper *farg1, int const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4, int const *farg5) { + Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; + int arg2 ; + Teuchos::ArrayView< int const > *arg3 = 0 ; + Teuchos::ArrayView< double const > *arg4 = 0 ; + Tpetra::CombineMode arg5 ; + Teuchos::RCP< Tpetra::CrsMatrix< SC,LO,GO,NO > > *smartarg1 ; + Teuchos::ArrayView< int const >::value_type *tmpbegin3 ; + Teuchos::Array< std::remove_const< Teuchos::ArrayView< int const >::value_type >::type > tmparr3 ; + Teuchos::ArrayView< int const > tmpview3 ; + Teuchos::ArrayView< double const > tmpview4 ; + + smartarg1 = (Teuchos::RCP< Tpetra::CrsMatrix >*)(farg1->cptr); + arg1 = smartarg1 ? (Tpetra::CrsMatrix*)(smartarg1->get()) : NULL; + arg2 = *farg2 - 1; + tmpbegin3 = static_cast::value_type*>(farg3->data); + tmparr3.resize(farg3->size); + for (int i = 0; i < tmparr3.size(); i++) + tmparr3[i] = tmpbegin3[i] - 1; + tmpview3 = tmparr3(); + arg3 = &tmpview3; + tmpview4 = Teuchos::ArrayView(static_cast(farg4->data), farg4->size); + arg4 = &tmpview4; + arg5 = (Tpetra::CombineMode)(*farg5); + { + // Make sure no unhandled exceptions exist before performing a new action + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::insertLocalValues(int const,Teuchos::ArrayView< int const > const &,Teuchos::ArrayView< double const > const &,Tpetra::CombineMode const)");; + try + { + // Attempt the wrapped function call + (arg1)->insertLocalValues(arg2,(Teuchos::ArrayView< int const > const &)*arg3,(Teuchos::ArrayView< double const > const &)*arg4,arg5); + } + catch (const std::range_error& e) + { + // Store a C++ exception + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::insertLocalValues(int const,Teuchos::ArrayView< int const > const &,Teuchos::ArrayView< double const > const &,Tpetra::CombineMode const)", -4, e.what(), return ); + } + catch (const std::exception& e) + { + // Store a C++ exception + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::insertLocalValues(int const,Teuchos::ArrayView< int const > const &,Teuchos::ArrayView< double const > const &,Tpetra::CombineMode const)", -3, e.what(), return ); + } + catch (...) + { + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::insertLocalValues(int const,Teuchos::ArrayView< int const > const &,Teuchos::ArrayView< double const > const &,Tpetra::CombineMode const)", -1, "An unknown exception occurred", return ); + } + } +} + + +SWIGEXPORT void _wrap_TpetraCrsMatrix_insertLocalValues__SWIG_1(SwigClassWrapper *farg1, int const *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4) { Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; int arg2 ; Teuchos::ArrayView< int const > *arg3 = 0 ; @@ -11576,7 +11195,7 @@ SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getGlobalNumCols(SwigClassWrapper *farg1 } -SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeNumRows(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getLocalNumRows(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsMatrix< SC,LO,GO,NO > const > *smartarg1 ; @@ -11586,25 +11205,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeNumRows(SwigClassWrapper *farg1) arg1 = smartarg1 ? (Tpetra::CrsMatrix*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumRows() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumRows() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getNodeNumRows(); + result = ((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getLocalNumRows(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumRows() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumRows() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumRows() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumRows() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumRows() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumRows() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -11612,7 +11231,7 @@ SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeNumRows(SwigClassWrapper *farg1) } -SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeNumCols(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getLocalNumCols(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsMatrix< SC,LO,GO,NO > const > *smartarg1 ; @@ -11622,25 +11241,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeNumCols(SwigClassWrapper *farg1) arg1 = smartarg1 ? (Tpetra::CrsMatrix*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumCols() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumCols() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getNodeNumCols(); + result = ((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getLocalNumCols(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumCols() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumCols() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumCols() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumCols() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumCols() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumCols() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -11684,7 +11303,7 @@ SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getGlobalNumEntries(SwigClassWrapper *fa } -SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeNumEntries(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getLocalNumEntries(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsMatrix< SC,LO,GO,NO > const > *smartarg1 ; @@ -11694,25 +11313,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeNumEntries(SwigClassWrapper *farg arg1 = smartarg1 ? (Tpetra::CrsMatrix*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumEntries() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumEntries() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getNodeNumEntries(); + result = ((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getLocalNumEntries(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumEntries() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumEntries() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumEntries() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumEntries() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeNumEntries() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalNumEntries() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -11832,7 +11451,7 @@ SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getGlobalMaxNumRowEntries(SwigClassWrapp } -SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeMaxNumRowEntries(SwigClassWrapper *farg1) { +SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getLocalMaxNumRowEntries(SwigClassWrapper *farg1) { size_t fresult ; Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; Teuchos::RCP< Tpetra::CrsMatrix< SC,LO,GO,NO > const > *smartarg1 ; @@ -11842,25 +11461,25 @@ SWIGEXPORT size_t _wrap_TpetraCrsMatrix_getNodeMaxNumRowEntries(SwigClassWrapper arg1 = smartarg1 ? (Tpetra::CrsMatrix*)(smartarg1->get()) : NULL; { // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeMaxNumRowEntries() const");; + SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalMaxNumRowEntries() const");; try { // Attempt the wrapped function call - result = ((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getNodeMaxNumRowEntries(); + result = ((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getLocalMaxNumRowEntries(); } catch (const std::range_error& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeMaxNumRowEntries() const", -4, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalMaxNumRowEntries() const", -4, e.what(), return 0); } catch (const std::exception& e) { // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeMaxNumRowEntries() const", -3, e.what(), return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalMaxNumRowEntries() const", -3, e.what(), return 0); } catch (...) { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getNodeMaxNumRowEntries() const", -1, "An unknown exception occurred", return 0); + SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getLocalMaxNumRowEntries() const", -1, "An unknown exception occurred", return 0); } } fresult = (size_t)(result); @@ -12084,42 +11703,6 @@ SWIGEXPORT int _wrap_TpetraCrsMatrix_isStorageOptimized(SwigClassWrapper *farg1) } -SWIGEXPORT int _wrap_TpetraCrsMatrix_getProfileType(SwigClassWrapper *farg1) { - int fresult ; - Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; - Teuchos::RCP< Tpetra::CrsMatrix< SC,LO,GO,NO > const > *smartarg1 ; - Tpetra::ProfileType result; - - smartarg1 = (Teuchos::RCP >*)(farg1->cptr); - arg1 = smartarg1 ? (Tpetra::CrsMatrix*)(smartarg1->get()) : NULL; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getProfileType() const");; - try - { - // Attempt the wrapped function call - result = (Tpetra::ProfileType)((Tpetra::CrsMatrix< SC,LO,GO,NO > const *)arg1)->getProfileType(); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getProfileType() const", -4, e.what(), return 0); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getProfileType() const", -3, e.what(), return 0); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::getProfileType() const", -1, "An unknown exception occurred", return 0); - } - } - fresult = (int)(result); - return fresult; -} - - SWIGEXPORT int _wrap_TpetraCrsMatrix_isStaticGraph(SwigClassWrapper *farg1) { int fresult ; Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; @@ -13075,38 +12658,6 @@ SWIGEXPORT void _wrap_TpetraCrsMatrix_exportAndFillComplete__SWIG_4(SwigClassWra } -SWIGEXPORT void _wrap_TpetraCrsMatrix_computeGlobalConstants(SwigClassWrapper *farg1) { - Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; - Teuchos::RCP< Tpetra::CrsMatrix< SC,LO,GO,NO > > *smartarg1 ; - - smartarg1 = (Teuchos::RCP< Tpetra::CrsMatrix >*)(farg1->cptr); - arg1 = smartarg1 ? (Tpetra::CrsMatrix*)(smartarg1->get()) : NULL; - { - // Make sure no unhandled exceptions exist before performing a new action - SWIG_check_unhandled_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::computeGlobalConstants()");; - try - { - // Attempt the wrapped function call - (arg1)->computeGlobalConstants(); - } - catch (const std::range_error& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::computeGlobalConstants()", -4, e.what(), return ); - } - catch (const std::exception& e) - { - // Store a C++ exception - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::computeGlobalConstants()", -3, e.what(), return ); - } - catch (...) - { - SWIG_exception_impl("Tpetra::CrsMatrix< SC,LO,GO,NO >::computeGlobalConstants()", -1, "An unknown exception occurred", return ); - } - } -} - - SWIGEXPORT int _wrap_TpetraCrsMatrix_haveGlobalConstants(SwigClassWrapper *farg1) { int fresult ; Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; @@ -13143,7 +12694,7 @@ SWIGEXPORT int _wrap_TpetraCrsMatrix_haveGlobalConstants(SwigClassWrapper *farg1 } -SWIGEXPORT void _wrap_TpetraCrsMatrix_getAllValues__SWIG_1(SwigClassWrapper *farg1, SwigArrayWrapper *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4) { +SWIGEXPORT void _wrap_TpetraCrsMatrix_getAllValues(SwigClassWrapper *farg1, SwigArrayWrapper *farg2, SwigArrayWrapper *farg3, SwigArrayWrapper *farg4) { Tpetra::CrsMatrix< SC,LO,GO,NO > *arg1 = (Tpetra::CrsMatrix< SC,LO,GO,NO > *) 0 ; Teuchos::ArrayView< size_t > arg2 ; Teuchos::ArrayView< LO > arg3 ; @@ -13161,7 +12712,7 @@ SWIGEXPORT void _wrap_TpetraCrsMatrix_getAllValues__SWIG_1(SwigClassWrapper *far try { // Attempt the wrapped function call - Tpetra_CrsMatrix_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg__getAllValues__SWIG_1((Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > const *)arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),SWIG_STD_MOVE(arg4)); + Tpetra_CrsMatrix_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg__getAllValues((Tpetra::CrsMatrix< double,int,long long,ForTrilinos::DefaultNodeType > const *)arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),SWIG_STD_MOVE(arg4)); } catch (const std::range_error& e) { diff --git a/src/fortrilinos_hl/generated/fortrilinos_hl.F90 b/src/fortrilinos_hl/generated/fortrilinos_hl.F90 index 16c551b0..0a36e641 100644 --- a/src/fortrilinos_hl/generated/fortrilinos_hl.F90 +++ b/src/fortrilinos_hl/generated/fortrilinos_hl.F90 @@ -1,7 +1,7 @@ -! This file was automatically generated by SWIG (http://www.swig.org). -! Version 4.1.0+fortran +! This file was automatically generated by SWIG (https://www.swig.org). +! Version 4.1.1+fortran ! -! Do not make changes to this file unless you know what you are doing--modify +! Do not make changes to this file unless you know what you are doing - modify ! the SWIG interface file instead. ! Copyright 2017-2020, UT-Battelle, LLC @@ -124,18 +124,18 @@ module fortrilinos_hl procedure, private :: swigf_NOXSolver_op_assign__ generic :: assignment(=) => swigf_NOXSolver_op_assign__ end type NOXSolver - interface TrilinosEigenSolver - module procedure swigf_new_TrilinosEigenSolver__SWIG_0, swigf_new_TrilinosEigenSolver__SWIG_1 + interface TrilinosSolver + module procedure swigf_new_TrilinosSolver__SWIG_0, swigf_new_TrilinosSolver__SWIG_1 end interface interface ForModelEvaluator module procedure swigf_new_ForModelEvaluator end interface + interface TrilinosEigenSolver + module procedure swigf_new_TrilinosEigenSolver__SWIG_0, swigf_new_TrilinosEigenSolver__SWIG_1 + end interface interface NOXSolver module procedure swigf_new_NOXSolver end interface - interface TrilinosSolver - module procedure swigf_new_TrilinosSolver__SWIG_0, swigf_new_TrilinosSolver__SWIG_1 - end interface ! WRAPPER DECLARATIONS interface @@ -276,8 +276,8 @@ function swigc_TrilinosEigenSolver_solve(farg1, farg2, farg3, farg4) & bind(C, name="_wrap_TrilinosEigenSolver_solve") & result(fresult) use, intrinsic :: ISO_C_BINDING -import :: swigclasswrapper import :: swigarraywrapper +import :: swigclasswrapper type(SwigClassWrapper), intent(in) :: farg1 type(SwigArrayWrapper) :: farg2 type(SwigClassWrapper), intent(in) :: farg3 diff --git a/src/fortrilinos_hl/generated/fortrilinos_hlFORTRAN_wrap.cxx b/src/fortrilinos_hl/generated/fortrilinos_hlFORTRAN_wrap.cxx index dc5eaa40..173777a1 100644 --- a/src/fortrilinos_hl/generated/fortrilinos_hlFORTRAN_wrap.cxx +++ b/src/fortrilinos_hl/generated/fortrilinos_hlFORTRAN_wrap.cxx @@ -1,11 +1,9 @@ /* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.1.0+fortran + * This file was automatically generated by SWIG (https://www.swig.org). + * Version 4.1.1+fortran * - * This file is not intended to be easily readable and contains a number of - * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * Do not make changes to this file unless you know what you are doing - modify + * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ /* @@ -15,12 +13,6 @@ * License-Filename: LICENSE */ - - -#ifndef SWIGFORTRAN -#define SWIGFORTRAN -#endif - /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -146,44 +138,6 @@ #endif -#ifdef __cplusplus -#include -/* SwigValueWrapper is described in swig.swg */ -template class SwigValueWrapper { - struct SwigSmartPointer { - T *ptr; - SwigSmartPointer(T *p) : ptr(p) { } - ~SwigSmartPointer() { delete ptr; } - SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } - } pointer; - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); - SwigValueWrapper(const SwigValueWrapper& rhs); -public: - SwigValueWrapper() : pointer(0) { } - SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } -#if __cplusplus >=201103L - SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } - operator T&&() const { return std::move(*pointer.ptr); } -#else - operator T&() const { return *pointer.ptr; } -#endif - T *operator&() const { return pointer.ptr; } -}; - -template T SwigValueInit() { - return T(); -} - - -#if __cplusplus >=201103L -# define SWIG_STD_MOVE(OBJ) std::move(OBJ) -#else -# define SWIG_STD_MOVE(OBJ) OBJ -#endif - -#endif - - #ifndef SWIGEXTERN # ifdef __cplusplus # define SWIGEXTERN extern @@ -250,6 +204,10 @@ enum AssignmentType { }; } + + +#define SWIG_VERSION 0x040101 +#define SWIGFORTRAN #define SWIGPOLICY_Teuchos_ArrayView_Sl_int_Sg_ swig::ASSIGNMENT_DEFAULT #define SWIGPOLICY_Teuchos_ArrayView_Sl_int_SS_const_Sg_ swig::ASSIGNMENT_DEFAULT #define SWIGPOLICY_Teuchos_ArrayView_Sl_double_Sg_ swig::ASSIGNMENT_DEFAULT @@ -333,6 +291,54 @@ enum AssignmentType { #define SWIGPOLICY_Teuchos_RCP_Sl_ForTrilinos_NOXSolver_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg_const_Sg_ swig::ASSIGNMENT_DEFAULT #define SWIGPOLICY_ForTrilinos_NOXSolver_Sl_SC_Sc_LO_Sc_GO_Sc_NO_Sg_ swig::ASSIGNMENT_SMARTPTR +#ifdef __cplusplus +#include +/* SwigValueWrapper is described in swig.swg */ +template class SwigValueWrapper { + struct SwigSmartPointer { + T *ptr; + SwigSmartPointer(T *p) : ptr(p) { } + ~SwigSmartPointer() { delete ptr; } + SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); +public: + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } +#if __cplusplus >=201103L + SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } + operator T&&() const { return std::move(*pointer.ptr); } +#else + operator T&() const { return *pointer.ptr; } +#endif + T *operator&() const { return pointer.ptr; } + static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); } +}; + +/* + * SwigValueInit() is a generic initialisation solution as the following approach: + * + * T c_result = T(); + * + * doesn't compile for all types for example: + * + * unsigned int c_result = unsigned int(); + */ +template T SwigValueInit() { + return T(); +} + +#if __cplusplus >=201103L +# define SWIG_STD_MOVE(OBJ) std::move(OBJ) +#else +# define SWIG_STD_MOVE(OBJ) OBJ +#endif + +#endif + + #include @@ -345,10 +351,6 @@ enum AssignmentType { if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } -#define SWIGVERSION 0x040100 -#define SWIG_VERSION SWIGVERSION - - #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) diff --git a/test/fortpetra/test_tpetra_crsgraph.F90 b/test/fortpetra/test_tpetra_crsgraph.F90 index 5f5d651a..dd2c3ba9 100644 --- a/test/fortpetra/test_tpetra_crsgraph.F90 +++ b/test/fortpetra/test_tpetra_crsgraph.F90 @@ -56,10 +56,8 @@ program test_TpetraCrsGraph ADD_SUBTEST_AND_RUN(TpetraCrsGraph_getNodeAllocationSize) ADD_SUBTEST_AND_RUN(TpetraCrsGraph_getNumAllocatedEntriesInGlobalRow) ADD_SUBTEST_AND_RUN(TpetraCrsGraph_getNumAllocatedEntriesInLocalRow) - ADD_SUBTEST_AND_RUN(TpetraCrsGraph_getProfileType) ADD_SUBTEST_AND_RUN(TpetraCrsGraph_getGlobalRowCopy) ADD_SUBTEST_AND_RUN(TpetraCrsGraph_getLocalRowCopy) - ADD_SUBTEST_AND_RUN(TpetraCrsGraph_getNodeRowPtrs) ADD_SUBTEST_AND_RUN(TpetraCrsGraph_getNodePackedIndices) ADD_SUBTEST_AND_RUN(TpetraCrsGraph_hasColMap) ADD_SUBTEST_AND_RUN(TpetraCrsGraph_isGloballyIndexed) @@ -101,7 +99,7 @@ program test_TpetraCrsGraph Map = TpetraMap(TPETRA_GLOBAL_INVALID, 1, comm); TEST_IERR() params = ParameterList("ANONYMOUS") - Graph = TpetraCrsGraph(Map, Map, 1_size_type, TpetraStaticProfile) + Graph = TpetraCrsGraph(Map, Map, 1_size_type) TEST_ASSERT(Graph%isFillActive()) TEST_ASSERT((.not. Graph%isFillComplete())) @@ -121,7 +119,6 @@ program test_TpetraCrsGraph call Graph%resumeFill() TEST_ASSERT(graph%isFillActive()) TEST_ASSERT((.not. graph%isFillComplete())) - TEST_ASSERT(graph%getProfileType() == TpetraStaticProfile) TEST_NOTHROW(call graph%insertLocalIndices(row, indices)) TEST_NOTHROW(call graph%fillComplete()) @@ -155,7 +152,7 @@ program test_TpetraCrsGraph cmap = TpetraMap(TPETRA_GLOBAL_INVALID, num_local, comm); TEST_IERR() ! must allocate enough for all submitted indices. num_ent_per_row = 2 - Graph = TpetraCrsGraph(rmap, cmap, num_ent_per_row, TpetraStaticProfile) + Graph = TpetraCrsGraph(rmap, cmap, num_ent_per_row) TEST_ASSERT(Graph%hasColMap()) lclrow = 1 myrowind = rmap%getGlobalElement(lclrow); @@ -179,9 +176,9 @@ program test_TpetraCrsGraph tmpmap = TpetraMap() tmpmap = Graph%getRowMap() - TEST_EQUALITY(tmpmap%getNodeNumElements(), rmap%getNodeNumElements()) + TEST_EQUALITY(tmpmap%getLocalNumElements(), rmap%getLocalNumElements()) tmpmap = Graph%getColMap() - TEST_EQUALITY(tmpmap%getNodeNumElements(), cmap%getNodeNumElements()) + TEST_EQUALITY(tmpmap%getLocalNumElements(), cmap%getLocalNumElements()) TEST_EQUALITY(Graph%getNumEntriesInGlobalRow(myrowind), 1_size_type) call tmpmap%release(); TEST_IERR() @@ -222,10 +219,10 @@ program test_TpetraCrsGraph tmpmap = TpetraMap() tmpmap = Graph%getRowMap() - TEST_EQUALITY(tmpmap%getNodeNumElements(), rmap%getNodeNumElements()) + TEST_EQUALITY(tmpmap%getLocalNumElements(), rmap%getLocalNumElements()) tmpmap = Graph%getColMap() - TEST_EQUALITY(tmpmap%getNodeNumElements(), rmap%getNodeNumElements()) + TEST_EQUALITY(tmpmap%getLocalNumElements(), rmap%getLocalNumElements()) deallocate(rowptr, colind) call tmpmap%release(); TEST_IERR() @@ -375,7 +372,7 @@ program test_TpetraCrsGraph ! create static-profile graph, fill-complete without inserting ! (and therefore, without allocating) - Graph = TpetraCrsGraph(map, 1_size_type, TpetraStaticProfile) + Graph = TpetraCrsGraph(map, 1_size_type) call Graph%fillComplete() call Graph%release(); TEST_IERR() @@ -405,7 +402,7 @@ program test_TpetraCrsGraph cmap = TpetraMap(TPETRA_GLOBAL_INVALID, num_local, comm); TEST_IERR() ! must allocate enough for all submitted indices. num_ent_per_row = 2 - Graph = TpetraCrsGraph(rmap, cmap, num_ent_per_row, TpetraStaticProfile) + Graph = TpetraCrsGraph(rmap, cmap, num_ent_per_row) TEST_ASSERT(Graph%hasColMap()) lclrow = 1 myrowind = rmap%getGlobalElement(lclrow); @@ -428,15 +425,15 @@ program test_TpetraCrsGraph TEST_NOTHROW(call Graph%fillComplete()) commsize = comm%getSize() - i_LO = Graph%getNodeNumRows() + i_LO = Graph%getLocalNumRows() TEST_EQUALITY(i_LO, 1_size_type) - i_LO = Graph%getNodeNumCols() + i_LO = Graph%getLocalNumCols() TEST_EQUALITY(i_LO, 1_size_type) i_LO = Graph%getGlobalNumEntries() TEST_EQUALITY(i_LO, int(commsize, kind=size_type)) - i_LO = Graph%getNodeNumEntries() + i_LO = Graph%getLocalNumEntries() TEST_EQUALITY(i_LO, 1_size_type) - i_LO = Graph%getNodeAllocationSize() + i_LO = Graph%getLocalAllocationSize() TEST_EQUALITY(i_LO, 1_size_type) i_LO = Graph%getNumAllocatedEntriesInGlobalRow(myrowind) TEST_EQUALITY(i_LO, 1_size_type) @@ -444,7 +441,7 @@ program test_TpetraCrsGraph TEST_EQUALITY(i_LO, 1_size_type) i_LO = Graph%getGlobalMaxNumRowEntries() TEST_EQUALITY(i_LO, 1_size_type) - i_LO = Graph%getNodeMaxNumRowEntries() + i_LO = Graph%getLocalMaxNumRowEntries() TEST_EQUALITY(i_LO, 1_size_type) call Graph%release(); TEST_IERR() @@ -468,8 +465,8 @@ program test_TpetraCrsGraph ! create Map and Graph num_global = 4*comm%getSize() Map = TpetraMap(num_global, comm); TEST_IERR() - Graph1 = TpetraCrsGraph(Map, Map, ione, TpetraStaticProfile) - Graph2 = TpetraCrsGraph(Map, Map, ione, TpetraStaticProfile) + Graph1 = TpetraCrsGraph(Map, Map, ione) + Graph2 = TpetraCrsGraph(Map, Map, ione) call Graph1%fillComplete() call Graph2%fillComplete() @@ -504,7 +501,7 @@ program test_TpetraCrsGraph rowMap = TpetraMap(gblNumRows, lclNumRows, comm) lclNumCols = lclNumRows colMap = rowMap - Graph = TpetraCrsGraph(rowMap, colMap, max_entries_per_row, TpetraStaticProfile) + Graph = TpetraCrsGraph(rowMap, colMap, max_entries_per_row) allocate(lclColInds(2)) @@ -551,7 +548,7 @@ program test_TpetraCrsGraph ! Duplicate Tpetra_CrsGraph_CreateTestGraph_A here because ! we want insertGlobalIndices to appear explicitly. rmap = TpetraMap(Tpetra_GLOBAL_INVALID, test_graph_num_row(), comm) - Graph = TpetraCrsGraph(rmap, test_graph_max_entries_per_row(), TpetraStaticProfile) + Graph = TpetraCrsGraph(rmap, test_graph_max_entries_per_row()) do irow=1,test_graph_num_row() call Tpetra_CrsGraph_GetTestGraphRow_A(comm, irow, gblrow, cols_expected, nnz) @@ -599,7 +596,7 @@ program test_TpetraCrsGraph rowMap = TpetraMap(gblNumRows, lclNumRows, comm) lclNumCols = lclNumRows colMap = rowMap - Graph = TpetraCrsGraph(rowMap, colMap, max_entries_per_row, TpetraStaticProfile) + Graph = TpetraCrsGraph(rowMap, colMap, max_entries_per_row) allocate(lclColInds(2)) @@ -680,7 +677,7 @@ program test_TpetraCrsGraph tmpmap = Graph%getRowMap() - TEST_EQUALITY(tmpmap%getNodeNumElements(), rmap%getNodeNumElements()) + TEST_EQUALITY(tmpmap%getLocalNumElements(), rmap%getLocalNumElements()) TEST_ASSERT(tmpmap%isSameAs(rmap)) call tmpmap%release(); TEST_IERR() @@ -705,7 +702,7 @@ program test_TpetraCrsGraph call Graph%fillComplete() tmpmap = Graph%getColMap() - TEST_EQUALITY(tmpmap%getNodeNumElements(), cmap%getNodeNumElements()) + TEST_EQUALITY(tmpmap%getLocalNumElements(), cmap%getLocalNumElements()) TEST_ASSERT(tmpmap%isSameAs(cmap)) call tmpmap%release(); TEST_IERR() @@ -849,7 +846,7 @@ program test_TpetraCrsGraph cmap = TpetraMap(TPETRA_GLOBAL_INVALID, num_local, comm); TEST_IERR() ! must allocate enough for all submitted indices. num_ent_per_row = 2 - Graph = TpetraCrsGraph(rmap, cmap, num_ent_per_row, TpetraStaticProfile) + Graph = TpetraCrsGraph(rmap, cmap, num_ent_per_row) commsize = comm%getSize() ires = Graph%getGlobalNumRows() @@ -933,7 +930,7 @@ program test_TpetraCrsGraph call Tpetra_CrsGraph_CreateTestGraph_B(comm, Graph) call Graph%fillComplete() - ires = Graph%getNodeNumRows() + ires = Graph%getLocalNumRows() TEST_EQUALITY(ires, int(test_graph_num_local(), size_type)) call Graph%release(); TEST_IERR() @@ -952,7 +949,7 @@ program test_TpetraCrsGraph call Tpetra_CrsGraph_CreateTestGraph_B(comm, Graph) call Graph%fillComplete() - ires = Graph%getNodeNumCols() + ires = Graph%getLocalNumCols() TEST_EQUALITY(ires, int(test_graph_num_local(), size_type)) call Graph%release(); TEST_IERR() @@ -971,7 +968,7 @@ program test_TpetraCrsGraph call Tpetra_CrsGraph_CreateTestGraph_B(comm, Graph) call Graph%fillComplete() - ires = Graph%getNodeNumEntries() + ires = Graph%getLocalNumEntries() TEST_EQUALITY(ires, int(2,size_type)) call Graph%release(); TEST_IERR() @@ -990,7 +987,7 @@ program test_TpetraCrsGraph call Tpetra_CrsGraph_CreateTestGraph_B(comm, Graph) call Graph%fillComplete() - ires = Graph%getNodeMaxNumRowEntries() + ires = Graph%getLocalMaxNumRowEntries() TEST_EQUALITY(ires, int(2,size_type)) call Graph%release(); TEST_IERR() @@ -1056,7 +1053,7 @@ program test_TpetraCrsGraph call Tpetra_CrsGraph_CreateTestGraph_B(comm, Graph) call Graph%fillComplete() - ires = Graph%getNodeAllocationSize() + ires = Graph%getLocalAllocationSize() ! match num_ent_per_row in CreateTestGraph TEST_EQUALITY(ires, int(2,size_type)) @@ -1113,22 +1110,6 @@ program test_TpetraCrsGraph END_FORTRILINOS_UNIT_TEST(TpetraCrsGraph_getNumAllocatedEntriesInLocalRow) - ! ------------------------------getProfileType------------------------------ ! - FORTRILINOS_UNIT_TEST(TpetraCrsGraph_getProfileType) - type(TpetraCrsGraph) :: Graph - - OUT0("Starting TpetraCrsGraph_getProfileType!") - - call Tpetra_CrsGraph_CreateTestGraph_B(comm, Graph) - - TEST_ASSERT(graph%getProfileType() == TpetraStaticProfile) - - call Graph%release(); TEST_IERR() - - OUT0("Finished TpetraCrsGraph_getProfileType!") - - END_FORTRILINOS_UNIT_TEST(TpetraCrsGraph_getProfileType) - ! -----------------------------getGlobalRowCopy----------------------------- ! FORTRILINOS_UNIT_TEST(TpetraCrsGraph_getGlobalRowCopy) type(TpetraCrsGraph) :: Graph @@ -1177,7 +1158,7 @@ program test_TpetraCrsGraph rowMap = TpetraMap(gblNumRows, lclNumRows, comm) lclNumCols = lclNumRows colMap = rowMap - Graph = TpetraCrsGraph(rowMap, colMap, max_entries_per_row, TpetraStaticProfile) + Graph = TpetraCrsGraph(rowMap, colMap, max_entries_per_row) allocate(lclColInds(2)) @@ -1209,25 +1190,6 @@ program test_TpetraCrsGraph END_FORTRILINOS_UNIT_TEST(TpetraCrsGraph_getLocalRowCopy) - ! ------------------------------getNodeRowPtrs------------------------------ ! - FORTRILINOS_UNIT_TEST(TpetraCrsGraph_getNodeRowPtrs) - type(TpetraCrsGraph) :: Graph - integer(size_type), allocatable :: rowpointers(:) - - OUT0("Starting TpetraCrsGraph_getNodeRowPtrs!") - - call Tpetra_CrsGraph_CreateTestGraph_B(comm, Graph) - - allocate(rowpointers(1)) - TEST_THROW(call Graph%getNodeRowPtrs(rowpointers(:))) - - deallocate(rowpointers) - call Graph%release(); TEST_IERR() - - OUT0("Finished TpetraCrsGraph_getNodeRowPtrs!") - - END_FORTRILINOS_UNIT_TEST(TpetraCrsGraph_getNodeRowPtrs) - ! ---------------------------getNodePackedIndices--------------------------- ! FORTRILINOS_UNIT_TEST(TpetraCrsGraph_getNodePackedIndices) type(TpetraCrsGraph) :: Graph @@ -1238,7 +1200,7 @@ program test_TpetraCrsGraph call Tpetra_CrsGraph_CreateTestGraph_B(comm, Graph) allocate(columnindices(1)) - TEST_THROW(call Graph%getNodePackedIndices(columnindices(:))) + TEST_THROW(call Graph%getLocalPackedIndices(columnindices(:))) deallocate(columnindices) call Graph%release(); TEST_IERR() @@ -1417,7 +1379,7 @@ program test_TpetraCrsGraph num_global = 4*comm%getSize() Map = TpetraMap(num_global, comm); TEST_IERR() - Graph = TpetraCrsGraph(Map, Map, 1_size_type, TpetraStaticProfile) + Graph = TpetraCrsGraph(Map, Map, 1_size_type) ! Make a new colmap newcolmap = TpetraMap(num_global, comm); TEST_IERR() @@ -1445,7 +1407,7 @@ program test_TpetraCrsGraph num_global = 4*comm%getSize() Map = TpetraMap(num_global, comm); TEST_IERR() - Graph = TpetraCrsGraph(Map, Map, izero, TpetraStaticProfile) + Graph = TpetraCrsGraph(Map, Map, izero) call Graph%fillComplete() ! Needed for gloStaticstants ! Make a new colmap @@ -1478,7 +1440,7 @@ program test_TpetraCrsGraph ! create Map and Graph num_global = 4*comm%getSize() Map = TpetraMap(num_global, comm); TEST_IERR() - Graph = TpetraCrsGraph(Map, Map, izero, TpetraStaticProfile) + Graph = TpetraCrsGraph(Map, Map, izero) TEST_NOTHROW(call Graph%removeEmptyProcessesInPlace(Map)) diff --git a/test/fortpetra/test_tpetra_crsgraph_helper.F90 b/test/fortpetra/test_tpetra_crsgraph_helper.F90 index cd696988..6f050d60 100644 --- a/test/fortpetra/test_tpetra_crsgraph_helper.F90 +++ b/test/fortpetra/test_tpetra_crsgraph_helper.F90 @@ -41,7 +41,7 @@ subroutine Tpetra_CrsGraph_CreateBasic(comm,Graph) ! create a Map Map = TpetraMap(TPETRA_GLOBAL_INVALID, test_graph_num_local(), comm) - Graph = TpetraCrsGraph(Map, Map, int(test_graph_num_local(),size_type), TpetraStaticProfile) + Graph = TpetraCrsGraph(Map, Map, int(test_graph_num_local(),size_type)) call map%release() return @@ -62,7 +62,7 @@ subroutine Tpetra_CrsGraph_CreateTestGraph_B(comm,Graph) ! must allocate enough for all submitted indices. num_ent_per_row = 2 - Graph = TpetraCrsGraph(rmap, cmap, num_ent_per_row, TpetraStaticProfile) + Graph = TpetraCrsGraph(rmap, cmap, num_ent_per_row) lclrow = 1 myrowind = rmap%getGlobalElement(lclrow); @@ -142,7 +142,7 @@ subroutine Tpetra_CrsGraph_CreateTestGraph_A(comm,Graph) integer(global_ordinal_type) :: gblrow rmap = TpetraMap(Tpetra_GLOBAL_INVALID, test_graph_num_row(), comm) - Graph = TpetraCrsGraph(rmap, test_graph_max_entries_per_row(), TpetraStaticProfile) + Graph = TpetraCrsGraph(rmap, test_graph_max_entries_per_row()) do irow=1,test_graph_num_row() call Tpetra_CrsGraph_GetTestGraphRow_A(comm, irow, gblrow, cols, nnz) diff --git a/test/fortpetra/test_tpetra_crsmatrix.F90 b/test/fortpetra/test_tpetra_crsmatrix.F90 index 07e07e96..1111ff9b 100644 --- a/test/fortpetra/test_tpetra_crsmatrix.F90 +++ b/test/fortpetra/test_tpetra_crsmatrix.F90 @@ -49,7 +49,6 @@ program test_TpetraCrsMatrix ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_getNodeMaxNumRowEntries) ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_getGlobalRowCopy) ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_getLocalRowCopy) - ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_getProfileType) ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_getFrobeniusNorm) ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_getAllValues) ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_setAllValues) @@ -72,8 +71,6 @@ program test_TpetraCrsMatrix ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_supportsRowViews) ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_hasTransposeApply) ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_description) - ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_computeGlobalConstants) - ADD_SUBTEST_AND_RUN(TpetraCrsMatrix_haveGlobalConstants) call comm%release(); TEST_IERR() @@ -109,7 +106,7 @@ program test_TpetraCrsMatrix ! create the identity matrix base = test_matrix_num_local() * my_image_id; - Mat = TpetraCrsMatrix(Map, 1_size_type, TpetraStaticProfile) + Mat = TpetraCrsMatrix(Map, 1_size_type) do irow = 1, test_matrix_num_local() gblrow = base + int(irow, kind=global_ordinal_type) cols(1) = gblrow @@ -119,19 +116,18 @@ program test_TpetraCrsMatrix TEST_ASSERT(Mat%isGloballyIndexed()) TEST_ASSERT((.not. Mat%isLocallyIndexed())) - TEST_ASSERT(Mat%getProfileType() == TpetraStaticProfile) call Mat%fillComplete(); TEST_IERR() row_map = Mat%getRowMap() ! test the properties TEST_ASSERT(Mat%getGlobalNumEntries()==num_images*test_matrix_num_local()) - TEST_ASSERT(Mat%getNodeNumEntries()==test_matrix_num_local()) + TEST_ASSERT(Mat%getLocalNumEntries()==test_matrix_num_local()) TEST_ASSERT(Mat%getGlobalNumRows()==num_images*test_matrix_num_local()) TEST_ASSERT(Mat%getGlobalNumCols()==num_images*test_matrix_num_local()) - TEST_ASSERT(Mat%getNodeNumRows()==test_matrix_num_local()) - TEST_ASSERT(Mat%getNodeNumCols()==test_matrix_num_local()) + TEST_ASSERT(Mat%getLocalNumRows()==test_matrix_num_local()) + TEST_ASSERT(Mat%getLocalNumCols()==test_matrix_num_local()) TEST_ASSERT(Mat%getGlobalMaxNumRowEntries()==1) - TEST_ASSERT(Mat%getNodeMaxNumRowEntries()==1) + TEST_ASSERT(Mat%getLocalMaxNumRowEntries()==1) TEST_ASSERT(Mat%isFillComplete()) TEST_ASSERT((.not. Mat%isFillActive())) fnorm = sqrt(real(num_images*test_matrix_num_local(), kind=scalar_type)) @@ -239,12 +235,12 @@ program test_TpetraCrsMatrix ! test the properties TEST_ASSERT(A%getGlobalNumEntries()==nnz*nrow*num_images-2) - TEST_ASSERT(A%getNodeNumEntries()==nnz*nrow-nrm) + TEST_ASSERT(A%getLocalNumEntries()==nnz*nrow-nrm) TEST_ASSERT(A%getGlobalNumRows()==num_images*nrow) - TEST_ASSERT(A%getNodeNumRows()==nrow) - TEST_ASSERT(A%getNodeNumCols()==nnz+(nrow-1)-nrm) + TEST_ASSERT(A%getLocalNumRows()==nrow) + TEST_ASSERT(A%getLocalNumCols()==nnz+(nrow-1)-nrm) TEST_ASSERT(A%getGlobalMaxNumRowEntries()==nnz) - TEST_ASSERT(A%getNodeMaxNumRowEntries()==nnz) + TEST_ASSERT(A%getLocalMaxNumRowEntries()==nnz) ! Use tmp_map so it can be released tmp_map=A%getColMap() if (num_images==1) then @@ -300,7 +296,7 @@ program test_TpetraCrsMatrix ! Create the identity matrix, three rows per proc base = 3 * my_image_id; - Mat = TpetraCrsMatrix(Map, 1_size_type, TpetraStaticProfile); TEST_IERR() + Mat = TpetraCrsMatrix(Map, 1_size_type); TEST_IERR() do i = 1, 3 gblrow = base + i cols(1) = gblrow @@ -351,7 +347,7 @@ program test_TpetraCrsMatrix ! create Map map = TpetraMap(TPETRA_GLOBAL_INVALID, 1, comm); TEST_IERR() - Mat = TpetraCrsMatrix(map, map, 1_size_type, TpetraStaticProfile); TEST_IERR() + Mat = TpetraCrsMatrix(map, map, 1_size_type); TEST_IERR() TEST_ASSERT(Mat%isFillActive()) TEST_ASSERT((.not. Mat%isFillComplete())) lclrow = 1 @@ -367,11 +363,8 @@ program test_TpetraCrsMatrix numvalid = 0 - ! It's forbidden to call any of the *LocalValues methods if the - ! matrix is fill complete (not fill active). - ! FIXME: This fails with segfault. Not sure what's going on. - ! TEST_THROW(call Mat%insertGlobalValues(row, cols, vals)) + ! call Mat%insertGlobalValues(row, cols, vals) numvalid = Mat%replaceGlobalValues(row, cols, vals); TEST_IERR() TEST_ASSERT(numvalid==TPETRA_GLOBAL_INVALID) @@ -379,15 +372,15 @@ program test_TpetraCrsMatrix numvalid = Mat%sumIntoGlobalValues(row, cols, vals); TEST_IERR() TEST_ASSERT(numvalid==TPETRA_GLOBAL_INVALID) - TEST_THROW(call Mat%setAllToScalar(0.d0)) - TEST_THROW(call Mat%scale(0.d0)) + call Mat%setAllToScalar(0.d0) + call Mat%scale(0.d0) TEST_THROW(call Mat%globalAssemble()) TEST_THROW(call Mat%fillComplete()) call params%release(); TEST_IERR() call Mat%release(); TEST_IERR() - Mat = TpetraCrsMatrix(map, map,10_size_type, TpetraStaticProfile); TEST_IERR() + Mat = TpetraCrsMatrix(map, map,10_size_type); TEST_IERR() TEST_ASSERT(Mat%isFillActive()) TEST_ASSERT((.not. Mat%isFillComplete())) lclrow = 1 @@ -436,7 +429,7 @@ program test_TpetraCrsMatrix ! create Map map = TpetraMap(TPETRA_GLOBAL_INVALID, 1, comm); TEST_IERR() - Mat = TpetraCrsMatrix(map, map, 1_size_type, TpetraStaticProfile); TEST_IERR() + Mat = TpetraCrsMatrix(map, map, 1_size_type); TEST_IERR() TEST_ASSERT(Mat%isFillActive()) TEST_ASSERT((.not. Mat%isFillComplete())) row = 1; cols(1) = 1; vals(1) = 0. @@ -469,7 +462,7 @@ program test_TpetraCrsMatrix call params%release(); TEST_IERR() call Mat%release(); TEST_IERR() - Mat = TpetraCrsMatrix(map, map, 1, TpetraStaticProfile); TEST_IERR() + Mat = TpetraCrsMatrix(map, map, 1); TEST_IERR() TEST_ASSERT(Mat%isFillActive()) TEST_ASSERT((.not. Mat%isFillComplete())) row = 1; cols(1) = 1; vals(1) = 0.d0; @@ -538,10 +531,10 @@ program test_TpetraCrsMatrix ! create a Map Map = TpetraMap(TPETRA_GLOBAL_INVALID, lnum_local, comm); TEST_IERR() - Mat = TpetraCrsMatrix(Map, 1_size_type, TpetraStaticProfile) + Mat = TpetraCrsMatrix(Map, 1_size_type) tmpmap = Mat%getRowMap() - TEST_EQUALITY(tmpmap%getNodeNumElements(), Map%getNodeNumElements()) + TEST_EQUALITY(tmpmap%getLocalNumElements(), Map%getLocalNumElements()) TEST_ASSERT(tmpmap%isSameAs(Map)) call tmpmap%release(); TEST_IERR() @@ -562,11 +555,11 @@ program test_TpetraCrsMatrix ! create a Map Map = TpetraMap(TPETRA_GLOBAL_INVALID, lnum_local, comm); TEST_IERR() - Mat = TpetraCrsMatrix(Map, Map, 1_size_type, TpetraStaticProfile) + Mat = TpetraCrsMatrix(Map, Map, 1_size_type) TEST_NOTHROW(call Mat%fillComplete()) tmpmap = Mat%getColMap() - TEST_EQUALITY(tmpmap%getNodeNumElements(), Map%getNodeNumElements()) + TEST_EQUALITY(tmpmap%getLocalNumElements(), Map%getLocalNumElements()) call tmpmap%release(); TEST_IERR() call Map%release(); TEST_IERR() @@ -586,7 +579,7 @@ program test_TpetraCrsMatrix ! create a Map Map = TpetraMap(TPETRA_GLOBAL_INVALID, lnum_local, comm); TEST_IERR() - Mat = TpetraCrsMatrix(Map, Map, 1_size_type, TpetraStaticProfile) + Mat = TpetraCrsMatrix(Map, Map, 1_size_type) TEST_NOTHROW(call Mat%fillComplete()) tmpmap = Mat%getDomainMap(); TEST_IERR() @@ -610,7 +603,7 @@ program test_TpetraCrsMatrix ! create a Map Map = TpetraMap(TPETRA_GLOBAL_INVALID, lnum_local, comm); TEST_IERR() - Mat = TpetraCrsMatrix(Map, Map, 1_size_type, TpetraStaticProfile) + Mat = TpetraCrsMatrix(Map, Map, 1_size_type) TEST_NOTHROW(call Mat%fillComplete()) tmpmap = Mat%getRangeMap(); TEST_IERR() @@ -656,7 +649,7 @@ program test_TpetraCrsMatrix ! create a Map Map = TpetraMap(TPETRA_GLOBAL_INVALID, lnum_local, comm); TEST_IERR() num_ent_per_row = 2 - Mat = TpetraCrsMatrix(Map, Map, num_ent_per_row, TpetraStaticProfile) + Mat = TpetraCrsMatrix(Map, Map, num_ent_per_row) call mat%fillComplete() commsize = comm%getSize() @@ -703,7 +696,7 @@ program test_TpetraCrsMatrix call TPetra_CrsMatrix_CreateIdentity(comm, Mat) call Mat%fillComplete() - ires = Mat%getNodeNumRows() + ires = Mat%getLocalNumRows() TEST_EQUALITY(ires, int(test_matrix_num_local(),size_type)) call Mat%release(); TEST_IERR() @@ -725,7 +718,7 @@ program test_TpetraCrsMatrix call TPetra_CrsMatrix_CreateIdentity(comm, Mat) call Mat%fillComplete() - ires = Mat%getNodeNumCols() + ires = Mat%getLocalNumCols() TEST_EQUALITY(ires, int(test_matrix_num_local(),size_type)) call Mat%release(); TEST_IERR() @@ -766,7 +759,7 @@ program test_TpetraCrsMatrix call TPetra_CrsMatrix_CreateIdentity(comm, Mat) call Mat%fillComplete() - ires = Mat%getNodeNumEntries() + ires = Mat%getLocalNumEntries() TEST_EQUALITY(ires, int(test_matrix_num_local(),size_type)) call Mat%release(); TEST_IERR() @@ -848,7 +841,7 @@ program test_TpetraCrsMatrix call TPetra_CrsMatrix_CreateIdentity(comm, Mat) call Mat%fillComplete() - ires = Mat%getNodeMaxNumRowEntries() + ires = Mat%getLocalMaxNumRowEntries() TEST_EQUALITY(ires, int(1,size_type)) call Mat%release(); TEST_IERR() @@ -934,7 +927,7 @@ program test_TpetraCrsMatrix ! Leave room for three locally owned entries per row. ! We will only fill in two entries per row. - Mat = TpetraCrsMatrix(rowMap, colMap, ithree, TpetraStaticProfile) + Mat = TpetraCrsMatrix(rowMap, colMap, ithree) allocate(lclColInds(2)) allocate(vals(2)) @@ -979,25 +972,6 @@ program test_TpetraCrsMatrix END_FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_getLocalRowCopy) - ! ------------------------------getProfileType------------------------------ ! - FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_getProfileType) - type(TpetraCrsMatrix) :: Mat - - OUT0("Starting TpetraCrsMatrix_getProfileType!") - - call TPetra_CrsMatrix_CreateIdentity(comm, Mat) - - ! This test fails if fillComplete is called - !call Mat%fillComplete() - - TEST_ASSERT(Mat%getProfileType() == TpetraStaticProfile) - - call Mat%release(); TEST_IERR() - - OUT0("Finished TpetraCrsMatrix_getProfileType!") - - END_FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_getProfileType) - ! -----------------------------getFrobeniusNorm----------------------------- ! FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_getFrobeniusNorm) type(TpetraCrsMatrix) :: Mat @@ -1031,8 +1005,8 @@ program test_TpetraCrsMatrix call TPetra_CrsMatrix_CreateTestMatrix_A(comm, Mat) call Mat%fillComplete() - numrow = Mat%getNodeNumRows() - numnnz = Mat%getNodeNumEntries() + numrow = Mat%getLocalNumRows() + numnnz = Mat%getLocalNumEntries() allocate(row_ptrs(numrow+1),rp_res(numrow+1)) allocate(colind(numnnz),col_res(numnnz),col_gbl(numnnz)) allocate(values(numnnz),val_res(numnnz)) @@ -1080,14 +1054,14 @@ program test_TpetraCrsMatrix OUT0("Starting TpetraCrsMatrix_setAllValues!") map = TpetraMap(TPETRA_GLOBAL_INVALID, test_matrix_num_row(), comm) - Mat = TpetraCrsMatrix(map, map, test_matrix_max_entries_per_row(), TpetraStaticProfile) + Mat = TpetraCrsMatrix(map, map, test_matrix_max_entries_per_row()) ! Like getAllValues use the TestMatrix. call TPetra_CrsMatrix_CreateTestMatrix_A(comm, mat_compare) call mat_compare%fillComplete() - numrow = mat_compare%getNodeNumRows() - numnnz = mat_compare%getNodeNumEntries() + numrow = mat_compare%getLocalNumRows() + numnnz = mat_compare%getLocalNumEntries() allocate(rowptr(numrow+1), rowchk(numrow+1)) allocate(indgbl(numnnz), ind(numnnz), indchk(numnnz), indlcl(numnnz)) allocate(vals(numnnz), valchk(numnnz)) @@ -1140,7 +1114,7 @@ program test_TpetraCrsMatrix ! create a Map and matrix map = TpetraMap(TPETRA_GLOBAL_INVALID, numrow, comm) - Mat = TpetraCrsMatrix(map, test_matrix_max_entries_per_row(), TpetraStaticProfile) + Mat = TpetraCrsMatrix(map, test_matrix_max_entries_per_row()) ! The test setup TPetra_CrsMatrix_CreateTestMatrix is essentially ! a test of insertGlobalValues but we'd like to have it appear @@ -1156,8 +1130,8 @@ program test_TpetraCrsMatrix !--------------------------------------------------------------- call Mat%fillComplete() - numrow = Mat%getNodeNumRows() - numnnz = Mat%getNodeNumEntries() + numrow = Mat%getLocalNumRows() + numnnz = Mat%getLocalNumEntries() allocate(row_ptrs(numrow+1),rp_res(numrow+1)) allocate(colind(numnnz),col_res(numnnz),col_gbl(numnnz)) allocate(values(numnnz),val_res(numnnz)) @@ -1224,7 +1198,7 @@ program test_TpetraCrsMatrix ! Leave room for three locally owned entries per row. ! We will only fill in two entries per row. - Mat = TpetraCrsMatrix(rowMap, colMap, test_matrix_max_entries_per_row(), TpetraStaticProfile) + Mat = TpetraCrsMatrix(rowMap, colMap, test_matrix_max_entries_per_row()) allocate(lclColInds(2)) allocate(vals(2)) @@ -1382,7 +1356,7 @@ program test_TpetraCrsMatrix OUT0("Starting TpetraCrsMatrix_replaceColMap") map = TpetraMap(TPETRA_GLOBAL_INVALID, test_matrix_num_local(), comm); TEST_IERR() - mat = TpetraCrsMatrix(map, ione, TpetraStaticProfile) + mat = TpetraCrsMatrix(map, ione) newcolmap = TpetraMap(TPETRA_GLOBAL_INVALID, test_matrix_num_local()-1, comm); TEST_IERR() @@ -1406,7 +1380,7 @@ program test_TpetraCrsMatrix OUT0("Starting TpetraCrsMatrix_removeEmptyProcessesInPlace") map = TpetraMap(TPETRA_GLOBAL_INVALID, lnum_local, comm); TEST_IERR() - mat = TpetraCrsMatrix(map, ione, TpetraStaticProfile) + mat = TpetraCrsMatrix(map, ione) call mat%removeEmptyProcessesInPlace(map); TEST_IERR() @@ -1527,7 +1501,7 @@ program test_TpetraCrsMatrix OUT0("Starting TpetraCrsMatrix_isStaticGraph") map = TpetraMap(TPETRA_GLOBAL_INVALID, test_matrix_num_local(), comm); TEST_IERR() - graph = TpetraCrsGraph(Map, Map, ione, TpetraStaticProfile) + graph = TpetraCrsGraph(Map, Map, ione) call graph%fillComplete() mat = TpetraCrsMatrix(graph) @@ -1605,43 +1579,6 @@ program test_TpetraCrsMatrix END_FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_description) - ! --------------------------computeGlobalConstants-------------------------- ! - FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_computeGlobalConstants) - type(TpetraCrsMatrix) :: Mat - character(kind=C_CHAR, len=:), allocatable :: description - - OUT0("Starting TpetraCrsMatrix_computeGlobalConstants!") - - call TPetra_CrsMatrix_CreateIdentity(comm, Mat) - call Mat%fillComplete() - - TEST_NOTHROW(call Mat%computeGlobalConstants()) - - call Mat%release(); TEST_IERR() - - OUT0("Finished TpetraCrsMatrix_computeGlobalConstants!") - - END_FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_computeGlobalConstants) - - ! ---------------------------haveGlobalConstants---------------------------- ! - FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_haveGlobalConstants) - type(TpetraCrsMatrix) :: Mat - character(kind=C_CHAR, len=:), allocatable :: description - - OUT0("Starting TpetraCrsMatrix_haveGlobalConstants!") - - call TPetra_CrsMatrix_CreateIdentity(comm, Mat) - call Mat%fillComplete() - - call Mat%computeGlobalConstants() - TEST_ASSERT(Mat%haveGlobalConstants()) - - call Mat%release(); TEST_IERR() - - OUT0("Finished TpetraCrsMatrix_haveGlobalConstants!") - - END_FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_haveGlobalConstants) - ! -----------------------replaceDomainMapAndImporter------------------------ ! FORTRILINOS_UNIT_TEST(TpetraCrsMatrix_replaceDomainMapAndImporter) type(TpetraCrsMatrix) :: mat diff --git a/test/fortpetra/test_tpetra_crsmatrix_helper.F90 b/test/fortpetra/test_tpetra_crsmatrix_helper.F90 index e9f5f7a2..3d4e6a7d 100644 --- a/test/fortpetra/test_tpetra_crsmatrix_helper.F90 +++ b/test/fortpetra/test_tpetra_crsmatrix_helper.F90 @@ -47,7 +47,7 @@ subroutine Tpetra_CrsMatrix_CreateIdentity(comm,Mat) ! create the identity matrix base = test_matrix_num_local() * comm%getRank() - Mat = TpetraCrsMatrix(map, map, 1_size_type, TpetraStaticProfile) + Mat = TpetraCrsMatrix(map, map, 1_size_type) do irow = 1, test_matrix_num_local() gblrow = base + int(irow, kind=global_ordinal_type) cols(1) = gblrow @@ -87,8 +87,8 @@ subroutine Tpetra_CrsMatrix_CreateTestMatrix_A(comm,Mat) !rowmap = TpetraMap(TPETRA_GLOBAL_INVALID, test_matrix_num_row(), comm) !nnz=test_matrix_num_row()()*test_matrix_max_entries_per_row() !colmap = TpetraMap(TPETRA_GLOBAL_INVALID, nnz, comm) - !Mat = TpetraCrsMatrix(rowmap, colmap, test_matrix_max_entries_per_row(), TpetraStaticProfile) - Mat = TpetraCrsMatrix(map, test_matrix_max_entries_per_row(), TpetraStaticProfile) + !Mat = TpetraCrsMatrix(rowmap, colmap, test_matrix_max_entries_per_row()) + Mat = TpetraCrsMatrix(map, test_matrix_max_entries_per_row()) do irow=1,test_matrix_num_row() call Tpetra_CrsMatrix_GetTestMatrixRow_A(comm, irow, gblrow, cols, vals, nnz) @@ -202,7 +202,7 @@ subroutine Tpetra_CrsMatrix_CreateLabelledMat(comm,Mat) ! Leave room for three locally owned entries per row. ! We will only fill in two entries per row. - Mat = TpetraCrsMatrix(rowMap, ithree, TpetraStaticProfile) + Mat = TpetraCrsMatrix(rowMap, ithree) gblNumCols = gblNumRows allocate(gblColInds(2),vals(2)) diff --git a/test/fortpetra/test_tpetra_import_export.F90 b/test/fortpetra/test_tpetra_import_export.F90 index f7bfc1b1..0c3a1970 100644 --- a/test/fortpetra/test_tpetra_import_export.F90 +++ b/test/fortpetra/test_tpetra_import_export.F90 @@ -69,7 +69,7 @@ program test_TpetraImportExport permute = importer%getNumPermuteIDs() remote = importer%getNumRemoteIDs() the_sum = same + permute + remote - expected_sum = tgt%getNodeNumElements() + expected_sum = tgt%getLocalNumElements() TEST_EQUALITY(the_sum, expected_sum) ! Create Export and perform similar examination @@ -82,7 +82,7 @@ program test_TpetraImportExport permute = exporter%getNumPermuteIDs() remote = exporter%getNumRemoteIDs() the_sum = same + permute + remote - expected_sum = tgt%getNodeNumElements() + expected_sum = tgt%getLocalNumElements() TEST_EQUALITY(the_sum, expected_sum) call tgt%release(); TEST_IERR() @@ -333,7 +333,7 @@ program test_TpetraImportExport numSame = imp%getNumSameIDs() numRemote = imp%getNumRemoteIDs() numPermute = imp%getNumPermuteIDs() - numNodes = tgt%getNodeNumElements() + numNodes = tgt%getLocalNumElements() TEST_EQUALITY(numSame, numNodes - numPermute - numRemote) ! Export test @@ -343,7 +343,7 @@ program test_TpetraImportExport numSame = exp%getNumSameIDs() numRemote = exp%getNumRemoteIDs() numPermute = exp%getNumPermuteIDs() - numNodes = tgt%getNodeNumElements() + numNodes = tgt%getLocalNumElements() TEST_EQUALITY(numSame, numNodes - numPermute - numRemote) call imp%release(); TEST_IERR() @@ -370,7 +370,7 @@ program test_TpetraImportExport numSame = imp%getNumSameIDs() numRemote = imp%getNumRemoteIDs() numPermute = imp%getNumPermuteIDs() - numNodes = tgt%getNodeNumElements() + numNodes = tgt%getLocalNumElements() TEST_EQUALITY(numRemote, numNodes - numPermute - numSame) ! Export test @@ -380,7 +380,7 @@ program test_TpetraImportExport numRemote = exp%getNumRemoteIDs() numPermute = exp%getNumPermuteIDs() tgt = exp%getTargetMap() - numNodes = tgt%getNodeNumElements() + numNodes = tgt%getLocalNumElements() TEST_EQUALITY(numRemote, numNodes - numPermute - numSame) call imp%release(); TEST_IERR() @@ -407,7 +407,7 @@ program test_TpetraImportExport numSame = imp%getNumSameIDs() numRemote = imp%getNumRemoteIDs() numPermute = imp%getNumPermuteIDs() - numNodes = tgt%getNodeNumElements() + numNodes = tgt%getLocalNumElements() TEST_EQUALITY(numPermute, numNodes - numSame - numRemote) ! Export test @@ -417,7 +417,7 @@ program test_TpetraImportExport numRemote = exp%getNumRemoteIDs() numPermute = exp%getNumPermuteIDs() tgt = exp%getTargetMap() - numNodes = tgt%getNodeNumElements() + numNodes = tgt%getLocalNumElements() TEST_EQUALITY(numPermute, numNodes - numSame - numRemote) call imp%release(); TEST_IERR() diff --git a/test/fortpetra/test_tpetra_map.F90 b/test/fortpetra/test_tpetra_map.F90 index e3a0421e..d06e3696 100644 --- a/test/fortpetra/test_tpetra_map.F90 +++ b/test/fortpetra/test_tpetra_map.F90 @@ -88,7 +88,7 @@ program test_TpetraMap integer(global_ordinal_type) :: num_global num_global = 4*comm%getSize() Obj = TpetraMap(num_global, comm); TEST_IERR() - TEST_EQUALITY(Obj%getNodeNumElements(), 4) + TEST_EQUALITY(Obj%getLocalNumElements(), 4) call Obj%release(); TEST_IERR() END_FORTRILINOS_UNIT_TEST(TpetraMap_getNodeNumElements) @@ -195,7 +195,7 @@ program test_TpetraMap integer(global_ordinal_type) :: num_global num_global = 4*comm%getSize() Obj = TpetraMap(num_global, comm); TEST_IERR() - element_list => Obj%getNodeElementList() + element_list => Obj%getLocalElementList() call Obj%release(); TEST_IERR() END_FORTRILINOS_UNIT_TEST(TpetraMap_getNodeElementList) diff --git a/test/fortrilinos_hl/Tpetra_ModelEvaluator_1DFEM.F90 b/test/fortrilinos_hl/Tpetra_ModelEvaluator_1DFEM.F90 index f601ec35..7d12e7e5 100644 --- a/test/fortrilinos_hl/Tpetra_ModelEvaluator_1DFEM.F90 +++ b/test/fortrilinos_hl/Tpetra_ModelEvaluator_1DFEM.F90 @@ -153,7 +153,7 @@ function new_TpetraModelEvaluator1DFEM(comm, num_global_elems, z_min, z_max) & if (comm%getSize() == 1) then self%x_ghosted_map = self%x_owned_map else - num_overlap_nodes = self%x_owned_map%getNodeNumElements() + 2 + num_overlap_nodes = self%x_owned_map%getLocalNumElements() + 2 if ((comm%getRank() == 0) .or. (comm%getRank() == (comm%getSize() - 1))) & num_overlap_nodes = num_overlap_nodes - 1 if (comm%getRank() == 0) then @@ -207,10 +207,10 @@ function create_graph(self, owned_map, ghosted_map) result(graph) ! Create the shell for the graph num_ent_per_row = 5 - graph = TpetraCrsGraph(owned_map, ghosted_map, num_ent_per_row, TpetraStaticProfile) + graph = TpetraCrsGraph(owned_map, ghosted_map, num_ent_per_row) ! Declare required variables - num_my_overlap_nodes = ghosted_map%getNodeNumElements() + num_my_overlap_nodes = ghosted_map%getLocalNumElements() ! Loop Over # of Finite Elements on Processor do ne=1, num_my_overlap_nodes-1 @@ -252,7 +252,7 @@ function create_mesh(self, owned_map, z_min, z_max, num_elems) result(coords) real(scalar_type) :: dz ! ------------------------------------------------------------------------ ! - num_local_nodes = owned_map%getNodeNumElements() + num_local_nodes = owned_map%getLocalNumElements() min_GID = owned_map%getMinGlobalIndex() dz = (z_max - z_min) / num_elems coords = TpetraMultiVector(owned_map, num_vecs) @@ -297,7 +297,7 @@ subroutine TpetraModelEvaluator1DFEM_eval_resid(self, x, f) call f%putScalar(zero) my_rank = self%comm%getRank() - num_my_elems = self%x_ghosted_map%getNodeNumElements()-1 + num_my_elems = self%x_ghosted_map%getLocalNumElements()-1 ! Loop Over # of Finite Elements on Processor xdata => self%x%getData(ione) @@ -374,7 +374,7 @@ subroutine TpetraModelEvaluator1DFEM_eval_jac(self, x, J) call Jmat%setAllToScalar(zero) my_rank = self%comm%getRank() - num_my_elems = self%x_ghosted_map%getNodeNumElements()-1 + num_my_elems = self%x_ghosted_map%getLocalNumElements()-1 ! Loop Over # of Finite Elements on Processor xdata => self%x%getData(ione) @@ -467,7 +467,7 @@ subroutine TpetraModelEvaluator1DFEM_eval_prec(self, x, M) ! call self%J_diagonal%putScalar(zero) my_rank = self%comm%getRank() - num_my_elems = self%x_ghosted_map%getNodeNumElements()-1 + num_my_elems = self%x_ghosted_map%getLocalNumElements()-1 row_map = Mmat%getRowMap() col_map = Mmat%getColMap() diff --git a/test/fortrilinos_hl/Tpetra_ModelEvaluator_1DFEM_def.hpp b/test/fortrilinos_hl/Tpetra_ModelEvaluator_1DFEM_def.hpp index a5d7399e..8ded7760 100644 --- a/test/fortrilinos_hl/Tpetra_ModelEvaluator_1DFEM_def.hpp +++ b/test/fortrilinos_hl/Tpetra_ModelEvaluator_1DFEM_def.hpp @@ -37,7 +37,7 @@ TpetraModelEvaluator1DFEM(const Teuchos::RCP>& comm, } else { GO min_overlap_GID; - size_t num_overlap_nodes = x_owned_map_->getNodeNumElements() + 2; + size_t num_overlap_nodes = x_owned_map_->getLocalNumElements() + 2; if ((comm_->getRank() == 0) || (comm_->getRank() == (comm_->getSize() - 1))) --num_overlap_nodes; @@ -87,7 +87,7 @@ create_graph(const Teuchos::RCP& owned_map, // Declare required variables GO row, column; - size_t num_my_overlap_nodes = ghosted_map->getNodeNumElements(); + size_t num_my_overlap_nodes = ghosted_map->getLocalNumElements(); // Loop Over # of Finite Elements on Processor for (LO ne=0; ne(num_my_overlap_nodes-1); ne++) { @@ -120,7 +120,7 @@ create_mesh(const Teuchos::RCP& owned_map, const SC z_min, const SC z_max, const Tpetra::global_size_t num_elems) { - size_t num_local_nodes = owned_map->getNodeNumElements(); + size_t num_local_nodes = owned_map->getLocalNumElements(); GO min_GID = owned_map->getMinGlobalIndex(); SC dz = (z_max - z_min)/static_cast(num_elems); @@ -173,7 +173,7 @@ evaluate_residual(const Teuchos::RCP& xp, Teuchos::TimeMonitor timer(*resid_timer_); const LO invalid = Tpetra::Details::OrdinalTraits::invalid(); int my_rank = comm_->getRank(); - auto num_my_elems = x_ghosted_map_->getNodeNumElements()-1; + auto num_my_elems = x_ghosted_map_->getLocalNumElements()-1; // Loop Over # of Finite Elements on Processor auto x = x_ptr_->getLocalViewHost(Tpetra::Access::ReadOnlyStruct{}); @@ -238,7 +238,7 @@ evaluate_jacobian(const Teuchos::RCP& xp, const LO invalid = Tpetra::Details::OrdinalTraits::invalid(); int my_rank = comm_->getRank(); - auto num_my_elems = x_ghosted_map_->getNodeNumElements()-1; + auto num_my_elems = x_ghosted_map_->getLocalNumElements()-1; // Loop Over # of Finite Elements on Processor auto x = x_ptr_->getLocalViewHost(Tpetra::Access::ReadOnlyStruct{}); @@ -310,7 +310,7 @@ evaluate_preconditioner(const Teuchos::RCP& xp, const LO invalid = Tpetra::Details::OrdinalTraits::invalid(); int my_rank = comm_->getRank(); - auto num_my_elems = x_ghosted_map_->getNodeNumElements()-1; + auto num_my_elems = x_ghosted_map_->getLocalNumElements()-1; auto row_map = M_inv->getRowMap(); auto col_map = M_inv->getColMap(); diff --git a/test/fortrilinos_hl/test_eigen_handle.F90 b/test/fortrilinos_hl/test_eigen_handle.F90 index 8cf72c9c..b8631bd1 100644 --- a/test/fortrilinos_hl/test_eigen_handle.F90 +++ b/test/fortrilinos_hl/test_eigen_handle.F90 @@ -76,7 +76,7 @@ program main map = TpetraMap(n_global, n, comm); FORTRILINOS_CHECK_IERR() max_entries_per_row = 3 - A = TpetraCrsMatrix(map, max_entries_per_row, TpetraStaticProfile) + A = TpetraCrsMatrix(map, max_entries_per_row) allocate(cols(max_entries_per_row)) allocate(vals(max_entries_per_row)) diff --git a/test/fortrilinos_hl/test_eigen_unit.F90 b/test/fortrilinos_hl/test_eigen_unit.F90 index 4441ad74..7386a359 100644 --- a/test/fortrilinos_hl/test_eigen_unit.F90 +++ b/test/fortrilinos_hl/test_eigen_unit.F90 @@ -166,7 +166,7 @@ program test_TrilinosEigenSolver call Tpetra_CrsMatrix_CreateTestMatrix_A(comm,A) call A%fillComplete(); FORTRILINOS_CHECK_IERR() - n = A%getNodeNumRows() + n = A%getLocalNumRows() num_eigen = 1 ! This xml file was for another matrix, and we are repurposing but then diff --git a/test/fortrilinos_hl/test_solver_handle.F90 b/test/fortrilinos_hl/test_solver_handle.F90 index c0e7c07c..a6938cb3 100644 --- a/test/fortrilinos_hl/test_solver_handle.F90 +++ b/test/fortrilinos_hl/test_solver_handle.F90 @@ -228,7 +228,7 @@ program main map = TpetraMap(n_global, n, comm); FORTRILINOS_CHECK_IERR() max_entries_per_row = 3 - A = TpetraCrsMatrix(map, max_entries_per_row, TpetraStaticProfile) + A = TpetraCrsMatrix(map, max_entries_per_row) allocate(cols(max_entries_per_row)) allocate(vals(max_entries_per_row)) diff --git a/test/fortrilinos_hl/test_solver_unit.F90 b/test/fortrilinos_hl/test_solver_unit.F90 index f50aa503..f43d04fe 100644 --- a/test/fortrilinos_hl/test_solver_unit.F90 +++ b/test/fortrilinos_hl/test_solver_unit.F90 @@ -116,7 +116,7 @@ program test_TrilinosSolver call Tpetra_CrsMatrix_CreateTestMatrix_A(comm,A) call A%fillComplete(); FORTRILINOS_CHECK_IERR() - n = A%getNodeNumRows() + n = A%getLocalNumRows() map = A%getRowMap() B = TpetraMultiVector(map, num_vecs); FORTRILINOS_CHECK_IERR()