[Name] Changed the name of two class members for local assembly

 for the staggered coupling scheme

ProcessLib/AbstractJacobianAssembler.h

@@ -32,7 +32,7 @@ public:
 
     //! Assembles the Jacobian, the matrices \f$M\f$ and \f$K\f$, and the vector
     //! \f$b\f$ with coupling.
-    virtual void assembleWithJacobianAndCoupling(
+    virtual void assembleWithJacobianForStaggeredScheme(
         LocalAssemblerInterface& /*local_assembler*/, double const /*t*/,
         std::vector<double> const& /*local_xdot*/, const double /*dxdot_dx*/,
         const double /*dx_dx*/, std::vector<double>& /*local_M_data*/,

ProcessLib/AnalyticalJacobianAssembler.cpp

@@ -25,7 +25,7 @@ void AnalyticalJacobianAssembler::assembleWithJacobian(
                                          local_b_data, local_Jac_data);
 }
 
-void AnalyticalJacobianAssembler::assembleWithJacobianAndCoupling(
+void AnalyticalJacobianAssembler::assembleWithJacobianForStaggeredScheme(
     LocalAssemblerInterface& local_assembler, double const t,
     std::vector<double> const& local_xdot, const double dxdot_dx,
     const double dx_dx, std::vector<double>& local_M_data,
@@ -33,7 +33,7 @@ void AnalyticalJacobianAssembler::assembleWithJacobianAndCoupling(
     std::vector<double>& local_Jac_data,
     LocalCoupledSolutions const& local_coupled_solutions)
 {
-    local_assembler.assembleWithJacobianAndCoupling(
+    local_assembler.assembleWithJacobianForStaggeredScheme(
         t, local_xdot, dxdot_dx, dx_dx, local_M_data, local_K_data,
         local_b_data, local_Jac_data, local_coupled_solutions);
 }

ProcessLib/AnalyticalJacobianAssembler.h

@@ -38,7 +38,7 @@ public:
         std::vector<double>& local_K_data, std::vector<double>& local_b_data,
         std::vector<double>& local_Jac_data) override;
 
-    void assembleWithJacobianAndCoupling(
+    void assembleWithJacobianForStaggeredScheme(
         LocalAssemblerInterface& local_assembler,
         double const t, std::vector<double> const& local_xdot,
         const double dxdot_dx, const double dx_dx,

ProcessLib/HT/StaggeredHTFEM-impl.h

@@ -24,7 +24,7 @@ namespace HT
 template <typename ShapeFunction, typename IntegrationMethod,
           unsigned GlobalDim>
 void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
-    assembleWithCoupledTerm(double const t,
+    assembleForStaggeredScheme(double const t,
                             std::vector<double>& local_M_data,
                             std::vector<double>& local_K_data,
                             std::vector<double>& local_b_data,

ProcessLib/HT/StaggeredHTFEM.h

@@ -62,7 +62,7 @@ public:
     {
     }
 
-    void assembleWithCoupledTerm(
+    void assembleForStaggeredScheme(
         double const t, std::vector<double>& local_M_data,
         std::vector<double>& local_K_data, std::vector<double>& local_b_data,
         LocalCoupledSolutions const& coupled_xs) override;

ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h

@@ -215,7 +215,7 @@ template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
 void HydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
                                   ShapeFunctionPressure, IntegrationMethod,
                                   DisplacementDim>::
-    assembleWithJacobianAndCoupling(
+    assembleWithJacobianForStaggeredScheme(
         const double t,
         const std::vector<double>& local_xdot,
         const double dxdot_dx,

ProcessLib/HydroMechanics/HydroMechanicsFEM.h

@@ -356,7 +356,7 @@ public:
             .noalias() += Kup * p;
     }
 
-    void assembleWithJacobianAndCoupling(
+    void assembleWithJacobianForStaggeredScheme(
         double const t, std::vector<double> const& local_xdot,
         const double dxdot_dx, const double dx_dx,
         std::vector<double>& local_M_data, std::vector<double>& local_K_data,

ProcessLib/LocalAssemblerInterface.cpp

@@ -25,7 +25,7 @@ void LocalAssemblerInterface::assemble(double const /*t*/,
         "The assemble() function is not implemented in the local assembler.");
 }
 
-void LocalAssemblerInterface::assembleWithCoupledTerm(
+void LocalAssemblerInterface::assembleForStaggeredScheme(
     double const /*t*/,
     std::vector<double>& /*local_M_data*/,
     std::vector<double>& /*local_K_data*/,
@@ -33,7 +33,7 @@ void LocalAssemblerInterface::assembleWithCoupledTerm(
     LocalCoupledSolutions const& /*coupled_solutions*/)
 {
     OGS_FATAL(
-        "The assembleWithCoupledTerm() function is not implemented in the "
+        "The assembleForStaggeredScheme() function is not implemented in the "
         "local assembler.");
 }
 
@@ -50,7 +50,7 @@ void LocalAssemblerInterface::assembleWithJacobian(
         "assembler.");
 }
 
-void LocalAssemblerInterface::assembleWithJacobianAndCoupling(
+void LocalAssemblerInterface::assembleWithJacobianForStaggeredScheme(
     double const /*t*/, std::vector<double> const& /*local_xdot*/,
     const double /*dxdot_dx*/, const double /*dx_dx*/,
     std::vector<double>& /*local_M_data*/,
@@ -60,7 +60,7 @@ void LocalAssemblerInterface::assembleWithJacobianAndCoupling(
     LocalCoupledSolutions const& /*local_coupled_solutions*/)
 {
     OGS_FATAL(
-        "The assembleWithJacobianAndCoupling() function is not implemented in"
+        "The assembleWithJacobianForStaggeredScheme() function is not implemented in"
         " the local assembler.");
 }
 

ProcessLib/LocalAssemblerInterface.h

@@ -40,7 +40,7 @@ public:
                           std::vector<double>& local_K_data,
                           std::vector<double>& local_b_data);
 
-    virtual void assembleWithCoupledTerm(
+    virtual void assembleForStaggeredScheme(
         double const t,
         std::vector<double>& local_M_data,
         std::vector<double>& local_K_data,
@@ -56,7 +56,7 @@ public:
                                       std::vector<double>& local_b_data,
                                       std::vector<double>& local_Jac_data);
 
-    virtual void assembleWithJacobianAndCoupling(
+    virtual void assembleWithJacobianForStaggeredScheme(
         double const t, std::vector<double> const& local_xdot,
         const double dxdot_dx, const double dx_dx,
         std::vector<double>& local_M_data, std::vector<double>& local_K_data,

ProcessLib/VectorMatrixAssembler.cpp

@@ -75,9 +75,9 @@ void VectorMatrixAssembler::assemble(
             cpl_xs->dt, cpl_xs->process_id, std::move(local_coupled_xs0),
             std::move(local_coupled_xs));
 
-        local_assembler.assembleWithCoupledTerm(t, _local_M_data, _local_K_data,
-                                                _local_b_data,
-                                                local_coupled_solutions);
+        local_assembler.assembleForStaggeredScheme(t, _local_M_data,
+                                                   _local_K_data, _local_b_data,
+                                                   local_coupled_solutions);
     }
 
     auto const num_r_c = indices.size();
@@ -138,9 +138,9 @@ void VectorMatrixAssembler::assembleWithJacobian(
     {
         if (base_dof_table == nullptr)
         {
-            localAssembleWithJacobianAndCoupling(t, indices, indices,
-                                                 local_xdot, local_assembler,
-                                                 dxdot_dx, dx_dx, cpl_xs);
+            local_assembleWithJacobianForStaggeredScheme(
+                t, indices, indices, local_xdot, local_assembler, dxdot_dx,
+                dx_dx, cpl_xs);
         }
         else
         {
@@ -149,7 +149,7 @@ void VectorMatrixAssembler::assembleWithJacobian(
             {
                 const auto base_indices =
                     NumLib::getIndices(mesh_item_id, *base_dof_table);
-                localAssembleWithJacobianAndCoupling(
+                local_assembleWithJacobianForStaggeredScheme(
                     t, base_indices, indices, local_xdot, local_assembler,
                     dxdot_dx, dx_dx, cpl_xs);
             }
@@ -157,7 +157,7 @@ void VectorMatrixAssembler::assembleWithJacobian(
             {
                 const auto full_indices =
                     NumLib::getIndices(mesh_item_id, dof_table);
-                localAssembleWithJacobianAndCoupling(
+                local_assembleWithJacobianForStaggeredScheme(
                     t, indices, full_indices, local_xdot, local_assembler,
                     dxdot_dx, dx_dx, cpl_xs);
             }
@@ -197,7 +197,7 @@ void VectorMatrixAssembler::assembleWithJacobian(
     }
 }
 
-void VectorMatrixAssembler::localAssembleWithJacobianAndCoupling(
+void VectorMatrixAssembler::local_assembleWithJacobianForStaggeredScheme(
     const double t, std::vector<GlobalIndexType> const& base_indices,
     std::vector<GlobalIndexType> const& full_indices,
     std::vector<double> const& local_xdot,
@@ -222,7 +222,7 @@ void VectorMatrixAssembler::localAssembleWithJacobianAndCoupling(
         cpl_xs->dt, cpl_xs->process_id, std::move(local_coupled_xs0),
         std::move(local_coupled_xs));
 
-    _jacobian_assembler->assembleWithJacobianAndCoupling(
+    _jacobian_assembler->assembleWithJacobianForStaggeredScheme(
         local_assembler, t, local_xdot, dxdot_dx, dx_dx, _local_M_data,
         _local_K_data, _local_b_data, _local_Jac_data, local_coupled_solutions);
 }

ProcessLib/VectorMatrixAssembler.h

@@ -71,7 +71,7 @@ private:
     //! Used to assemble the Jacobian.
     std::unique_ptr<AbstractJacobianAssembler> _jacobian_assembler;
 
-    void localAssembleWithJacobianAndCoupling(
+    void local_assembleWithJacobianForStaggeredScheme(
         const double t, std::vector<GlobalIndexType> const& base_indices,
         std::vector<GlobalIndexType> const& full_indices,
         std::vector<double> const& local_xdot,