From 9aa4bc04adf0d722f49b8ce0fe16af906e6d609a Mon Sep 17 00:00:00 2001 From: Weiguang Yang Date: Wed, 9 Aug 2023 16:28:39 -0700 Subject: [PATCH] Fix Compilation Errors with Trilino: change input arguments in trilinos_doassem_ and added a header file within shell.cpp (#81) Co-authored-by: Weiguang Yang --- Code/Source/svFSI/shells.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Code/Source/svFSI/shells.cpp b/Code/Source/svFSI/shells.cpp index 1536082..0f995f4 100644 --- a/Code/Source/svFSI/shells.cpp +++ b/Code/Source/svFSI/shells.cpp @@ -12,6 +12,10 @@ #include "nn.h" #include "utils.h" +#ifdef WITH_TRILINOS +#include "trilinos_linear_solver.h" +#endif + namespace shells { //----------------- @@ -163,7 +167,7 @@ void construct_shell(ComMod& com_mod, const mshType& lM, const Array& Ag // Assembly #ifdef WITH_TRILINOS if (eq.assmTLS) { - trilinos_doassem_(eNoN, ptr, lK, lR); + trilinos_doassem_(const_cast(eNoN), const_cast(ptr.data()), lK.data(), lR.data()); } else { #endif lhsa_ns::do_assem(com_mod, eNoN, ptr, lK, lR); @@ -1650,7 +1654,7 @@ void shell_cst(ComMod& com_mod, const mshType& lM, const int e, const int eNoN, #ifdef WITH_TRILINOS if (eq.assmTLS) { - trilinos_doassem_(eNoN, ptr, lK, lR); + trilinos_doassem_(const_cast(eNoN), const_cast(ptr.data()), lK.data(), lR.data()); } else { #endif lhsa_ns::do_assem(com_mod, eNoN, ptr, lK, lR);