Use const reference for material_ids replacing boost optional in TwoPhaseModel material prop

MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp

@@ -33,8 +33,7 @@ std::tuple<std::unique_ptr<TwoPhaseFlowWithPPMaterialProperties>,
            BaseLib::ConfigTree>
 createTwoPhaseFlowMaterialProperties(
     BaseLib::ConfigTree const& config,
-    boost::optional<MeshLib::PropertyVector<int> const&>
-        material_ids)
+    MeshLib::PropertyVector<int> const& material_ids)
 {
     DBUG("Reading material properties of two-phase flow process.");
 

MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h

@@ -31,8 +31,7 @@ std::tuple<std::unique_ptr<TwoPhaseFlowWithPPMaterialProperties>,
            BaseLib::ConfigTree>
 createTwoPhaseFlowMaterialProperties(
     BaseLib::ConfigTree const& config,
-    boost::optional<MeshLib::PropertyVector<int> const&>
-        material_ids);
+    MeshLib::PropertyVector<int> const& material_ids);
 
 }  // end namespace
 }  // end namespace

MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp

@@ -30,7 +30,7 @@ namespace MaterialLib
 namespace TwoPhaseFlowWithPP
 {
 TwoPhaseFlowWithPPMaterialProperties::TwoPhaseFlowWithPPMaterialProperties(
-    boost::optional<MeshLib::PropertyVector<int> const&> const material_ids,
+    MeshLib::PropertyVector<int> const& material_ids,
     std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& liquid_density,
     std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& liquid_viscosity,
     std::unique_ptr<MaterialLib::Fluid::FluidProperty>&& gas_density,
@@ -63,13 +63,13 @@ TwoPhaseFlowWithPPMaterialProperties::TwoPhaseFlowWithPPMaterialProperties(
 int TwoPhaseFlowWithPPMaterialProperties::getMaterialID(
     const std::size_t element_id) const
 {
-    if (!_material_ids)
+    if (_material_ids.empty())
     {
         return 0;
     }
 
-    assert(element_id < _material_ids->size());
-    return (*_material_ids)[element_id];
+    assert(element_id < _material_ids.size());
+    return _material_ids[element_id];
 }
 
 double TwoPhaseFlowWithPPMaterialProperties::getLiquidDensity(

MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h

@@ -56,7 +56,7 @@ public:
     using ArrayType = MaterialLib::Fluid::FluidProperty::ArrayType;
 
     TwoPhaseFlowWithPPMaterialProperties(
-        boost::optional<MeshLib::PropertyVector<int> const&> const material_ids,
+        MeshLib::PropertyVector<int> const& material_ids,
         std::unique_ptr<MaterialLib::Fluid::FluidProperty>&&
             liquid_density,
         std::unique_ptr<MaterialLib::Fluid::FluidProperty>&&
@@ -118,7 +118,7 @@ private:
     /** Use two phase models for different material zones.
     *  Material IDs must be given as mesh element properties.
     */
-    boost::optional<MeshLib::PropertyVector<int> const&> const _material_ids;
+    MeshLib::PropertyVector<int> const& _material_ids;
 
     std::unique_ptr<MaterialLib::Fluid::FluidProperty> const _liquid_density;
     std::unique_ptr<MaterialLib::Fluid::FluidProperty> const _liquid_viscosity;