Skip to content
Snippets Groups Projects
Commit fc4ea3d6 authored by Tom Fischer's avatar Tom Fischer
Browse files

[PL] Use SourceTerm instead of NodalSourceTerm.

parent 93771476
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "ProcessLib/BoundaryCondition/BoundaryCondition.h" #include "ProcessLib/BoundaryCondition/BoundaryCondition.h"
#include "ProcessLib/BoundaryCondition/CreateBoundaryCondition.h" #include "ProcessLib/BoundaryCondition/CreateBoundaryCondition.h"
#include "ProcessLib/SourceTerms/CreateSourceTerm.h" #include "ProcessLib/SourceTerms/CreateSourceTerm.h"
#include "ProcessLib/SourceTerms/NodalSourceTerm.h" #include "ProcessLib/SourceTerms/SourceTerm.h"
#include "ProcessLib/Utils/ProcessUtils.h" #include "ProcessLib/Utils/ProcessUtils.h"
namespace namespace
...@@ -211,14 +211,14 @@ ProcessVariable::createBoundaryConditions( ...@@ -211,14 +211,14 @@ ProcessVariable::createBoundaryConditions(
return bcs; return bcs;
} }
std::vector<std::unique_ptr<NodalSourceTerm>> std::vector<std::unique_ptr<SourceTerm>>
ProcessVariable::createSourceTerms( ProcessVariable::createSourceTerms(
const NumLib::LocalToGlobalIndexMap& dof_table, const NumLib::LocalToGlobalIndexMap& dof_table,
const int variable_id, const int variable_id,
unsigned const integration_order, unsigned const integration_order,
std::vector<std::unique_ptr<ParameterBase>> const& parameters) 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) for (auto& config : _source_term_configs)
source_terms.emplace_back(createSourceTerm( source_terms.emplace_back(createSourceTerm(
......
...@@ -25,7 +25,7 @@ class LocalToGlobalIndexMap; ...@@ -25,7 +25,7 @@ class LocalToGlobalIndexMap;
namespace ProcessLib namespace ProcessLib
{ {
class NodalSourceTerm; class SourceTerm;
class BoundaryCondition; class BoundaryCondition;
class Process; class Process;
} // namespace ProcessLib } // namespace ProcessLib
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
std::vector<std::unique_ptr<ParameterBase>> const& parameters, std::vector<std::unique_ptr<ParameterBase>> const& parameters,
Process const& process); 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, const NumLib::LocalToGlobalIndexMap& dof_table, const int variable_id,
unsigned const integration_order, unsigned const integration_order,
std::vector<std::unique_ptr<ParameterBase>> const& parameters); std::vector<std::unique_ptr<ParameterBase>> const& parameters);
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
namespace ProcessLib namespace ProcessLib
{ {
std::unique_ptr<NodalSourceTerm> createNodalSourceTerm( std::unique_ptr<SourceTerm> createNodalSourceTerm(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& st_mesh, BaseLib::ConfigTree const& config, MeshLib::Mesh const& st_mesh,
const NumLib::LocalToGlobalIndexMap& dof_table, const NumLib::LocalToGlobalIndexMap& dof_table,
std::size_t const bulk_mesh_id, const int variable_id, std::size_t const bulk_mesh_id, const int variable_id,
......
...@@ -26,13 +26,13 @@ class LocalToGlobalIndexMap; ...@@ -26,13 +26,13 @@ class LocalToGlobalIndexMap;
} }
namespace ProcessLib namespace ProcessLib
{ {
class NodalSourceTerm; class SourceTerm;
struct ParameterBase; struct ParameterBase;
} // namespace ProcessLib } // namespace ProcessLib
namespace ProcessLib namespace ProcessLib
{ {
std::unique_ptr<NodalSourceTerm> createNodalSourceTerm( std::unique_ptr<SourceTerm> createNodalSourceTerm(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& st_mesh, BaseLib::ConfigTree const& config, MeshLib::Mesh const& st_mesh,
const NumLib::LocalToGlobalIndexMap& dof_table, std::size_t mesh_id, const NumLib::LocalToGlobalIndexMap& dof_table, std::size_t mesh_id,
const int variable_id, const int component_id, const int variable_id, const int component_id,
......
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
#include "CreateSourceTerm.h" #include "CreateSourceTerm.h"
#include "CreateNodalSourceTerm.h" #include "CreateNodalSourceTerm.h"
#include "NodalSourceTerm.h" #include "SourceTerm.h"
#include "SourceTermConfig.h" #include "SourceTermConfig.h"
namespace ProcessLib namespace ProcessLib
{ {
std::unique_ptr<NodalSourceTerm> createSourceTerm( std::unique_ptr<SourceTerm> createSourceTerm(
const SourceTermConfig& config, const SourceTermConfig& config,
const NumLib::LocalToGlobalIndexMap& dof_table, const MeshLib::Mesh& mesh, const NumLib::LocalToGlobalIndexMap& dof_table, const MeshLib::Mesh& mesh,
const int variable_id, const unsigned /*integration_order*/, const int variable_id, const unsigned /*integration_order*/,
......
...@@ -26,13 +26,14 @@ class LocalToGlobalIndexMap; ...@@ -26,13 +26,14 @@ class LocalToGlobalIndexMap;
namespace ProcessLib namespace ProcessLib
{ {
class SourceTerm;
class NodalSourceTerm; class NodalSourceTerm;
struct SourceTermConfig; struct SourceTermConfig;
} // namespace ProcessLib } // namespace ProcessLib
namespace ProcessLib namespace ProcessLib
{ {
std::unique_ptr<NodalSourceTerm> createSourceTerm( std::unique_ptr<SourceTerm> createSourceTerm(
const SourceTermConfig& config, const SourceTermConfig& config,
const NumLib::LocalToGlobalIndexMap& dof_table, const MeshLib::Mesh& mesh, const NumLib::LocalToGlobalIndexMap& dof_table, const MeshLib::Mesh& mesh,
const int variable_id, const unsigned integration_order, const int variable_id, const unsigned integration_order,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#pragma once #pragma once
#include "ProcessLib/ProcessVariable.h" #include "ProcessLib/ProcessVariable.h"
#include "ProcessLib/SourceTerms/NodalSourceTerm.h" #include "ProcessLib/SourceTerms/SourceTerm.h"
namespace ProcessLib namespace ProcessLib
{ {
...@@ -32,7 +32,7 @@ public: ...@@ -32,7 +32,7 @@ public:
unsigned const integration_order); unsigned const integration_order);
private: 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; std::vector<std::unique_ptr<ParameterBase>> const& _parameters;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment