From fc4ea3d639c56ee6b3f1bfd9e0d2708128be28a6 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 18 Sep 2018 15:13:46 +0200
Subject: [PATCH] [PL] Use SourceTerm instead of NodalSourceTerm.

---
 ProcessLib/ProcessVariable.cpp                   | 6 +++---
 ProcessLib/ProcessVariable.h                     | 4 ++--
 ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp | 2 +-
 ProcessLib/SourceTerms/CreateNodalSourceTerm.h   | 4 ++--
 ProcessLib/SourceTerms/CreateSourceTerm.cpp      | 4 ++--
 ProcessLib/SourceTerms/CreateSourceTerm.h        | 3 ++-
 ProcessLib/SourceTerms/SourceTermCollection.h    | 4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp
index 71c75088729..475bf1e570f 100644
--- a/ProcessLib/ProcessVariable.cpp
+++ b/ProcessLib/ProcessVariable.cpp
@@ -18,7 +18,7 @@
 #include "ProcessLib/BoundaryCondition/BoundaryCondition.h"
 #include "ProcessLib/BoundaryCondition/CreateBoundaryCondition.h"
 #include "ProcessLib/SourceTerms/CreateSourceTerm.h"
-#include "ProcessLib/SourceTerms/NodalSourceTerm.h"
+#include "ProcessLib/SourceTerms/SourceTerm.h"
 #include "ProcessLib/Utils/ProcessUtils.h"
 
 namespace
@@ -211,14 +211,14 @@ ProcessVariable::createBoundaryConditions(
     return bcs;
 }
 
