From 8ac0010f75bf32cf84995951587befe6af7db5c2 Mon Sep 17 00:00:00 2001
From: Yonghui <huangyh56@gmail.com>
Date: Tue, 7 Feb 2017 19:19:20 +0100
Subject: [PATCH] Move IP data struct into namespace
---
.../TwoPhaseFlowWithPrhoLocalAssembler.h | 59 ++++++++++---------
.../TwoPhaseFlowWithPrhoProcess.cpp | 2 +-
2 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
index 884476fd807..f8693af3733 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h
@@ -21,39 +21,40 @@
#include "ProcessLib/Utils/InitShapeMatrices.h"
#include "TwoPhaseFlowWithPrhoProcessData.h"
-template <typename NodalMatrixType>
-struct IntegrationPointData final
-{
- 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;
-};
+
namespace ProcessLib
{
namespace TwoPhaseFlowWithPrho
{
+ template <typename NodalMatrixType>
+ struct IntegrationPointData final
+ {
+ 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;
+ };
const unsigned NUM_NODAL_DOF = 2;
class TwoPhaseFlowWithPrhoLocalAssemblerInterface
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
index a0702281066..2125e18045d 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
+++ b/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,
--
GitLab