diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoLocalAssembler.h index 884476fd8079afc042e1d8d532a3aec643611d7b..f8693af3733ef9b864dcfe45fa9d9e1781e9707a 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 a07022810667e806dd9e865a1636d657a791aa3f..2125e18045db29eab3a448e399572febb158a2f6 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,