Merge branch 'refactorings' into 'master'

Refactored ProcessLib::getIntegrationPointMetaData See merge request ogs/ogs!4026
ufz · Mar 11, 2022 · 0017565 · 0017565
2 parents 2a5abcb + 96f5a7c
commit 0017565
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 16 deletions.
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -256,7 +256,8 @@ void HydroMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
             continue;
         }
 
-        auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+        auto const ip_meta_data =
+            getIntegrationPointMetaData(mesh.getProperties(), name);
 
         // Check the number of components.
         if (ip_meta_data.n_components !=

diff --git a/ProcessLib/Output/IntegrationPointWriter.cpp b/ProcessLib/Output/IntegrationPointWriter.cpp
@@ -105,11 +105,10 @@ void addIntegrationPointDataToMesh(
     }
 }
 
-IntegrationPointMetaData getIntegrationPointMetaData(MeshLib::Mesh const& mesh,
-                                                     std::string const& name)
+IntegrationPointMetaData getIntegrationPointMetaData(
+    MeshLib::Properties const& properties, std::string const& name)
 {
-    if (!mesh.getProperties().existsPropertyVector<char>(
-            "IntegrationPointMetaData"))
+    if (!properties.existsPropertyVector<char>("IntegrationPointMetaData"))
     {
         OGS_FATAL(
             "Integration point data '{:s}' is present in the vtk field data "
@@ -118,7 +117,7 @@ IntegrationPointMetaData getIntegrationPointMetaData(MeshLib::Mesh const& mesh,
             name);
     }
     auto const& mesh_property_ip_meta_data =
-        *mesh.getProperties().template getPropertyVector<char>(
+        *properties.template getPropertyVector<char>(
             "IntegrationPointMetaData");
 
     if (mesh_property_ip_meta_data.getMeshItemType() !=

diff --git a/ProcessLib/Output/IntegrationPointWriter.h b/ProcessLib/Output/IntegrationPointWriter.h
@@ -19,6 +19,7 @@
 namespace MeshLib
 {
 class Mesh;
+class Properties;
 }
 
 namespace ProcessLib
@@ -92,6 +93,6 @@ struct IntegrationPointMetaData
 /// Returns integration point meta data for the given field name.
 ///
 /// The data is read from a JSON encoded string stored in field data array.
-IntegrationPointMetaData getIntegrationPointMetaData(MeshLib::Mesh const& mesh,
-                                                     std::string const& name);
+IntegrationPointMetaData getIntegrationPointMetaData(
+    MeshLib::Properties const& properties, std::string const& name);
 }  // namespace ProcessLib
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
@@ -298,7 +298,8 @@ void RichardsMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
             continue;
         }
 
-        auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+        auto const ip_meta_data =
+            getIntegrationPointMetaData(mesh.getProperties(), name);
 
         // Check the number of components.
         if (ip_meta_data.n_components !=

diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -146,7 +146,8 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
             continue;
         }
 
-        auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+        auto const ip_meta_data =
+            getIntegrationPointMetaData(mesh.getProperties(), name);
 
         // Check the number of components.
         if (ip_meta_data.n_components !=

diff --git a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
@@ -134,7 +134,8 @@ void SmallDeformationNonlocalProcess<DisplacementDim>::
                 continue;
             }
 
-            auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+            auto const ip_meta_data =
+                getIntegrationPointMetaData(mesh.getProperties(), name);
 
             // Check the number of components.
             if (ip_meta_data.n_components !=

diff --git a/ProcessLib/TH2M/TH2MProcess.cpp b/ProcessLib/TH2M/TH2MProcess.cpp
@@ -265,7 +265,8 @@ void TH2MProcess<DisplacementDim>::initializeConcreteProcess(
             continue;
         }
 
-        auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+        auto const ip_meta_data =
+            getIntegrationPointMetaData(mesh.getProperties(), name);
 
         // Check the number of components.
         if (ip_meta_data.n_components !=

diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
@@ -230,7 +230,8 @@ void ThermoHydroMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
             continue;
         }
 
-        auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+        auto const ip_meta_data =
+            getIntegrationPointMetaData(mesh.getProperties(), name);
 
         // Check the number of components.
         if (ip_meta_data.n_components !=

diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
@@ -186,7 +186,8 @@ void ThermoMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
             continue;
         }
 
-        auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+        auto const ip_meta_data =
+            getIntegrationPointMetaData(mesh.getProperties(), name);
 
         // Check the number of components.
         if (ip_meta_data.n_components !=

diff --git a/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowProcess.cpp b/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowProcess.cpp
@@ -117,7 +117,8 @@ void ThermoRichardsFlowProcess::initializeConcreteProcess(
             continue;
         }
 
-        auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+        auto const ip_meta_data =
+            getIntegrationPointMetaData(mesh.getProperties(), name);
 
         // Check the number of components.
         if (ip_meta_data.n_components !=

diff --git a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsProcess.cpp b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsProcess.cpp
@@ -263,7 +263,8 @@ void ThermoRichardsMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
             continue;
         }
 
-        auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+        auto const ip_meta_data =
+            getIntegrationPointMetaData(mesh.getProperties(), name);
 
         // Check the number of components.
         if (ip_meta_data.n_components !=