-std::vector<std::unique_ptr<NodalSourceTerm>>
+std::vector<std::unique_ptr<SourceTerm>>
 ProcessVariable::createSourceTerms(
     const NumLib::LocalToGlobalIndexMap& dof_table,
     const int variable_id,
     unsigned const integration_order,
     std::vector<std::unique_ptr<ParameterBase>> const& parameters)
 {
-    std::vector<std::unique_ptr<NodalSourceTerm>> source_terms;
+    std::vector<std::unique_ptr<SourceTerm>> source_terms;
 
     for (auto& config : _source_term_configs)
         source_terms.emplace_back(createSourceTerm(
diff --git a/ProcessLib/ProcessVariable.h b/ProcessLib/ProcessVariable.h
index 24101fb58d2..383e9761c8f 100644
--- a/ProcessLib/ProcessVariable.h
+++ b/ProcessLib/ProcessVariable.h
@@ -25,7 +25,7 @@ class LocalToGlobalIndexMap;
 
 namespace ProcessLib
 {
-class NodalSourceTerm;
+class SourceTerm;
 class BoundaryCondition;
 class Process;
 }  // namespace ProcessLib
@@ -59,7 +59,7 @@ public:
         std::vector<std::unique_ptr<ParameterBase>> const& parameters,
         Process const& process);
 
-    std::vector<std::unique_ptr<NodalSourceTerm>> createSourceTerms(
+    std::vector<std::unique_ptr<SourceTerm>> createSourceTerms(
         const NumLib::LocalToGlobalIndexMap& dof_table, const int variable_id,
         unsigned const integration_order,
         std::vector<std::unique_ptr<ParameterBase>> const& parameters);
diff --git a/ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp b/ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp
index 74d792253db..04c2227954d 100644
--- a/ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp
+++ b/ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp
@@ -18,7 +18,7 @@
 
 namespace ProcessLib
 {
-std::unique_ptr<NodalSourceTerm> createNodalSourceTerm(
+std::unique_ptr<SourceTerm> createNodalSourceTerm(
     BaseLib::ConfigTree const& config, MeshLib::Mesh const& st_mesh,
     const NumLib::LocalToGlobalIndexMap& dof_table,
     std::size_t const bulk_mesh_id, const int variable_id,
diff --git a/ProcessLib/SourceTerms/CreateNodalSourceTerm.h b/ProcessLib/SourceTerms/CreateNodalSourceTerm.h
index 9144d92f109..9f0c9716945 100644
--- a/ProcessLib/SourceTerms/CreateNodalSourceTerm.h
+++ b/ProcessLib/SourceTerms/CreateNodalSourceTerm.h
@@ -26,13 +26,13 @@ class LocalToGlobalIndexMap;
 }
 namespace ProcessLib
 {
-class NodalSourceTerm;
+class SourceTerm;
 struct ParameterBase;
 }  // namespace ProcessLib
 
 namespace ProcessLib
 {
-std::unique_ptr<NodalSourceTerm> createNodalSourceTerm(
+std::unique_ptr<SourceTerm> createNodalSourceTerm(
     BaseLib::ConfigTree const& config, MeshLib::Mesh const& st_mesh,
     const NumLib::LocalToGlobalIndexMap& dof_table, std::size_t mesh_id,
     const int variable_id, const int component_id,
diff --git a/ProcessLib/SourceTerms/CreateSourceTerm.cpp b/ProcessLib/SourceTerms/CreateSourceTerm.cpp
index 32a4a778c52..afd51408ba3 100644
--- a/ProcessLib/SourceTerms/CreateSourceTerm.cpp
+++ b/ProcessLib/SourceTerms/CreateSourceTerm.cpp
@@ -10,12 +10,12 @@
 #include "CreateSourceTerm.h"
 
 #include "CreateNodalSourceTerm.h"
-#include "NodalSourceTerm.h"
+#include "SourceTerm.h"
 #include "SourceTermConfig.h"
 
 namespace ProcessLib
 {
-std::unique_ptr<NodalSourceTerm> createSourceTerm(
+std::unique_ptr<SourceTerm> createSourceTerm(
     const SourceTermConfig& config,
     const NumLib::LocalToGlobalIndexMap& dof_table, const MeshLib::Mesh& mesh,
     const int variable_id, const unsigned /*integration_order*/,
diff --git a/ProcessLib/SourceTerms/CreateSourceTerm.h b/ProcessLib/SourceTerms/CreateSourceTerm.h
index 41c05899744..ddec4e111b6 100644
--- a/ProcessLib/SourceTerms/CreateSourceTerm.h
+++ b/ProcessLib/SourceTerms/CreateSourceTerm.h
@@ -26,13 +26,14 @@ class LocalToGlobalIndexMap;
 
 namespace ProcessLib
 {
+class SourceTerm;
 class NodalSourceTerm;
 struct SourceTermConfig;
 }  // namespace ProcessLib
 
 namespace ProcessLib
 {
-std::unique_ptr<NodalSourceTerm> createSourceTerm(
+std::unique_ptr<SourceTerm> createSourceTerm(
     const SourceTermConfig& config,
     const NumLib::LocalToGlobalIndexMap& dof_table, const MeshLib::Mesh& mesh,
     const int variable_id, const unsigned integration_order,
diff --git a/ProcessLib/SourceTerms/SourceTermCollection.h b/ProcessLib/SourceTerms/SourceTermCollection.h
index 751c5ad3a7d..77f8646c23a 100644
--- a/ProcessLib/SourceTerms/SourceTermCollection.h
+++ b/ProcessLib/SourceTerms/SourceTermCollection.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "ProcessLib/ProcessVariable.h"
-#include "ProcessLib/SourceTerms/NodalSourceTerm.h"
+#include "ProcessLib/SourceTerms/SourceTerm.h"
 
 namespace ProcessLib
 {
@@ -32,7 +32,7 @@ public:
         unsigned const integration_order);
 
 private:
-    std::vector<std::unique_ptr<NodalSourceTerm>> _source_terms;
+    std::vector<std::unique_ptr<SourceTerm>> _source_terms;
     std::vector<std::unique_ptr<ParameterBase>> const& _parameters;
 };
 
-- 
GitLab