[PL/LiquidFlow] Mv body force vars to process data.

ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp

@@ -106,13 +106,13 @@ std::unique_ptr<Process> createLiquidFlowProcess(
     auto media_map =
         MaterialPropertyLib::createMaterialSpatialDistributionMap(media, mesh);
 
-    LiquidFlowData process_data{std::move(media_map)};
+    LiquidFlowData process_data{std::move(media_map), gravity_axis_id, g};
 
     return std::make_unique<LiquidFlowProcess>(
         std::move(name), mesh, std::move(jacobian_assembler), parameters,
         integration_order, std::move(process_variables),
         std::move(process_data), std::move(secondary_variables),
-        gravity_axis_id, g, std::move(surfaceflux));
+        std::move(surfaceflux));
 }
 
 }  // namespace LiquidFlow

ProcessLib/LiquidFlow/LiquidFlowData.h

@@ -25,6 +25,8 @@ struct LiquidFlowData final
 {
     std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>
         media_map;
+    const int gravitational_axis_id;
+    const double gravitational_acceleration;
 };
 
 }  // namespace LiquidFlow

ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h

@@ -202,8 +202,8 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
         // Assemble Laplacian, K, and RHS by the gravitational term
         LaplacianGravityVelocityCalculator::calculateLaplacianAndGravityTerm(
             local_K, local_b, ip_data, permeability, viscosity,
-            fluid_density * _gravitational_acceleration,
-            _gravitational_axis_id);
+            fluid_density * _process_data.gravitational_acceleration,
+            _process_data.gravitational_axis_id);
     }
 }
 
@@ -315,8 +315,8 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
                     .value(vars, pos, t, dt));
         LaplacianGravityVelocityCalculator::calculateVelocity(
             ip, local_p_vec, ip_data, permeability, viscosity,
-            fluid_density * _gravitational_acceleration, _gravitational_axis_id,
-            darcy_velocity_at_ips);
+            fluid_density * _process_data.gravitational_acceleration,
+            _process_data.gravitational_axis_id, darcy_velocity_at_ips);
     }
 }
 

ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h

@@ -90,13 +90,9 @@ public:
         std::size_t const /*local_matrix_size*/,
         bool const is_axially_symmetric,
         unsigned const integration_order,
-        int const gravitational_axis_id,
-        double const gravitational_acceleration,
         LiquidFlowData const& process_data)
         : _element(element),
           _integration_method(integration_order),
-          _gravitational_axis_id(gravitational_axis_id),
-          _gravitational_acceleration(gravitational_acceleration),
           _process_data(process_data)
     {
         unsigned const n_integration_points =
@@ -215,8 +211,6 @@ private:
         ParameterLib::SpatialPosition const& pos,
         MatrixOfVelocityAtIntegrationPoints& darcy_velocity_at_ips) const;
 
-    const int _gravitational_axis_id;
-    const double _gravitational_acceleration;
     const LiquidFlowData& _process_data;
 };
 

ProcessLib/LiquidFlow/LiquidFlowProcess.cpp

@@ -69,14 +69,10 @@ LiquidFlowProcess::LiquidFlowProcess(
         process_variables,
     LiquidFlowData&& process_data,
     SecondaryVariableCollection&& secondary_variables,
-    int const gravitational_axis_id,
-    double const gravitational_acceleration,
     std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux)
     : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters,
               integration_order, std::move(process_variables),
               std::move(secondary_variables)),
-      _gravitational_axis_id(gravitational_axis_id),
-      _gravitational_acceleration(gravitational_acceleration),
       _process_data(std::move(process_data)),
       _surfaceflux(std::move(surfaceflux))
 {
@@ -95,8 +91,7 @@ void LiquidFlowProcess::initializeConcreteProcess(
     ProcessLib::createLocalAssemblers<LiquidFlowLocalAssembler>(
         mesh.getDimension(), mesh.getElements(), dof_table,
         pv.getShapeFunctionOrder(), _local_assemblers,
-        mesh.isAxiallySymmetric(), integration_order, _gravitational_axis_id,
-        _gravitational_acceleration, _process_data);
+        mesh.isAxiallySymmetric(), integration_order, _process_data);
 
     _secondary_variables.addSecondaryVariable(
         "darcy_velocity",

ProcessLib/LiquidFlow/LiquidFlowProcess.h

@@ -66,8 +66,6 @@ public:
             process_variables,
         LiquidFlowData&& process_data,
         SecondaryVariableCollection&& secondary_variables,
-        int const gravitational_axis_id,
-        double const gravitational_acceleration,
         std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux);
 
     void computeSecondaryVariableConcrete(double const t,
@@ -81,12 +79,6 @@ public:
                             double const t,
                             std::vector<GlobalVector*> const& x) const override;
 
-    int getGravitationalAxisID() const { return _gravitational_axis_id; }
-    double getGravitationalAcceleration() const
-    {
-        return _gravitational_acceleration;
-    }
-
     void postTimestepConcreteProcess(std::vector<GlobalVector*> const& x,
                                      const double t,
                                      const double dt,
@@ -109,8 +101,6 @@ private:
         int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b,
         GlobalMatrix& Jac) override;
 
-    const int _gravitational_axis_id;
-    const double _gravitational_acceleration;
     LiquidFlowData _process_data;
 
     std::vector<std::unique_ptr<LiquidFlowLocalAssemblerInterface>>