[PCS] Minor changes in name and others according to the comments by Nori and Dima

ProcessLib/HeatConduction/HeatConductionProcess.cpp

@@ -99,7 +99,7 @@ void HeatConductionProcess::assembleWithJacobianConcreteProcess(
 void HeatConductionProcess::computeSecondaryVariableConcrete(const double t,
                                                          GlobalVector const& x)
 {
-    DBUG("Compute the velocity for LiquidFlowProcess.");
+    DBUG("Compute heat flux for HeatConductionProcess.");
     GlobalExecutor::executeMemberOnDereferenced(
             &HeatConductionLocalAssemblerInterface::computeSecondaryVariable,
             _local_assemblers, *_local_to_global_index_map, t, x);

ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h

@@ -49,7 +49,7 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
 
 template <typename ShapeFunction, typename IntegrationMethod,
           unsigned GlobalDim>
-template <typename Calculator>
+template <typename LaplacianGravityVelocityCalculator>
 void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
     local_assemble(double const t, std::vector<double> const& local_x,
                    std::vector<double>& local_M_data,
@@ -100,7 +100,7 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
         const double mu = _material_properties.getViscosity(p, _temperature);
 
         // Assemble Laplacian, K, and RHS by the gravitational term
-        Calculator::calculateLaplacianAndGravityTerm(
+        LaplacianGravityVelocityCalculator::calculateLaplacianAndGravityTerm(
             local_K, local_b, sm, perm, integration_factor, mu, rho_g,
             _gravitational_axis_id);
     }
@@ -132,7 +132,7 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
 
 template <typename ShapeFunction, typename IntegrationMethod,
           unsigned GlobalDim>
-template <typename Calculator>
+template <typename LaplacianGravityVelocityCalculator>
 void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
     computeSecondaryVariableLocal(double const /*t*/,
                                   std::vector<double> const& local_x,
@@ -161,7 +161,8 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
         // Compute viscosity:
         const double mu = _material_properties.getViscosity(p, _temperature);
 
-        Calculator::calculateVelocity(_darcy_velocities, local_p_vec, sm, perm,
+        LaplacianGravityVelocityCalculator
+                  ::calculateVelocity(_darcy_velocities, local_p_vec, sm, perm,
                                       ip, mu, rho_g, _gravitational_axis_id);
     }
 }

ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h

@@ -171,7 +171,7 @@ private:
             int const gravitational_axis_id);
     };
 
-    template <typename Calculator>
+    template <typename LaplacianGravityVelocityCalculator>
     void local_assemble(double const t, std::vector<double> const& local_x,
                         std::vector<double>& local_M_data,
                         std::vector<double>& local_K_data,
@@ -179,7 +179,7 @@ private:
                         SpatialPosition const& pos,
                         Eigen::MatrixXd const& perm);
 
-    template <typename Calculator>
+    template <typename LaplacianGravityVelocityCalculator>
     void computeSecondaryVariableLocal(double const /*t*/,
                                        std::vector<double> const& local_x,
                                        SpatialPosition const& pos,

ProcessLib/Process.h

@@ -152,7 +152,7 @@ private:
                                              GlobalVector const& /*x*/){}
 
     virtual void computeSecondaryVariableConcrete(const double /*t*/,
-                                                  GlobalVector const& /*x*/) {};
+                                                  GlobalVector const& /*x*/) {}
 
     virtual NumLib::IterationResult postIterationConcreteProcess(
         GlobalVector const& /*x*/)

Data @ 8254884e

-Subproject commit 7a19025a1658a79ca444cee5d12c08a25c1ed6fc
+Subproject commit 8254884e43b6ac088e70ce74e23b7c0b72e886e6