From cf40a47aa0c265764264201f906a9f9839d10794 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Thu, 16 Feb 2017 17:55:57 +0100
Subject: [PATCH] [Coupling] Changed some names
---
ProcessLib/HeatConduction/HeatConductionFEM-impl.h | 10 +++++-----
ProcessLib/HeatConduction/HeatConductionFEM.h | 10 +++++-----
ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h | 10 +++++-----
ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h | 10 +++++-----
ProcessLib/LocalAssemblerInterface.cpp | 4 ++--
ProcessLib/LocalAssemblerInterface.h | 2 +-
ProcessLib/VectorMatrixAssembler.cpp | 2 +-
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/ProcessLib/HeatConduction/HeatConductionFEM-impl.h b/ProcessLib/HeatConduction/HeatConductionFEM-impl.h
index 598bc0d1d46..2110040f4a2 100644
--- a/ProcessLib/HeatConduction/HeatConductionFEM-impl.h
+++ b/ProcessLib/HeatConduction/HeatConductionFEM-impl.h
@@ -106,11 +106,11 @@ void LocalAssemblerData<ShapeFunction, IntegrationMethod, GlobalDim>::
template <typename ShapeFunction, typename IntegrationMethod,
unsigned GlobalDim>
void LocalAssemblerData<ShapeFunction, IntegrationMethod, GlobalDim>::
- coupling_assemble(double const t, std::vector<double> const& local_x,
- std::vector<double>& local_M_data,
- std::vector<double>& local_K_data,
- std::vector<double>& /*local_b_data*/,
- LocalCouplingTerm const& coupled_term)
+ assembleWithCoupledTerm(double const t, std::vector<double> const& local_x,
+ std::vector<double>& local_M_data,
+ std::vector<double>& local_K_data,
+ std::vector<double>& /*local_b_data*/,
+ LocalCouplingTerm const& coupled_term)
{
for (auto const& coupled_process_pair : coupled_term.coupled_processes)
{
diff --git a/ProcessLib/HeatConduction/HeatConductionFEM.h b/ProcessLib/HeatConduction/HeatConductionFEM.h
index 3c65463b854..1afceed27c7 100644
--- a/ProcessLib/HeatConduction/HeatConductionFEM.h
+++ b/ProcessLib/HeatConduction/HeatConductionFEM.h
@@ -122,11 +122,11 @@ public:
}
}
- void coupling_assemble(double const t, std::vector<double> const& local_x,
- std::vector<double>& local_M_data,
- std::vector<double>& local_K_data,
- std::vector<double>& /*local_b_data*/,
- LocalCouplingTerm const& coupled_term) override;
+ void assembleWithCoupledTerm(
+ double const t, std::vector<double> const& local_x,
+ std::vector<double>& local_M_data, std::vector<double>& local_K_data,
+ std::vector<double>& /*local_b_data*/,
+ LocalCouplingTerm const& coupled_term) override;
void computeSecondaryVariableConcrete(
const double t, std::vector<double> const& local_x) override
diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
index 06c45aae362..50f6db7ead6 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
@@ -55,11 +55,11 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
template <typename ShapeFunction, typename IntegrationMethod,
unsigned GlobalDim>
void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
- coupling_assemble(double const t, std::vector<double> const& local_x,
- std::vector<double>& local_M_data,
- std::vector<double>& local_K_data,
- std::vector<double>& local_b_data,
- LocalCouplingTerm const& coupled_term)
+ assembleWithCoupledTerm(double const t, std::vector<double> const& local_x,
+ std::vector<double>& local_M_data,
+ std::vector<double>& local_K_data,
+ std::vector<double>& local_b_data,
+ LocalCouplingTerm const& coupled_term)
{
SpatialPosition pos;
pos.setElementID(_element.getID());
diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
index ad3aded431f..17850159952 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
@@ -88,11 +88,11 @@ public:
std::vector<double>& local_K_data,
std::vector<double>& local_b_data) override;
- void coupling_assemble(double const t, std::vector<double> const& local_x,
- std::vector<double>& local_M_data,
- std::vector<double>& local_K_data,
- std::vector<double>& local_b_data,
- LocalCouplingTerm const& coupled_term) override;
+ void assembleWithCoupledTerm(
+ double const t, std::vector<double> const& local_x,
+ std::vector<double>& local_M_data, std::vector<double>& local_K_data,
+ std::vector<double>& local_b_data,
+ LocalCouplingTerm const& coupled_term) override;
void computeSecondaryVariableConcrete(
double const /*t*/, std::vector<double> const& local_x) override;
diff --git a/ProcessLib/LocalAssemblerInterface.cpp b/ProcessLib/LocalAssemblerInterface.cpp
index 336ee0f67e1..c626e7cb71c 100644
--- a/ProcessLib/LocalAssemblerInterface.cpp
+++ b/ProcessLib/LocalAssemblerInterface.cpp
@@ -14,7 +14,7 @@
namespace ProcessLib
{
-void LocalAssemblerInterface::coupling_assemble(
+void LocalAssemblerInterface::assembleWithCoupledTerm(
double const /*t*/, std::vector<double> const& /*local_x*/,
std::vector<double>& /*local_M_data*/,
std::vector<double>& /*local_K_data*/,
@@ -22,7 +22,7 @@ void LocalAssemblerInterface::coupling_assemble(
LocalCouplingTerm const& /*coupling_term*/)
{
OGS_FATAL(
- "The coupling_assemble() function is not implemented in the local "
+ "The assembleWithCoupledTerm() function is not implemented in the local "
"assembler.");
}
diff --git a/ProcessLib/LocalAssemblerInterface.h b/ProcessLib/LocalAssemblerInterface.h
index 426e5d87e6d..040e6123f39 100644
--- a/ProcessLib/LocalAssemblerInterface.h
+++ b/ProcessLib/LocalAssemblerInterface.h
@@ -40,7 +40,7 @@ public:
std::vector<double>& local_M_data, std::vector<double>& local_K_data,
std::vector<double>& local_b_data) = 0;
- virtual void coupling_assemble(double const t,
+ virtual void assembleWithCoupledTerm(double const t,
std::vector<double> const& local_x,
std::vector<double>& local_M_data,
std::vector<double>& local_K_data,
diff --git a/ProcessLib/VectorMatrixAssembler.cpp b/ProcessLib/VectorMatrixAssembler.cpp
index ba007e7734d..0420af82b71 100644
--- a/ProcessLib/VectorMatrixAssembler.cpp
+++ b/ProcessLib/VectorMatrixAssembler.cpp
@@ -83,7 +83,7 @@ void VectorMatrixAssembler::assemble(
coupling_term.dt, coupling_term.coupled_processes,
std::move(local_coupled_xs0), std::move(local_coupled_xs));
- local_assembler.coupling_assemble(t, local_x, _local_M_data,
+ local_assembler.assembleWithCoupledTerm(t, local_x, _local_M_data,
_local_K_data, _local_b_data,
local_coupling_term);
}
--
GitLab