Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a compilation erro with Trilino in shell.cpp #81

Merged
merged 2 commits into from
Aug 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Code/Source/svFSI/shells.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
#include "nn.h"
#include "utils.h"

#ifdef WITH_TRILINOS
#include "trilinos_linear_solver.h"
#endif

namespace shells {

//-----------------
Expand Down Expand Up @@ -163,7 +167,7 @@ void construct_shell(ComMod& com_mod, const mshType& lM, const Array<double>& Ag
// Assembly
#ifdef WITH_TRILINOS
if (eq.assmTLS) {
trilinos_doassem_(eNoN, ptr, lK, lR);
trilinos_doassem_(const_cast<int&>(eNoN), const_cast<int*>(ptr.data()), lK.data(), lR.data());
} else {
#endif
lhsa_ns::do_assem(com_mod, eNoN, ptr, lK, lR);
Expand Down Expand Up @@ -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<int&>(eNoN), const_cast<int*>(ptr.data()), lK.data(), lR.data());
} else {
#endif
lhsa_ns::do_assem(com_mod, eNoN, ptr, lK, lR);
Expand Down