From 584fe4a96c55c707aeb2466130ee26d6b61f3d6a Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 18 Sep 2018 11:53:38 +0200
Subject: [PATCH] [PL/NodalSourceTerm] Renames for common interface.
Preparation for the SourceTerm interface class.
---
ProcessLib/Process.cpp | 2 +-
ProcessLib/SourceTerms/NodalSourceTerm.cpp | 22 +++++++++----------
ProcessLib/SourceTerms/NodalSourceTerm.h | 13 ++++++-----
.../SourceTerms/SourceTermCollection.cpp | 5 ++---
ProcessLib/SourceTerms/SourceTermCollection.h | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/ProcessLib/Process.cpp b/ProcessLib/Process.cpp
index 8e4ad70fe29..152f2a3fba1 100644
--- a/ProcessLib/Process.cpp
+++ b/ProcessLib/Process.cpp
@@ -189,7 +189,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, nullptr);
- _source_term_collections[pcs_id].integrateNodalSourceTerms(t, b);
+ _source_term_collections[pcs_id].integrate(t, b);
}
void Process::assembleWithJacobian(const double t, GlobalVector const& x,
diff --git a/ProcessLib/SourceTerms/NodalSourceTerm.cpp b/ProcessLib/SourceTerms/NodalSourceTerm.cpp
index e621545dce8..aec79c2217e 100644
--- a/ProcessLib/SourceTerms/NodalSourceTerm.cpp
+++ b/ProcessLib/SourceTerms/NodalSourceTerm.cpp
@@ -13,13 +13,14 @@
namespace ProcessLib
{
-NodalSourceTerm::NodalSourceTerm(const NumLib::LocalToGlobalIndexMap& dof_table,
- std::size_t const bulk_mesh_id,
- MeshLib::Mesh const& st_mesh,
- const int variable_id,
- const int component_id,
- Parameter<double> const& parameter)
- : _dof_table(dof_table),
+NodalSourceTerm::NodalSourceTerm(
+ const NumLib::LocalToGlobalIndexMap& source_term_dof_table,
+ std::size_t const bulk_mesh_id,
+ MeshLib::Mesh const& st_mesh,
+ const int variable_id,
+ const int component_id,
+ Parameter<double> const& parameter)
+ : _source_term_dof_table(source_term_dof_table),
_bulk_mesh_id(bulk_mesh_id),
_st_mesh(st_mesh),
_variable_id(variable_id),
@@ -36,8 +37,7 @@ NodalSourceTerm::NodalSourceTerm(const NumLib::LocalToGlobalIndexMap& dof_table,
}
}
-void NodalSourceTerm::integrateNodalSourceTerm(const double t,
- GlobalVector& b) const
+void NodalSourceTerm::integrate(const double t, GlobalVector& b) const
{
DBUG("Assemble NodalSourceTerm.");
@@ -49,8 +49,8 @@ void NodalSourceTerm::integrateNodalSourceTerm(const double t,
auto const node_id = node->getID();
MeshLib::Location const l{_bulk_mesh_id, MeshLib::MeshItemType::Node,
bulk_node_ids_map[node_id]};
- auto const index =
- _dof_table.getGlobalIndex(l, _variable_id, _component_id);
+ auto const index = _source_term_dof_table.getGlobalIndex(
+ l, _variable_id, _component_id);
SpatialPosition pos;
pos.setNodeID(node_id);
diff --git a/ProcessLib/SourceTerms/NodalSourceTerm.h b/ProcessLib/SourceTerms/NodalSourceTerm.h
index 4e51bda3cae..bdaa5a3d04a 100644
--- a/ProcessLib/SourceTerms/NodalSourceTerm.h
+++ b/ProcessLib/SourceTerms/NodalSourceTerm.h
@@ -17,15 +17,16 @@ namespace ProcessLib
class NodalSourceTerm final
{
public:
- NodalSourceTerm(const NumLib::LocalToGlobalIndexMap& dof_table,
- std::size_t const bulk_mesh_id,
- MeshLib::Mesh const& st_mesh, const int variable_id,
- const int component_id, Parameter<double> const& parameter);
+ explicit NodalSourceTerm(
+ const NumLib::LocalToGlobalIndexMap& source_term_dof_table,
+ std::size_t const bulk_mesh_id, MeshLib::Mesh const& st_mesh,
+ const int variable_id, const int component_id,
+ Parameter<double> const& parameter);
- void integrateNodalSourceTerm(const double t, GlobalVector& b) const;
+ void integrate(const double t, GlobalVector& b) const;
private:
- NumLib::LocalToGlobalIndexMap const& _dof_table;
+ NumLib::LocalToGlobalIndexMap const& _source_term_dof_table;
std::size_t const _bulk_mesh_id;
MeshLib::Mesh const& _st_mesh;
int const _variable_id;
diff --git a/ProcessLib/SourceTerms/SourceTermCollection.cpp b/ProcessLib/SourceTerms/SourceTermCollection.cpp
index f0dc7ba5f97..9636eae275a 100644
--- a/ProcessLib/SourceTerms/SourceTermCollection.cpp
+++ b/ProcessLib/SourceTerms/SourceTermCollection.cpp
@@ -29,11 +29,10 @@ void SourceTermCollection::addSourceTermsForProcessVariables(
}
}
-void SourceTermCollection::integrateNodalSourceTerms(const double t,
- GlobalVector& b) const
+void SourceTermCollection::integrate(const double t, GlobalVector& b) const
{
for (auto const& st : _source_terms)
- st->integrateNodalSourceTerm(t, b);
+ st->integrate(t, b);
}
}
diff --git a/ProcessLib/SourceTerms/SourceTermCollection.h b/ProcessLib/SourceTerms/SourceTermCollection.h
index bfa7f5a3478..751c5ad3a7d 100644
--- a/ProcessLib/SourceTerms/SourceTermCollection.h
+++ b/ProcessLib/SourceTerms/SourceTermCollection.h
@@ -23,7 +23,7 @@ public:
{
}
- void integrateNodalSourceTerms(const double t, GlobalVector& b) const;
+ void integrate(const double t, GlobalVector& b) const;
void addSourceTermsForProcessVariables(
std::vector<std::reference_wrapper<ProcessVariable>> const&
--
GitLab