From 0b30cbe58d1f2d05a8fae3d033b72afa0061bbaa Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 28 Jan 2020 06:29:14 +0100
Subject: [PATCH] [PL/HT] Use checkRequiredProperties.
---
ProcessLib/HT/HTProcess.cpp | 43 ++++++-------------------------------
1 file changed, 6 insertions(+), 37 deletions(-)
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index 9eb373accd4..7a19811e92a 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -309,46 +309,15 @@ void checkMPLProperties(MeshLib::Mesh const& mesh,
{
auto const element_id = element->getID();
- // check if a definition of the porous media exists
auto const& medium = *process_data.media_map->getMedium(element_id);
+ MaterialPropertyLib::checkRequiredProperties(
+ medium, requiredPropertyMedium);
- for (auto const property : requiredPropertyMedium)
- {
- if (!medium.hasProperty(property))
- {
- OGS_FATAL("The property '%s' is not specified for the medium.",
- MaterialPropertyLib::property_enum_to_string[property]
- .c_str());
- }
- }
+ MaterialPropertyLib::checkRequiredProperties(
+ medium.phase("AqueousLiquid"), requiredPropertyLiquidPhase);
- // check if liquid phase definition and the corresponding properties
- // exists
- auto const& liquid_phase = medium.phase("AqueousLiquid");
- for (auto const property : requiredPropertyLiquidPhase)
- {
- if (!liquid_phase.hasProperty(property))
- {
- OGS_FATAL(
- "The property '%s' is not specified for the liquid phase.",
- MaterialPropertyLib::property_enum_to_string[property]
- .c_str());
- }
- }
-
- // check if solid phase definition and the corresponding properties
- // exists
- auto const& solid_phase = medium.phase("Solid");
- for (auto const property : requiredPropertySolidPhase)
- {
- if (!solid_phase.hasProperty(property))
- {
- OGS_FATAL(
- "The property '%s' is not specified for the solid phase.",
- MaterialPropertyLib::property_enum_to_string[property]
- .c_str());
- }
- }
+ MaterialPropertyLib::checkRequiredProperties(
+ medium.phase("Solid"), requiredPropertySolidPhase);
}
DBUG("Media properties verified.");
}
--
GitLab