Merge pull request #2630 from endJunction/VariousCleanups

Various cleanups

MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h

@@ -25,10 +25,6 @@
 // TODO
 // The matereial properties for two phase flow process need to be restructured
 // and moved to a better place.
-namespace ProcessLib
-{
-class SpatialPosition;
-}
 
 namespace MeshLib
 {

ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h

@@ -33,11 +33,7 @@ template <typename PROP_VAL_TYPE>
 class PropertyVector;
 }
 
-namespace ProcessLib
-{
-class SpatialPosition;
-
-namespace LiquidFlow
+namespace ProcessLib::LiquidFlow
 {
 /** This class has a collection of material properties of liquid flow process
  *  and it provides the computation of the coefficients of the PDE of liquid
@@ -125,5 +121,4 @@ private:
     // Such property vectors will be added here if they are needed.
 };
 
-}  // namespace LiquidFlow
-}  // namespace ProcessLib
+}  // namespace ProcessLib::LiquidFlow

ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.h

@@ -29,10 +29,7 @@ template <typename PROP_VAL_TYPE>
 class PropertyVector;
 }
 
-namespace ProcessLib
-{
-class SpatialPosition;
-namespace RichardsFlow
+namespace ProcessLib::RichardsFlow
 {
 /** This class has a collection of material properties for Richards flow model
 *  and it makes description of the properties of unsaturated porous media
@@ -125,5 +122,4 @@ private:
         _relative_permeability_models;
 };
 
-}  // namespace RichardsFlow
-}  // namespace ProcessLib
+}  // namespace ProcessLib::RichardsFlow

ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.h

@@ -41,10 +41,7 @@ class PropertyVector;
 * class, also different enthalpy models for different components are need to be
 * implemented.
 */
-namespace ProcessLib
-{
-class SpatialPosition;
-namespace ThermalTwoPhaseFlowWithPP
+namespace ProcessLib::ThermalTwoPhaseFlowWithPP
 {
 class ThermalTwoPhaseFlowWithPPMaterialProperties final
 {
@@ -144,5 +141,4 @@ private:
         _water_vapor_properties;
 };
 
-}  // namespace ThermalTwoPhaseFlowWithPP
-}  // namespace ProcessLib
+}  // namespace ProcessLib::ThermalTwoPhaseFlowWithPP

ProcessLib/TimeLoop.cpp

@@ -135,7 +135,6 @@ std::vector<GlobalVector*> setInitialConditions(
         auto& time_disc = *process_data->time_disc;
 
         auto& ode_sys = *process_data->tdisc_ode_sys;
-        auto const nl_tag = process_data->nonlinear_solver_tag;
 
         // append a solution vector of suitable size
         process_solutions.emplace_back(
@@ -154,6 +153,7 @@ std::vector<GlobalVector*> setInitialConditions(
             auto& mat_strg = *process_data->mat_strg;
             auto& conv_crit = *process_data->conv_crit;
 
+            auto const nl_tag = process_data->nonlinear_solver_tag;
             setEquationSystem(nonlinear_solver, ode_sys, conv_crit, nl_tag);
             nonlinear_solver.assemble(x0);
             time_disc.pushState(

ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPMaterialProperties.h

@@ -27,10 +27,7 @@ template <typename PROP_VAL_TYPE>
 class PropertyVector;
 }
 
-namespace ProcessLib
-{
-class SpatialPosition;
-namespace TwoPhaseFlowWithPP
+namespace ProcessLib::TwoPhaseFlowWithPP
 {
     /** This class has a collection of material properties for two-phase flow with PP model
     *  and it makes description of the material properties for two-phase condition,
@@ -124,5 +121,4 @@ protected:
         _relative_permeability_models;
 };
 
-}  // namespace TwoPhaseFlowWithPP
-}  // namespace ProcessLib
+}  // namespace ProcessLib::TwoPhaseFlowWithPP

ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h

@@ -28,10 +28,7 @@ template <typename PROP_VAL_TYPE>
 class PropertyVector;
 }
 
-namespace ProcessLib
-{
-class SpatialPosition;
-namespace TwoPhaseFlowWithPrho
+namespace ProcessLib::TwoPhaseFlowWithPrho
 {
 class TwoPhaseFlowWithPrhoMaterialProperties
 {
@@ -186,5 +183,4 @@ private:
                           int current_material_id) const;
 };
 
-}  // namespace TwoPhaseFlowWithPrho
-}  // namespace ProcessLib
+}  // namespace ProcessLib::TwoPhaseFlowWithPrho