From 09a9897c9ed6a52c6b4094cc048a20796a40532a Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Mon, 20 Nov 2017 15:13:06 +0100
Subject: [PATCH] Changed the name of coupling_term to coupled_solutions
---
ProcessLib/AbstractJacobianAssembler.h | 2 +-
.../ComponentTransportProcess.cpp | 4 +--
.../GroundwaterFlowProcess.cpp | 4 +--
ProcessLib/HT/HTProcess.cpp | 4 +--
.../HeatConduction/HeatConductionProcess.cpp | 6 ++--
.../HydroMechanicsProcess-impl.h | 4 +--
.../HydroMechanics/HydroMechanicsProcess.cpp | 2 +-
.../HydroMechanics/HydroMechanicsProcess.h | 4 +--
.../SmallDeformationProcess.h | 4 +--
.../LiquidFlowLocalAssembler-impl.h | 4 +--
.../LiquidFlow/LiquidFlowLocalAssembler.h | 20 ++++++------
ProcessLib/LiquidFlow/LiquidFlowProcess.cpp | 13 ++++----
ProcessLib/LocalAssemblerInterface.cpp | 4 +--
ProcessLib/LocalAssemblerInterface.h | 4 +--
.../PhaseField/PhaseFieldProcess-impl.h | 4 +--
ProcessLib/Process.cpp | 2 +-
ProcessLib/Process.h | 6 ++--
.../RichardsComponentTransportProcess.cpp | 4 +--
.../RichardsFlow/RichardsFlowProcess.cpp | 4 +--
.../SmallDeformationProcess-impl.h | 4 +--
ProcessLib/TES/TESProcess.cpp | 4 +--
.../ThermalTwoPhaseFlowWithPPProcess.cpp | 4 +--
.../ThermoMechanicsProcess-impl.h | 4 +--
.../TwoPhaseFlowWithPPProcess.cpp | 4 +--
.../TwoPhaseFlowWithPrhoProcess.cpp | 4 +--
ProcessLib/UncoupledProcessesTimeLoop.cpp | 11 ++++---
ProcessLib/VectorMatrixAssembler.cpp | 32 +++++++++----------
ProcessLib/VectorMatrixAssembler.h | 4 +--
28 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/ProcessLib/AbstractJacobianAssembler.h b/ProcessLib/AbstractJacobianAssembler.h
index f23d09b12c6..50dde014d8a 100644
--- a/ProcessLib/AbstractJacobianAssembler.h
+++ b/ProcessLib/AbstractJacobianAssembler.h
@@ -40,7 +40,7 @@ public:
std::vector<double>& /*local_K_data*/,
std::vector<double>& /*local_b_data*/,
std::vector<double>& /*local_Jac_data*/,
- LocalCoupledSolutions const& /*coupling_term*/)
+ LocalCoupledSolutions const& /*coupled_solutions*/)
{
}
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index fa23c26a5bc..bf446dacc27 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -63,7 +63,7 @@ void ComponentTransportProcess::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void ComponentTransportProcess::assembleWithJacobianConcreteProcess(
@@ -77,7 +77,7 @@ void ComponentTransportProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
} // namespace ComponentTransport
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
index 51a7bbf2ba6..68d90027557 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
@@ -68,7 +68,7 @@ void GroundwaterFlowProcess::assembleConcreteProcess(const double t,
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void GroundwaterFlowProcess::assembleWithJacobianConcreteProcess(
@@ -82,7 +82,7 @@ void GroundwaterFlowProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
} // namespace GroundwaterFlow
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index d371b551706..307e9cc46fd 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -62,7 +62,7 @@ void HTProcess::assembleConcreteProcess(const double t,
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void HTProcess::assembleWithJacobianConcreteProcess(
@@ -76,7 +76,7 @@ void HTProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
} // namespace HT
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.cpp b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
index 7e6ce63d992..0813b7b703e 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.cpp
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
@@ -95,7 +95,7 @@ void HeatConductionProcess::assembleConcreteProcess(const double t,
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void HeatConductionProcess::assembleWithJacobianConcreteProcess(
@@ -109,7 +109,7 @@ void HeatConductionProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
void HeatConductionProcess::computeSecondaryVariableConcrete(
@@ -119,7 +119,7 @@ void HeatConductionProcess::computeSecondaryVariableConcrete(
GlobalExecutor::executeMemberOnDereferenced(
&HeatConductionLocalAssemblerInterface::computeSecondaryVariable,
_local_assemblers, *_local_to_global_index_map, t, x,
- _coupling_term);
+ _coupled_solutions);
}
} // namespace HeatConduction
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
index a84d9389bce..cbdbe6e6f40 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
@@ -180,7 +180,7 @@ void HydroMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
template <int DisplacementDim>
@@ -196,7 +196,7 @@ void HydroMechanicsProcess<DisplacementDim>::
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
template <int DisplacementDim>
void HydroMechanicsProcess<DisplacementDim>::preTimestepConcreteProcess(
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
index 8be9402bbe8..898b4e6f487 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
@@ -408,7 +408,7 @@ void HydroMechanicsProcess<GlobalDim>::computeSecondaryVariableConcrete(
GlobalExecutor::executeMemberOnDereferenced(
&HydroMechanicsLocalAssemblerInterface::computeSecondaryVariable,
_local_assemblers, *_local_to_global_index_map, t, x,
- _coupling_term);
+ _coupled_solutions);
// Copy displacement jumps in a solution vector to mesh property
// Remark: the copy is required because mesh properties for primary
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
index 92bce62c4e0..ba65735a500 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
@@ -75,7 +75,7 @@ private:
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble,
_local_assemblers, *_local_to_global_index_map, t, x, M, K, b,
- _coupling_term);
+ _coupled_solutions);
}
void assembleWithJacobianConcreteProcess(
@@ -89,7 +89,7 @@ private:
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot,
- dxdot_dx, dx_dx, M, K, b, Jac, _coupling_term);
+ dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions);
}
void preTimestepConcreteProcess(GlobalVector const& x, double const t,
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
index 5679efc544e..588270daacf 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
@@ -73,7 +73,7 @@ private:
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble,
_local_assemblers, *_local_to_global_index_map, t, x, M, K, b,
- _coupling_term);
+ _coupled_solutions);
}
void assembleWithJacobianConcreteProcess(
@@ -87,7 +87,7 @@ private:
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot,
- dxdot_dx, dx_dx, M, K, b, Jac, _coupling_term);
+ dxdot_dx, dx_dx, M, K, b, Jac, _coupled_solutions);
}
void preTimestepConcreteProcess(GlobalVector const& x, double const t,
diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
index 34f505ea76f..6e6c923c5dd 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
@@ -268,7 +268,7 @@ LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
// the assert must be changed to perm.rows() == _element->getDimension()
assert(permeability.rows() == GlobalDim || permeability.rows() == 1);
- if (!_coupling_term)
+ if (!_coupled_solutions)
{
computeDarcyVelocity(permeability, local_x, veloctiy_cache_vectors);
}
@@ -276,7 +276,7 @@ LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
{
auto const local_coupled_xs =
getCurrentLocalSolutionsOfCoupledProcesses(
- _coupling_term->coupled_xs, indices);
+ _coupled_solutions->coupled_xs, indices);
if (local_coupled_xs.empty())
computeDarcyVelocity(permeability, local_x, veloctiy_cache_vectors);
else
diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
index 9e7ac66aed8..a5b29cf9281 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
@@ -43,15 +43,16 @@ class LiquidFlowLocalAssemblerInterface
{
public:
LiquidFlowLocalAssemblerInterface(
- CoupledSolutionsForStaggeredScheme* const coupling_term)
- : _coupling_term(coupling_term)
+ CoupledSolutionsForStaggeredScheme* const coupled_solutions)
+ : _coupled_solutions(coupled_solutions)
{
}
- void setCoupledSolutionsForStaggeredScheme(std::size_t const /*mesh_item_id*/,
- CoupledSolutionsForStaggeredScheme* const coupling_term)
+ void setCoupledSolutionsForStaggeredScheme(
+ std::size_t const /*mesh_item_id*/,
+ CoupledSolutionsForStaggeredScheme* const coupled_solutions)
{
- _coupling_term = coupling_term;
+ _coupled_solutions = coupled_solutions;
}
virtual std::vector<double> const& getIntPtDarcyVelocity(
@@ -61,11 +62,8 @@ public:
std::vector<double>& /*cache*/) const = 0;
protected:
- // TODO: remove _coupling_term or move integration point data from local
- // assembler class to a new class to make local assembler unique for each
- //process.
/// Pointer that is set from a Process class.
- CoupledSolutionsForStaggeredScheme* _coupling_term;
+ CoupledSolutionsForStaggeredScheme* _coupled_solutions;
};
template <typename ShapeFunction, typename IntegrationMethod,
@@ -95,8 +93,8 @@ public:
double const gravitational_acceleration,
double const reference_temperature,
LiquidFlowMaterialProperties const& material_propertries,
- CoupledSolutionsForStaggeredScheme* coupling_term)
- : LiquidFlowLocalAssemblerInterface(coupling_term),
+ CoupledSolutionsForStaggeredScheme* coupled_solutions)
+ : LiquidFlowLocalAssemblerInterface(coupled_solutions),
_element(element),
_integration_method(integration_order),
_shape_matrices(initShapeMatrices<ShapeFunction, ShapeMatricesType,
diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
index eb7147daf8e..7eba951fcbe 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
+++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
@@ -66,7 +66,7 @@ void LiquidFlowProcess::initializeConcreteProcess(
pv.getShapeFunctionOrder(), _local_assemblers,
mesh.isAxiallySymmetric(), integration_order, _gravitational_axis_id,
_gravitational_acceleration, _reference_temperature,
- *_material_properties, _coupling_term);
+ *_material_properties, _coupled_solutions);
_secondary_variables.addSecondaryVariable(
"darcy_velocity",
@@ -85,7 +85,7 @@ void LiquidFlowProcess::assembleConcreteProcess(const double t,
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void LiquidFlowProcess::assembleWithJacobianConcreteProcess(
@@ -99,7 +99,7 @@ void LiquidFlowProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
void LiquidFlowProcess::computeSecondaryVariableConcrete(const double t,
@@ -108,15 +108,16 @@ void LiquidFlowProcess::computeSecondaryVariableConcrete(const double t,
DBUG("Compute the velocity for LiquidFlowProcess.");
GlobalExecutor::executeMemberOnDereferenced(
&LiquidFlowLocalAssemblerInterface::computeSecondaryVariable,
- _local_assemblers, *_local_to_global_index_map, t, x, _coupling_term);
+ _local_assemblers, *_local_to_global_index_map, t, x, _coupled_solutions);
}
void LiquidFlowProcess::setCoupledSolutionsForStaggeredSchemeToLocalAssemblers()
{
DBUG("Compute the velocity for LiquidFlowProcess.");
GlobalExecutor::executeMemberOnDereferenced(
- &LiquidFlowLocalAssemblerInterface::setCoupledSolutionsForStaggeredScheme,
- _local_assemblers, _coupling_term);
+ &LiquidFlowLocalAssemblerInterface::
+ setCoupledSolutionsForStaggeredScheme,
+ _local_assemblers, _coupled_solutions);
}
} // end of namespace
diff --git a/ProcessLib/LocalAssemblerInterface.cpp b/ProcessLib/LocalAssemblerInterface.cpp
index 09320cdf6aa..c9c6876dab4 100644
--- a/ProcessLib/LocalAssemblerInterface.cpp
+++ b/ProcessLib/LocalAssemblerInterface.cpp
@@ -20,7 +20,7 @@ void LocalAssemblerInterface::assembleWithCoupledTerm(
std::vector<double>& /*local_M_data*/,
std::vector<double>& /*local_K_data*/,
std::vector<double>& /*local_b_data*/,
- LocalCoupledSolutions const& /*coupling_term*/)
+ LocalCoupledSolutions const& /*coupled_solutions*/)
{
OGS_FATAL(
"The assembleWithCoupledTerm() function is not implemented in the "
@@ -47,7 +47,7 @@ void LocalAssemblerInterface::assembleWithJacobianAndCoupling(
std::vector<double>& /*local_K_data*/,
std::vector<double>& /*local_b_data*/,
std::vector<double>& /*local_Jac_data*/,
- LocalCoupledSolutions const& /*coupling_term*/)
+ LocalCoupledSolutions const& /*coupled_solutions*/)
{
OGS_FATAL(
"The assembleWithJacobianAndCoupling() function is not implemented in"
diff --git a/ProcessLib/LocalAssemblerInterface.h b/ProcessLib/LocalAssemblerInterface.h
index e906d3de689..28bf1188f21 100644
--- a/ProcessLib/LocalAssemblerInterface.h
+++ b/ProcessLib/LocalAssemblerInterface.h
@@ -46,7 +46,7 @@ public:
std::vector<double>& local_M_data,
std::vector<double>& local_K_data,
std::vector<double>& local_b_data,
- LocalCoupledSolutions const& coupling_term);
+ LocalCoupledSolutions const& coupled_solutions);
virtual void assembleWithJacobian(double const t,
std::vector<double> const& local_x,
@@ -63,7 +63,7 @@ public:
const double dx_dx, std::vector<double>& local_M_data,
std::vector<double>& local_K_data, std::vector<double>& local_b_data,
std::vector<double>& local_Jac_data,
- LocalCoupledSolutions const& coupling_term);
+ LocalCoupledSolutions const& coupled_solutions);
virtual void computeSecondaryVariable(std::size_t const mesh_item_id,
NumLib::LocalToGlobalIndexMap const& dof_table,
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess-impl.h b/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
index ddb38a15d09..527c935d52a 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
+++ b/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
@@ -142,7 +142,7 @@ void PhaseFieldProcess<DisplacementDim>::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
template <int DisplacementDim>
@@ -157,7 +157,7 @@ void PhaseFieldProcess<DisplacementDim>::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
template <int DisplacementDim>
diff --git a/ProcessLib/Process.cpp b/ProcessLib/Process.cpp
index 706425cb172..69b15f52b2a 100644
--- a/ProcessLib/Process.cpp
+++ b/ProcessLib/Process.cpp
@@ -31,7 +31,7 @@ Process::Process(
_secondary_variables(std::move(secondary_variables)),
_named_function_caller(std::move(named_function_caller)),
_global_assembler(std::move(jacobian_assembler)),
- _coupling_term(nullptr),
+ _coupled_solutions(nullptr),
_integration_order(integration_order),
_process_variables(std::move(process_variables)),
_boundary_conditions(parameters)
diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h
index 68cdb64457f..e2ec183a596 100644
--- a/ProcessLib/Process.h
+++ b/ProcessLib/Process.h
@@ -71,9 +71,9 @@ public:
MathLib::MatrixSpecifications getMatrixSpecifications() const final;
- void setCoupledSolutionsForStaggeredScheme(CoupledSolutionsForStaggeredScheme* const coupling_term)
+ void setCoupledSolutionsForStaggeredScheme(CoupledSolutionsForStaggeredScheme* const coupled_solutions)
{
- _coupling_term = coupling_term;
+ _coupled_solutions = coupled_solutions;
}
virtual void setCoupledSolutionsForStaggeredSchemeToLocalAssemblers() {}
@@ -205,7 +205,7 @@ protected:
/// Pointer to CoupledSolutionsForStaggeredScheme, which contains the references to the
/// coupled processes and the references to the solutions of the coupled
/// processes.
- CoupledSolutionsForStaggeredScheme* _coupling_term;
+ CoupledSolutionsForStaggeredScheme* _coupled_solutions;
/// Order of the integration method for element-wise integration.
/// The Gauss-Legendre integration method and available orders is
diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
index 67a93c25251..00f5dcd9e53 100644
--- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
+++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
@@ -70,7 +70,7 @@ void RichardsComponentTransportProcess::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void RichardsComponentTransportProcess::assembleWithJacobianConcreteProcess(
@@ -84,7 +84,7 @@ void RichardsComponentTransportProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
} // namespace RichardsComponentTransport
diff --git a/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp b/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
index 612dc11b125..40740755ae2 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
+++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
@@ -73,7 +73,7 @@ void RichardsFlowProcess::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void RichardsFlowProcess::assembleWithJacobianConcreteProcess(
@@ -87,7 +87,7 @@ void RichardsFlowProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
} // namespace RichardsFlow
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h b/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
index eac1b1ec5c9..5c4f86d9109 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
@@ -150,7 +150,7 @@ void SmallDeformationProcess<DisplacementDim>::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
template <int DisplacementDim>
@@ -166,7 +166,7 @@ void SmallDeformationProcess<DisplacementDim>::
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
b.copyValues(*_nodal_forces);
std::transform(_nodal_forces->begin(), _nodal_forces->end(),
diff --git a/ProcessLib/TES/TESProcess.cpp b/ProcessLib/TES/TESProcess.cpp
index f1efbc72faf..5afdac55951 100644
--- a/ProcessLib/TES/TESProcess.cpp
+++ b/ProcessLib/TES/TESProcess.cpp
@@ -232,7 +232,7 @@ void TESProcess::assembleConcreteProcess(const double t,
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void TESProcess::assembleWithJacobianConcreteProcess(
@@ -243,7 +243,7 @@ void TESProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
void TESProcess::preTimestepConcreteProcess(GlobalVector const& x,
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
index 33a72db4761..e6e86b68894 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
@@ -80,7 +80,7 @@ void ThermalTwoPhaseFlowWithPPProcess::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void ThermalTwoPhaseFlowWithPPProcess::assembleWithJacobianConcreteProcess(
@@ -94,7 +94,7 @@ void ThermalTwoPhaseFlowWithPPProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
void ThermalTwoPhaseFlowWithPPProcess::preTimestepConcreteProcess(
GlobalVector const& x, double const t, double const delta_t)
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
index 25fc9223234..493b6b1fb5b 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
@@ -154,7 +154,7 @@ void ThermoMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
template <int DisplacementDim>
@@ -172,7 +172,7 @@ void ThermoMechanicsProcess<DisplacementDim>::
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
template <int DisplacementDim>
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
index d64c5e6a9ad..ef7cfdfcb05 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
@@ -78,7 +78,7 @@ void TwoPhaseFlowWithPPProcess::assembleConcreteProcess(const double t,
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void TwoPhaseFlowWithPPProcess::assembleWithJacobianConcreteProcess(
@@ -92,7 +92,7 @@ void TwoPhaseFlowWithPPProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
} // end of namespace
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
index a1a4f37bb2e..16e4b985f70 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
@@ -78,7 +78,7 @@ void TwoPhaseFlowWithPrhoProcess::assembleConcreteProcess(const double t,
// Call global assembler for each local assembly item.
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- *_local_to_global_index_map, t, x, M, K, b, _coupling_term);
+ *_local_to_global_index_map, t, x, M, K, b, _coupled_solutions);
}
void TwoPhaseFlowWithPrhoProcess::assembleWithJacobianConcreteProcess(
@@ -92,7 +92,7 @@ void TwoPhaseFlowWithPrhoProcess::assembleWithJacobianConcreteProcess(
GlobalExecutor::executeMemberDereferenced(
_global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
_local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupling_term);
+ dx_dx, M, K, b, Jac, _coupled_solutions);
}
void TwoPhaseFlowWithPrhoProcess::preTimestepConcreteProcess(
GlobalVector const& x, double const t, double const dt)
diff --git a/ProcessLib/UncoupledProcessesTimeLoop.cpp b/ProcessLib/UncoupledProcessesTimeLoop.cpp
index 2cfb840612e..f7fbd419d8a 100644
--- a/ProcessLib/UncoupledProcessesTimeLoop.cpp
+++ b/ProcessLib/UncoupledProcessesTimeLoop.cpp
@@ -916,11 +916,11 @@ bool UncoupledProcessesTimeLoop::solveCoupledEquationSystemsByStaggeredScheme(
spd->process.preTimestep(x, t, dt);
}
- CoupledSolutionsForStaggeredScheme coupling_term(
+ CoupledSolutionsForStaggeredScheme coupled_solutions(
spd->coupled_processes,
_solutions_of_coupled_processes[pcs_idx], dt);
- spd->process.setCoupledSolutionsForStaggeredScheme(&coupling_term);
+ spd->process.setCoupledSolutionsForStaggeredScheme(&coupled_solutions);
const auto nonlinear_solver_succeeded = solveOneTimeStepOneProcess(
x, timestep_id, t, dt, *spd, *_output);
@@ -1034,12 +1034,13 @@ void UncoupledProcessesTimeLoop::outputSolutions(
spd->timestepper->getTimeStep().dt());
if (is_staggered_coupling)
{
- CoupledSolutionsForStaggeredScheme coupling_term(
+ CoupledSolutionsForStaggeredScheme coupled_solutions(
spd->coupled_processes,
_solutions_of_coupled_processes[pcs_idx], 0.0);
- spd->process.setCoupledSolutionsForStaggeredScheme(&coupling_term);
- spd->process.setCoupledSolutionsForStaggeredSchemeToLocalAssemblers();
+ spd->process.setCoupledSolutionsForStaggeredScheme(&coupled_solutions);
+ spd->process
+ .setCoupledSolutionsForStaggeredSchemeToLocalAssemblers();
(output_object.*output_class_member)(pcs, spd->process_output,
timestep, t, x);
}
diff --git a/ProcessLib/VectorMatrixAssembler.cpp b/ProcessLib/VectorMatrixAssembler.cpp
index 563d899b80b..398c7a5d45b 100644
--- a/ProcessLib/VectorMatrixAssembler.cpp
+++ b/ProcessLib/VectorMatrixAssembler.cpp
@@ -21,13 +21,13 @@ namespace ProcessLib
{
static std::unordered_map<std::type_index, const std::vector<double>>
getPreviousLocalSolutionsOfCoupledProcesses(
- const CoupledSolutionsForStaggeredScheme& coupling_term,
+ const CoupledSolutionsForStaggeredScheme& coupled_solutions,
const std::vector<GlobalIndexType>& indices)
{
std::unordered_map<std::type_index, const std::vector<double>>
local_coupled_xs0;
- for (auto const& coupled_process_pair : coupling_term.coupled_processes)
+ for (auto const& coupled_process_pair : coupled_solutions.coupled_processes)
{
auto const& coupled_pcs = coupled_process_pair.second;
auto const prevous_time_x = coupled_pcs.getPreviousTimeStepSolution();
@@ -59,7 +59,7 @@ void VectorMatrixAssembler::assemble(
const std::size_t mesh_item_id, LocalAssemblerInterface& local_assembler,
const NumLib::LocalToGlobalIndexMap& dof_table, const double t,
const GlobalVector& x, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b,
- const CoupledSolutionsForStaggeredScheme* coupling_term)
+ const CoupledSolutionsForStaggeredScheme* coupled_solutions)
{
auto const indices = NumLib::getIndices(mesh_item_id, dof_table);
auto const local_x = x.get(indices);
@@ -68,7 +68,7 @@ void VectorMatrixAssembler::assemble(
_local_K_data.clear();
_local_b_data.clear();
- if (!coupling_term)
+ if (!coupled_solutions)
{
local_assembler.assemble(t, local_x, _local_M_data, _local_K_data,
_local_b_data);
@@ -76,9 +76,9 @@ void VectorMatrixAssembler::assemble(
else
{
auto local_coupled_xs0 = getPreviousLocalSolutionsOfCoupledProcesses(
- *coupling_term, indices);
+ *coupled_solutions, indices);
auto local_coupled_xs = getCurrentLocalSolutionsOfCoupledProcesses(
- coupling_term->coupled_xs, indices);
+ coupled_solutions->coupled_xs, indices);
if (local_coupled_xs0.empty() || local_coupled_xs.empty())
{
@@ -87,13 +87,13 @@ void VectorMatrixAssembler::assemble(
}
else
{
- ProcessLib::LocalCoupledSolutions local_coupling_term(
- coupling_term->dt, coupling_term->coupled_processes,
+ ProcessLib::LocalCoupledSolutions local_coupled_solutions(
+ coupled_solutions->dt, coupled_solutions->coupled_processes,
std::move(local_coupled_xs0), std::move(local_coupled_xs));
local_assembler.assembleWithCoupledTerm(
t, local_x, _local_M_data, _local_K_data, _local_b_data,
- local_coupling_term);
+ local_coupled_solutions);
}
}
@@ -123,7 +123,7 @@ void VectorMatrixAssembler::assembleWithJacobian(
NumLib::LocalToGlobalIndexMap const& dof_table, const double t,
GlobalVector const& x, GlobalVector const& xdot, const double dxdot_dx,
const double dx_dx, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b,
- GlobalMatrix& Jac, const CoupledSolutionsForStaggeredScheme* coupling_term)
+ GlobalMatrix& Jac, const CoupledSolutionsForStaggeredScheme* coupled_solutions)
{
auto const indices = NumLib::getIndices(mesh_item_id, dof_table);
auto const local_x = x.get(indices);
@@ -134,7 +134,7 @@ void VectorMatrixAssembler::assembleWithJacobian(
_local_b_data.clear();
_local_Jac_data.clear();
- if (!coupling_term)
+ if (!coupled_solutions)
{
_jacobian_assembler->assembleWithJacobian(
local_assembler, t, local_x, local_xdot, dxdot_dx, dx_dx,
@@ -143,9 +143,9 @@ void VectorMatrixAssembler::assembleWithJacobian(
else
{
auto local_coupled_xs0 = getPreviousLocalSolutionsOfCoupledProcesses(
- *coupling_term, indices);
+ *coupled_solutions, indices);
auto local_coupled_xs = getCurrentLocalSolutionsOfCoupledProcesses(
- coupling_term->coupled_xs, indices);
+ coupled_solutions->coupled_xs, indices);
if (local_coupled_xs0.empty() || local_coupled_xs.empty())
{
_jacobian_assembler->assembleWithJacobian(
@@ -154,14 +154,14 @@ void VectorMatrixAssembler::assembleWithJacobian(
}
else
{
- ProcessLib::LocalCoupledSolutions local_coupling_term(
- coupling_term->dt, coupling_term->coupled_processes,
+ ProcessLib::LocalCoupledSolutions local_coupled_solutions(
+ coupled_solutions->dt, coupled_solutions->coupled_processes,
std::move(local_coupled_xs0), std::move(local_coupled_xs));
_jacobian_assembler->assembleWithJacobianAndCoupling(
local_assembler, t, local_x, local_xdot, dxdot_dx, dx_dx,
_local_M_data, _local_K_data, _local_b_data, _local_Jac_data,
- local_coupling_term);
+ local_coupled_solutions);
}
}
diff --git a/ProcessLib/VectorMatrixAssembler.h b/ProcessLib/VectorMatrixAssembler.h
index 2c2b087fbc6..5f305cc482b 100644
--- a/ProcessLib/VectorMatrixAssembler.h
+++ b/ProcessLib/VectorMatrixAssembler.h
@@ -40,7 +40,7 @@ public:
NumLib::LocalToGlobalIndexMap const& dof_table,
double const t, GlobalVector const& x, GlobalMatrix& M,
GlobalMatrix& K, GlobalVector& b,
- const CoupledSolutionsForStaggeredScheme* coupling_term);
+ const CoupledSolutionsForStaggeredScheme* coupled_solutions);
//! Assembles \c M, \c K, \c b, and the Jacobian \c Jac of the residual.
//! \note The Jacobian must be assembled.
@@ -52,7 +52,7 @@ public:
const double dx_dx, GlobalMatrix& M,
GlobalMatrix& K, GlobalVector& b,
GlobalMatrix& Jac,
- const CoupledSolutionsForStaggeredScheme* coupling_term);
+ const CoupledSolutionsForStaggeredScheme* coupled_solutions);
private:
// temporary data only stored here in order to avoid frequent memory
--
GitLab