[NL] Move misplaced createNewtonRaphsonSolverPs().

MaterialLib/FractureModels/CreateCoulomb.cpp

@@ -10,7 +10,7 @@
 #include "CreateCoulomb.h"
 
 #include "Coulomb.h"
-#include "MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.h"
+#include "NumLib/CreateNewtonRaphsonSolverParameters.h"
 #include "ParameterLib/Utils.h"
 
 namespace MaterialLib
@@ -61,8 +61,7 @@ std::unique_ptr<FractureModelBase<DisplacementDim>> createCoulomb(
         //! \ogs_file_param{material__fracture_model__Coulomb__nonlinear_solver}
         config.getConfigSubtree("nonlinear_solver");
     auto const nonlinear_solver_parameters =
-        MaterialLib::createNewtonRaphsonSolverParameters(
-            nonlinear_solver_config);
+        NumLib::createNewtonRaphsonSolverParameters(nonlinear_solver_config);
 
     return std::make_unique<Coulomb::Coulomb<DisplacementDim>>(
         nonlinear_solver_parameters, penalty_aperture_cutoff, tension_cutoff,

MaterialLib/SolidModels/CreateCreepBGRa.cpp

@@ -11,15 +11,11 @@
 
 #include "CreateCreepBGRa.h"
 
+#include "BaseLib/ConfigTree.h"
 #include "CreateLinearElasticIsotropic.h"
-#include "CreateNewtonRaphsonSolverParameters.h"
-
 #include "CreepBGRa.h"
-
 #include "MechanicsBase.h"
-
-#include "BaseLib/ConfigTree.h"
-
+#include "NumLib/CreateNewtonRaphsonSolverParameters.h"
 #include "ParameterLib/Parameter.h"
 #include "ParameterLib/Utils.h"
 
@@ -65,7 +61,7 @@ createCreepBGRa(
         //! \ogs_file_param{material__solid__constitutive_relation__CreepBGRa__nonlinear_solver}
         config.getConfigSubtree("nonlinear_solver");
     auto const nonlinear_solver_parameters =
-        createNewtonRaphsonSolverParameters(nonlinear_solver_config);
+        NumLib::createNewtonRaphsonSolverParameters(nonlinear_solver_config);
 
     return std::unique_ptr<CreepBGRa<DisplacementDim>>{
         new CreepBGRa<DisplacementDim>{elastic_data->getMaterialProperties(),

MaterialLib/SolidModels/CreateEhlers.h

@@ -10,10 +10,9 @@
 
 #pragma once
 
-#include "CreateNewtonRaphsonSolverParameters.h"
-#include "ParameterLib/Utils.h"
-
 #include "Ehlers.h"
+#include "NumLib/CreateNewtonRaphsonSolverParameters.h"
+#include "ParameterLib/Utils.h"
 
 namespace MaterialLib
 {
@@ -177,7 +176,7 @@ std::unique_ptr<SolidEhlers<DisplacementDim>> createEhlers(
         //! \ogs_file_param{material__solid__constitutive_relation__Ehlers__nonlinear_solver}
         config.getConfigSubtree("nonlinear_solver");
     auto const nonlinear_solver_parameters =
-        createNewtonRaphsonSolverParameters(nonlinear_solver_config);
+        NumLib::createNewtonRaphsonSolverParameters(nonlinear_solver_config);
 
     return std::make_unique<SolidEhlers<DisplacementDim>>(
         nonlinear_solver_parameters,

MaterialLib/SolidModels/CreateLubby2.h

@@ -10,10 +10,9 @@
 
 #pragma once
 
-#include "CreateNewtonRaphsonSolverParameters.h"
-#include "ParameterLib/Utils.h"
-
 #include "Lubby2.h"
+#include "NumLib/CreateNewtonRaphsonSolverParameters.h"
+#include "ParameterLib/Utils.h"
 
 namespace MaterialLib
 {
@@ -102,7 +101,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
         //! \ogs_file_param{material__solid__constitutive_relation__Lubby2__nonlinear_solver}
         config.getConfigSubtree("nonlinear_solver");
     auto const nonlinear_solver_parameters =
-        createNewtonRaphsonSolverParameters(nonlinear_solver_config);
+        NumLib::createNewtonRaphsonSolverParameters(nonlinear_solver_config);
 
     return std::unique_ptr<Lubby2<DisplacementDim>>{
         new Lubby2<DisplacementDim>{nonlinear_solver_parameters, mp}};

MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.cpp → NumLib/CreateNewtonRaphsonSolverParameters.cpp

 /**
+ * \file
  * \copyright
  * Copyright (c) 2012-2021, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license
- *
- *  \file
- *  Created on July 10, 2018, 11:32 AM
  */
 
 #include "CreateNewtonRaphsonSolverParameters.h"
 
 #include "BaseLib/ConfigTree.h"
+#include "NewtonRaphson.h"
 
-#include "NumLib/NewtonRaphson.h"
-
-namespace MaterialLib
+namespace NumLib
 {
-NumLib::NewtonRaphsonSolverParameters createNewtonRaphsonSolverParameters(
+NewtonRaphsonSolverParameters createNewtonRaphsonSolverParameters(
     BaseLib::ConfigTree const& config)
 {
     DBUG("Create local nonlinear solver parameters.");
@@ -55,4 +52,4 @@ NumLib::NewtonRaphsonSolverParameters createNewtonRaphsonSolverParameters(
 
     return {maximum_iterations, residuum_tolerance, increment_tolerance};
 }
-}  // namespace MaterialLib
+}  // namespace NumLib

MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.h → NumLib/CreateNewtonRaphsonSolverParameters.h

 /**
+ * \file
  * \copyright
  * Copyright (c) 2012-2021, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license
- *
- *  \file
- *  Created on July 10, 2018, 11:32 AM
  */
 
 #pragma once
@@ -19,10 +17,7 @@ class ConfigTree;
 namespace NumLib
 {
 struct NewtonRaphsonSolverParameters;
-}
 
-namespace MaterialLib
-{
-NumLib::NewtonRaphsonSolverParameters createNewtonRaphsonSolverParameters(
+NewtonRaphsonSolverParameters createNewtonRaphsonSolverParameters(
     BaseLib::ConfigTree const& config);
-}
+}  // namespace NumLib