extract Linear Propety create method

MaterialLib/MPL/CreateProperty.cpp

@@ -43,41 +43,7 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
     }
     if (property_type == "Linear")
     {
-        auto const reference_value =
-            //! \ogs_file_param{properties__property__LinearProperty__reference_value}
-            config.getConfigParameter<double>("reference_value");
-
-        std::vector<MaterialPropertyLib::IndependentVariable> ivs;
-        auto const& independent_variables_config =
-            //! \ogs_file_param{properties__property__LinearProperty__independent_variables}
-            config.getConfigSubtree("independent_variables");
-        for (auto const& independent_variable_config :
-             independent_variables_config.getConfigSubtreeList(
-                 "independent_variable"))
-        {
-            auto const& variable_name =
-                //! \ogs_file_param{properties__property__LinearProperty__independent_variables__independent_variable__variable_name}
-                independent_variable_config.getConfigParameter<std::string>(
-                    "variable_name");
-            auto const reference_condition =
-                //! \ogs_file_param{properties__property__LinearProperty__independent_variables__independent_variable__reference_condition}
-                independent_variable_config.getConfigParameter<double>(
-                    "reference_condition");
-            auto const slope =
-                //! \ogs_file_param{properties__property__LinearProperty__independent_variables__independent_variable__slope}
-                independent_variable_config.getConfigParameter<double>("slope");
-
-            MaterialPropertyLib::Variable ivt =
-                MaterialPropertyLib::convertStringToVariable(variable_name);
-
-            MaterialPropertyLib::IndependentVariable iv{
-                ivt, reference_condition, slope};
-
-            ivs.push_back(std::move(iv));
-        }
-
-        return std::make_unique<MaterialPropertyLib::LinearProperty>(
-            reference_value, ivs);
+        return createLinearProperty(config);
     }
 
     if (property_type == "Exponential")

MaterialLib/MPL/Properties/CreateLinearProperty.cpp

+/**
+ * \file
+ * \author Norbert Grunwald
+ * \date   Sep 10, 2019
+ *
+ * \copyright
+ * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#include "BaseLib/ConfigTree.h"
+#include "LinearProperty.h"
+
+namespace MaterialPropertyLib
+{
+std::unique_ptr<LinearProperty> createLinearProperty(
+    BaseLib::ConfigTree const& config)
+{
+    config.checkConfigParameter("type", "Linear");
+    DBUG("Create Linear property");
+
+    auto const reference_value =
+        //! \ogs_file_param{properties__property__LinearProperty__reference_value}
+        config.getConfigParameter<double>("reference_value");
+
+    std::vector<MaterialPropertyLib::IndependentVariable> ivs;
+    auto const& independent_variables_config =
+        //! \ogs_file_param{properties__property__LinearProperty__independent_variables}
+        config.getConfigSubtree("independent_variables");
+    for (auto const& independent_variable_config :
+         independent_variables_config.getConfigSubtreeList(
+             "independent_variable"))
+    {
+        auto const& variable_name =
+            //! \ogs_file_param{properties__property__LinearProperty__independent_variables__independent_variable__variable_name}
+            independent_variable_config.getConfigParameter<std::string>(
+                "variable_name");
+        auto const reference_condition =
+            //! \ogs_file_param{properties__property__LinearProperty__independent_variables__independent_variable__reference_condition}
+            independent_variable_config.getConfigParameter<double>(
+                "reference_condition");
+        auto const slope =
+            //! \ogs_file_param{properties__property__LinearProperty__independent_variables__independent_variable__slope}
+            independent_variable_config.getConfigParameter<double>("slope");
+
+        MaterialPropertyLib::Variable ivt =
+            MaterialPropertyLib::convertStringToVariable(variable_name);
+
+        MaterialPropertyLib::IndependentVariable iv{ivt, reference_condition,
+                                                    slope};
+
+        ivs.push_back(std::move(iv));
+    }
+
+    return std::make_unique<MaterialPropertyLib::LinearProperty>(
+        reference_value, ivs);
+}
+}  // namespace MaterialPropertyLib
\ No newline at end of file

MaterialLib/MPL/Properties/CreateLinearProperty.h

+/**
+ * \file
+ * \author Norbert Grunwald
+ * \date   Sep 10, 2019
+ *
+ * \copyright
+ * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+namespace BaseLib
+{
+class ConfigTree;
+}
+
+namespace MaterialPropertyLib
+{
+class LinearProperty;
+}
+
+namespace MaterialPropertyLib
+{
+std::unique_ptr<LinearProperty> createLinearProperty(
+    BaseLib::ConfigTree const& config);
+}  // namespace MaterialPropertyLib
\ No newline at end of file

MaterialLib/MPL/Properties/CreateProperties.h

@@ -14,3 +14,4 @@
 
 #include "CreateConstant.h"
 #include "CreateIdealGasLaw.h"
+#include "CreateLinearProperty.h"