Skip to content
Snippets Groups Projects
Commit 1899c3c3 authored by Yonghui56's avatar Yonghui56
Browse files

Delete unnecessary qualification

parent 8ac0010f
No related branches found
No related tags found
No related merge requests found
......@@ -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{
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment