From 671ea99003de7f709f0430d878072e03f134ec21 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 25 Jan 2018 14:54:09 +0100
Subject: [PATCH] [PL] Use SourceTermCollection.
---
ProcessLib/Process.cpp | 28 ++++++++++++++--------------
ProcessLib/Process.h | 8 +++++---
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/ProcessLib/Process.cpp b/ProcessLib/Process.cpp
index 8e2e0875f28..4647714e169 100644
--- a/ProcessLib/Process.cpp
+++ b/ProcessLib/Process.cpp
@@ -47,6 +47,16 @@ Process::Process(
pcs_BCs.emplace_back(BoundaryConditionCollection(parameters));
}
return pcs_BCs;
+ }(_process_variables.size())),
+ _source_term_collections([&](const std::size_t number_of_processes)
+ -> std::vector<SourceTermCollection> {
+ std::vector<SourceTermCollection> pcs_sts;
+ pcs_sts.reserve(number_of_processes);
+ for (std::size_t i = 0; i < number_of_processes; i++)
+ {
+ pcs_sts.emplace_back(SourceTermCollection(parameters));
+ }
+ return pcs_sts;
}(_process_variables.size()))
{
}
@@ -60,15 +70,9 @@ void Process::initializeProcessBoundaryConditionsAndSourceTerms(
per_process_BCs.addBCsForProcessVariables(per_process_variables, dof_table,
_integration_order);
- std::vector<std::unique_ptr<NodalSourceTerm>> per_process_source_terms;
- for (auto& pv : per_process_variables)
- {
- auto sts = pv.get().createSourceTerms(dof_table, 0, _integration_order);
-
- std::move(sts.begin(), sts.end(),
- std::back_inserter(per_process_source_terms));
- }
- _source_terms.push_back(std::move(per_process_source_terms));
+ auto& per_process_sts = _source_term_collections[process_id];
+ per_process_sts.addSourceTermsForProcessVariables(
+ per_process_variables, dof_table, _integration_order);
}
void Process::initializeBoundaryConditions()
@@ -188,11 +192,7 @@ void Process::assemble(const double t, GlobalVector const& x, GlobalMatrix& M,
(_coupled_solutions) != nullptr ? _coupled_solutions->process_id : 0;
_boundary_conditions[pcs_id].applyNaturalBC(t, x, K, b);
- auto& source_terms_per_pcs = _source_terms[pcs_id];
- for (auto& st : source_terms_per_pcs)
- {
- st->integrateNodalSourceTerm(t, b);
- }
+ _source_term_collections[pcs_id].integrateNodalSourceTerms(t, b);
}
void Process::assembleWithJacobian(const double t, GlobalVector const& x,
diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h
index 1ffb253dc71..467a04085e6 100644
--- a/ProcessLib/Process.h
+++ b/ProcessLib/Process.h
@@ -16,6 +16,7 @@
#include "NumLib/ODESolver/ODESystem.h"
#include "NumLib/ODESolver/TimeDiscretization.h"
#include "ProcessLib/BoundaryCondition/BoundaryConditionCollection.h"
+#include "ProcessLib/SourceTerms/SourceTermCollection.h"
#include "ProcessLib/Output/CachedSecondaryVariable.h"
#include "ProcessLib/Output/ExtrapolatorData.h"
#include "ProcessLib/Output/SecondaryVariable.h"
@@ -278,9 +279,10 @@ private:
/// scheme, the size of vector is the number of the coupled processes.
std::vector<BoundaryConditionCollection> _boundary_conditions;
- /// Vector for nodal source terms. The outer vector is for processes,
- /// which has the same size as that for boundary conditions.
- std::vector<std::vector<std::unique_ptr<NodalSourceTerm>>> _source_terms;
+ /// Vector for nodal source term collections. For the monolithic scheme
+ /// or a single process, the size of the vector is one. For the staggered
+ /// scheme, the size of vector is the number of the coupled processes.
+ std::vector<SourceTermCollection> _source_term_collections;
ExtrapolatorData _extrapolator_data;
};
--
GitLab