diff --git a/ProcessLib/HeatConduction/HeatConductionFEM-impl.h b/ProcessLib/HeatConduction/HeatConductionFEM-impl.h index 598bc0d1d46a09f423304f021719fde6fc6757ba..2110040f4a262e826a5365f4b4ff10c480b283da 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 3c65463b8542341e2286c16bb7a743f768876c62..1afceed27c72ee287af4bacb2ddacbbf39e9a267 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 06c45aae362acdcb0744d11457a75a927e147243..50f6db7ead667394686365403ef92bd4f2dd816d 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 ad3aded431f3b5d34b29f81ba277dc8a83e46df4..1785015995230d1104e9a17aed03faf855e58526 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 336ee0f67e1a0855fe3c3b9256368b0605bc486f..c626e7cb71cd2b915e6f5fad759817bc2318929a 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 426e5d87e6d262644009828639e3e5fc8329ac4b..040e6123f39f15b892bde0074900094143fdd00f 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 ba007e7734d300e96a67400aa05d5e0c459f26ba..0420af82b719d319bcb3ab2e163b44d9836d59df 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); }