diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-imp.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-imp.h index ad97d3d4d9f456e83f0ae07c90fde9a5ee774363..7c26e27947055e4d69767d2c89ed806678c788ef 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-imp.h +++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-imp.h @@ -46,12 +46,7 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>:: unsigned const n_integration_points = _integration_method.getNumberOfPoints(); - const unsigned mat_id = - (_material_properties.material_IDs_of_elements.size() > 0) - ? _material_properties.material_IDs_of_elements[_element.getID()] - : 0; - assert(mat_id < _material_properties.intrinsic_permeabiliy.size()); - + const unsigned mat_id = 0; // TODO for heterogeneous medium const MaterialLib::PorousMedium::CoefMatrix& perm = _material_properties.intrinsic_permeabiliy[mat_id]; diff --git a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp index 4064abb64c4b4ff389bdea62bbcb66e8f6a8eed4..618da563926d810ead7c300456f60c3dfa3ba610 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp +++ b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp @@ -20,10 +20,7 @@ namespace ProcessLib { namespace LiquidFlow { -LiquidFlowMaterialProperties::LiquidFlowMaterialProperties( - MeshLib::Mesh const& mesh, BaseLib::ConfigTree const& config) - : material_IDs_of_elements( - mesh.getProperties().getPropertyVector<unsigned>("MaterialIDs").get()) +LiquidFlowMaterialProperties::LiquidFlowMaterialProperties(BaseLib::ConfigTree const& config) { DBUG("Reading material properties of liquid flow process."); diff --git a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h index 8686a760abcc021a9b1f7b38087f55308a1dddbc..4962c578741a17d66c2d39194860d3e92220b20a 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h +++ b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h @@ -33,8 +33,7 @@ struct LiquidFlowMaterialProperties { typedef MaterialLib::Fluid::FluidProperty::ArrayType ArrayType; - LiquidFlowMaterialProperties(MeshLib::Mesh const& mesh, - BaseLib::ConfigTree const& config); + explicit LiquidFlowMaterialProperties(BaseLib::ConfigTree const& config); /** * \brief Compute the coefficient of the mass term by @@ -77,7 +76,7 @@ struct LiquidFlowMaterialProperties std::vector<std::unique_ptr<MaterialLib::PorousMedium::Porosity>> porosity; std::vector<std::unique_ptr<MaterialLib::PorousMedium::Storage>> storage; - MeshLib::PropertyVector<unsigned> const& material_IDs_of_elements; + // TODO: heterogeneous medium. }; } // end of namespace diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp index e98f9ec36ef7685b806415ef17af0e3fb3d9c180..364b54c98075ff8de1dd5069c12f0d323fa31374 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp +++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp @@ -34,7 +34,7 @@ LiquidFlowProcess::LiquidFlowProcess( std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller)), _compute_gravitational_term(compute_gravitational_term), - _material_properties(LiquidFlowMaterialProperties(mesh, config)) + _material_properties(LiquidFlowMaterialProperties(config)) { DBUG("Create Liquid flow process."); } diff --git a/Tests/ProcessLib/LiquidFlow/TestLiquidFlowMaterialProperties.cpp b/Tests/ProcessLib/LiquidFlow/TestLiquidFlowMaterialProperties.cpp index b845bb955ca91c2af4e81d1b82a86fe8914d2cac..4de8ef9138c0b86d1d89ae3a925629f1770c4493 100644 --- a/Tests/ProcessLib/LiquidFlow/TestLiquidFlowMaterialProperties.cpp +++ b/Tests/ProcessLib/LiquidFlow/TestLiquidFlowMaterialProperties.cpp @@ -65,8 +65,7 @@ TEST(ProcessLibLiquidFlow, checkLiquidFlowMaterialProperties) BaseLib::ConfigTree::onwarning); auto const& sub_config = conf.getConfigSubtree("material_property"); - const MeshLib::Mesh* dummy_mesh= nullptr; - LiquidFlowMaterialProperties lprop(*dummy_mesh, sub_config); + LiquidFlowMaterialProperties lprop(sub_config); // Check density const ArrayType vars = {273.15 + 60.0, 1.e+6};