From 5f15c12ea18513be9bb46c0c22da4982bbd28f83 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Mon, 20 Nov 2017 14:30:37 +0100
Subject: [PATCH] Changed the name of HTProcessData to HTMaterialProperties

---
 ProcessLib/HT/CreateHTProcess.cpp                    |  4 ++--
 ProcessLib/HT/HTFEM.h                                |  6 +++---
 .../HT/{HTProcessData.h => HTMaterialProperties.h}   | 12 ++++++------
 ProcessLib/HT/HTProcess.cpp                          |  2 +-
 ProcessLib/HT/HTProcess.h                            |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)
 rename ProcessLib/HT/{HTProcessData.h => HTMaterialProperties.h} (92%)

diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp
index bdca201d858..32a6dfece33 100644
--- a/ProcessLib/HT/CreateHTProcess.cpp
+++ b/ProcessLib/HT/CreateHTProcess.cpp
@@ -17,7 +17,7 @@
 #include "ProcessLib/Utils/ProcessUtils.h"
 
 #include "HTProcess.h"
-#include "HTProcessData.h"
+#include "HTMaterialProperties.h"
 
 namespace ProcessLib
 {
@@ -134,7 +134,7 @@ std::unique_ptr<Process> createHTProcess(
         std::copy_n(b.data(), b.size(), specific_body_force.data());
     }
 
-    HTProcessData process_data{std::move(porous_media_properties),
+    HTMaterialProperties process_data{std::move(porous_media_properties),
                                density_solid,
                                fluid_reference_density,
                                std::move(fluid_properties),
diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h
index 31bd9d10d02..0cfc29612ca 100644
--- a/ProcessLib/HT/HTFEM.h
+++ b/ProcessLib/HT/HTFEM.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 
-#include "HTProcessData.h"
+#include "HTMaterialProperties.h"
 #include "MathLib/LinAlg/Eigen/EigenMapTools.h"
 #include "NumLib/DOF/DOFTableUtil.h"
 #include "NumLib/Extrapolation/ExtrapolatableElement.h"
@@ -87,7 +87,7 @@ public:
                        std::size_t const local_matrix_size,
                        bool is_axially_symmetric,
                        unsigned const integration_order,
-                       HTProcessData const& process_data)
+                       HTMaterialProperties const& process_data)
         : _element(element),
           _process_data(process_data),
           _integration_method(integration_order)
@@ -342,7 +342,7 @@ public:
 
 private:
     MeshLib::Element const& _element;
-    HTProcessData const& _process_data;
+    HTMaterialProperties const& _process_data;
 
     IntegrationMethod const _integration_method;
     std::vector<
diff --git a/ProcessLib/HT/HTProcessData.h b/ProcessLib/HT/HTMaterialProperties.h
similarity index 92%
rename from ProcessLib/HT/HTProcessData.h
rename to ProcessLib/HT/HTMaterialProperties.h
index d2cb72097c5..fb056efbd8d 100644
--- a/ProcessLib/HT/HTProcessData.h
+++ b/ProcessLib/HT/HTMaterialProperties.h
@@ -22,9 +22,9 @@ struct Parameter;
 
 namespace HT
 {
-struct HTProcessData
+struct HTMaterialProperties
 {
-    HTProcessData(
+    HTMaterialProperties(
         MaterialLib::PorousMedium::PorousMediaProperties&&
             porous_media_properties_,
         ProcessLib::Parameter<double> const& density_solid_,
@@ -52,7 +52,7 @@ struct HTProcessData
     {
     }
 
-    HTProcessData(HTProcessData&& other)
+    HTMaterialProperties(HTMaterialProperties&& other)
         : porous_media_properties(std::move(other.porous_media_properties)),
           density_solid(other.density_solid),
           fluid_reference_density(other.fluid_reference_density),
@@ -70,13 +70,13 @@ struct HTProcessData
     }
 
     //! Copies are forbidden.
-    HTProcessData(HTProcessData const&) = delete;
+    HTMaterialProperties(HTMaterialProperties const&) = delete;
 
     //! Assignments are not needed.
-    void operator=(HTProcessData const&) = delete;
+    void operator=(HTMaterialProperties const&) = delete;
 
     //! Assignments are not needed.
-    void operator=(HTProcessData&&) = delete;
+    void operator=(HTMaterialProperties&&) = delete;
 
     MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties;
     Parameter<double> const& density_solid;
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index 307e9cc46fd..eecbe436d74 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -23,7 +23,7 @@ HTProcess::HTProcess(
     std::vector<std::unique_ptr<ParameterBase>> const& parameters,
     unsigned const integration_order,
     std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
-    HTProcessData&& process_data,
+    HTMaterialProperties&& process_data,
     SecondaryVariableCollection&& secondary_variables,
     NumLib::NamedFunctionCaller&& named_function_caller)
     : Process(mesh, std::move(jacobian_assembler), parameters,
diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h
index 355dba18b5b..0361ed6ed0d 100644
--- a/ProcessLib/HT/HTProcess.h
+++ b/ProcessLib/HT/HTProcess.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "HTFEM.h"
-#include "HTProcessData.h"
+#include "HTMaterialProperties.h"
 #include "NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h"
 #include "ProcessLib/Process.h"
 
@@ -47,7 +47,7 @@ public:
               unsigned const integration_order,
               std::vector<std::reference_wrapper<ProcessVariable>>&&
                   process_variables,
-              HTProcessData&& process_data,
+              HTMaterialProperties&& process_data,
               SecondaryVariableCollection&& secondary_variables,
               NumLib::NamedFunctionCaller&& named_function_caller);
 
@@ -72,7 +72,7 @@ private:
         const double dxdot_dx, const double dx_dx, GlobalMatrix& M,
         GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac) override;
 
-    HTProcessData _process_data;
+    HTMaterialProperties _process_data;
 
     std::vector<std::unique_ptr<HTLocalAssemblerInterface>> _local_assemblers;
 };
-- 
GitLab