From 72f1136ddff58a6aca117de2f3d6e9b9e7b33bf1 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Mon, 24 Oct 2022 16:40:13 +0200
Subject: [PATCH] [PL] Pass global matrix pointers to assemble fcts
---
ProcessLib/VectorMatrixAssembler.cpp | 32 ++++++++++++++--------------
ProcessLib/VectorMatrixAssembler.h | 4 ++--
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ProcessLib/VectorMatrixAssembler.cpp b/ProcessLib/VectorMatrixAssembler.cpp
index 99f44c61453..422e900926f 100644
--- a/ProcessLib/VectorMatrixAssembler.cpp
+++ b/ProcessLib/VectorMatrixAssembler.cpp
@@ -41,7 +41,7 @@ void VectorMatrixAssembler::assemble(
std::vector<NumLib::LocalToGlobalIndexMap const*> const& dof_tables,
const double t, double const dt, std::vector<GlobalVector*> const& x,
std::vector<GlobalVector*> const& x_prev, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
+ GlobalMatrix* M, GlobalMatrix* K, GlobalVector* b)
{
std::vector<std::vector<GlobalIndexType>> indices_of_processes;
indices_of_processes.reserve(dof_tables.size());
@@ -83,20 +83,20 @@ void VectorMatrixAssembler::assemble(
auto const r_c_indices =
NumLib::LocalToGlobalIndexMap::RowColumnIndices(indices, indices);
- if (!_local_M_data.empty())
+ if (M && !_local_M_data.empty())
{
auto const local_M = MathLib::toMatrix(_local_M_data, num_r_c, num_r_c);
- M.add(r_c_indices, local_M);
+ M->add(r_c_indices, local_M);
}
- if (!_local_K_data.empty())
+ if (K && !_local_K_data.empty())
{
auto const local_K = MathLib::toMatrix(_local_K_data, num_r_c, num_r_c);
- K.add(r_c_indices, local_K);
+ K->add(r_c_indices, local_K);
}
- if (!_local_b_data.empty())
+ if (b && !_local_b_data.empty())
{
assert(_local_b_data.size() == num_r_c);
- b.add(indices, _local_b_data);
+ b->add(indices, _local_b_data);
}
_local_output(t, process_id, mesh_item_id, _local_M_data, _local_K_data,
@@ -108,7 +108,7 @@ void VectorMatrixAssembler::assembleWithJacobian(
std::vector<NumLib::LocalToGlobalIndexMap const*> const& dof_tables,
const double t, double const dt, std::vector<GlobalVector*> const& x,
std::vector<GlobalVector*> const& x_prev, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac)
+ GlobalMatrix* M, GlobalMatrix* K, GlobalVector* b, GlobalMatrix* Jac)
{
std::vector<std::vector<GlobalIndexType>> indices_of_processes;
indices_of_processes.reserve(dof_tables.size());
@@ -153,26 +153,26 @@ void VectorMatrixAssembler::assembleWithJacobian(
auto const r_c_indices =
NumLib::LocalToGlobalIndexMap::RowColumnIndices(indices, indices);
- if (!_local_M_data.empty())
+ if (M && !_local_M_data.empty())
{
auto const local_M = MathLib::toMatrix(_local_M_data, num_r_c, num_r_c);
- M.add(r_c_indices, local_M);
+ M->add(r_c_indices, local_M);
}
- if (!_local_K_data.empty())
+ if (K && !_local_K_data.empty())
{
auto const local_K = MathLib::toMatrix(_local_K_data, num_r_c, num_r_c);
- K.add(r_c_indices, local_K);
+ K->add(r_c_indices, local_K);
}
- if (!_local_b_data.empty())
+ if (b && !_local_b_data.empty())
{
assert(_local_b_data.size() == num_r_c);
- b.add(indices, _local_b_data);
+ b->add(indices, _local_b_data);
}
- if (!_local_Jac_data.empty())
+ if (Jac && !_local_Jac_data.empty())
{
auto const local_Jac =
MathLib::toMatrix(_local_Jac_data, num_r_c, num_r_c);
- Jac.add(r_c_indices, local_Jac);
+ Jac->add(r_c_indices, local_Jac);
}
else
{
diff --git a/ProcessLib/VectorMatrixAssembler.h b/ProcessLib/VectorMatrixAssembler.h
index b96fb2219af..2bd58de8a05 100644
--- a/ProcessLib/VectorMatrixAssembler.h
+++ b/ProcessLib/VectorMatrixAssembler.h
@@ -48,7 +48,7 @@ public:
std::vector<NumLib::LocalToGlobalIndexMap const*> const& dof_tables,
double const t, double const dt, std::vector<GlobalVector*> const& x,
std::vector<GlobalVector*> const& x_prev, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b);
+ GlobalMatrix* M, GlobalMatrix* K, GlobalVector* b);
//! Assembles \c M, \c K, \c b, and the Jacobian \c Jac of the residual.
//! \note The Jacobian must be assembled.
@@ -58,7 +58,7 @@ public:
std::vector<NumLib::LocalToGlobalIndexMap const*> const& dof_tables,
const double t, double const dt, std::vector<GlobalVector*> const& x,
std::vector<GlobalVector*> const& x_prev, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac);
+ GlobalMatrix* M, GlobalMatrix* K, GlobalVector* b, GlobalMatrix* Jac);
private:
// temporary data only stored here in order to avoid frequent memory
--
GitLab