Merge pull request #1705 from Yonghui56/fix_twophasePrho

Fix error in TwoPhaseFlowWithPrho process

ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp

@@ -86,9 +86,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess(
     auto const& mat_ids =
         mesh.getProperties().getPropertyVector<int>("MaterialIDs");
 
-    std::unique_ptr<ProcessLib::TwoPhaseFlowWithPrho::
-                        TwoPhaseFlowWithPrhoMaterialProperties>
-        material = nullptr;
+    std::unique_ptr<TwoPhaseFlowWithPrhoMaterialProperties> material = nullptr;
 
     boost::optional<MeshLib::PropertyVector<int> const&> material_ids;
     if (mat_ids != nullptr)
@@ -101,7 +99,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess(
         INFO("The twophase flow is in homogeneous porous media.");
     }
 
-    material = ProcessLib::TwoPhaseFlowWithPrho::
+    material =
         createTwoPhaseFlowPrhoMaterialProperties(mat_config, material_ids);
 
     TwoPhaseFlowWithPrhoProcessData process_data{

ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h

@@ -21,12 +21,16 @@
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 
 #include "TwoPhaseFlowWithPrhoProcessData.h"
+
+namespace ProcessLib
+{
+namespace TwoPhaseFlowWithPrho
+{
 template <typename NodalMatrixType>
 struct IntegrationPointData final
 {
     explicit IntegrationPointData(
-        ProcessLib::TwoPhaseFlowWithPrho::
-            TwoPhaseFlowWithPrhoMaterialProperties& material_property_)
+        TwoPhaseFlowWithPrhoMaterialProperties& material_property_)
         : mat_property(material_property_),
           sw(1.0),
           rho_m(0.0),
@@ -36,8 +40,7 @@ struct IntegrationPointData final
           drhom_drho(0.0)
     {
     }
-    ProcessLib::TwoPhaseFlowWithPrho::TwoPhaseFlowWithPrhoMaterialProperties&
-        mat_property;
+    TwoPhaseFlowWithPrhoMaterialProperties& mat_property;
     double sw;
     double rho_m;
     double dsw_dpg;
@@ -50,10 +53,6 @@ struct IntegrationPointData final
     NodalMatrixType massOperator;
     NodalMatrixType diffusionOperator;
 };
-namespace ProcessLib
-{
-namespace TwoPhaseFlowWithPrho
-{
 const unsigned NUM_NODAL_DOF = 2;
 
 class TwoPhaseFlowWithPrhoLocalAssemblerInterface

ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp

@@ -97,7 +97,7 @@ void TwoPhaseFlowWithPrhoProcess::assembleWithJacobianConcreteProcess(
 void TwoPhaseFlowWithPrhoProcess::preTimestepConcreteProcess(
     GlobalVector const& x, double const t, double const dt)
 {
-    DBUG("PreTimestep HydroMechanicsProcess.");
+    DBUG("PreTimestep TwoPhaseFlowWithPrhoProcess.");
 
     GlobalExecutor::executeMemberOnDereferenced(
         &LocalAssemblerInterface::preTimestep, _local_assemblers,