From 1899c3c3c9c61ad4a34531c7de8fffe623486729 Mon Sep 17 00:00:00 2001
From: Yonghui <huangyh56@gmail.com>
Date: Wed, 8 Feb 2017 12:12:52 +0100
Subject: [PATCH] Delete unnecessary qualification
---
.../CreateTwoPhaseFlowWithPrhoProcess.cpp | 6 +--
.../TwoPhaseFlowWithPrhoLocalAssembler.h | 54 +++++++++----------
2 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp
index a4267b7dd7a..6e32d9388c7 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp
+++ b/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{
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
index f8693af3733..6f9f5f63ba9 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
@@ -26,35 +26,33 @@ namespace ProcessLib
{
namespace TwoPhaseFlowWithPrho
{
- template <typename NodalMatrixType>
- struct IntegrationPointData final
+template <typename NodalMatrixType>
+struct IntegrationPointData final
+{
+ explicit IntegrationPointData(
+ TwoPhaseFlowWithPrhoMaterialProperties& material_property_)
+ : mat_property(material_property_),
+ sw(1.0),
+ rho_m(0.0),
+ dsw_dpg(0.0),
+ dsw_drho(0.0),
+ drhom_dpg(0.0),
+ drhom_drho(0.0)
{
- explicit IntegrationPointData(
- ProcessLib::TwoPhaseFlowWithPrho::
- TwoPhaseFlowWithPrhoMaterialProperties& material_property_)
- : mat_property(material_property_),
- sw(1.0),
- rho_m(0.0),
- dsw_dpg(0.0),
- dsw_drho(0.0),
- drhom_dpg(0.0),
- drhom_drho(0.0)
- {
- }
- ProcessLib::TwoPhaseFlowWithPrho::TwoPhaseFlowWithPrhoMaterialProperties&
- mat_property;
- double sw;
- double rho_m;
- double dsw_dpg;
- double dsw_drho;
- double drhom_dpg;
- double drhom_drho;
- double pressure_nonwetting;
-
- double integration_weight;
- NodalMatrixType massOperator;
- NodalMatrixType diffusionOperator;
- };
+ }
+ TwoPhaseFlowWithPrhoMaterialProperties& mat_property;
+ double sw;
+ double rho_m;
+ double dsw_dpg;
+ double dsw_drho;
+ double drhom_dpg;
+ double drhom_drho;
+ double pressure_nonwetting;
+
+ double integration_weight;
+ NodalMatrixType massOperator;
+ NodalMatrixType diffusionOperator;
+};
const unsigned NUM_NODAL_DOF = 2;
class TwoPhaseFlowWithPrhoLocalAssemblerInterface
--
GitLab