From 4d3f2a90cff897775434ba8d9d7751ef261af773 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Fri, 12 Feb 2021 13:46:12 +0100
Subject: [PATCH] [NL] Move misplaced createNewtonRaphsonSolverPs().
---
MaterialLib/FractureModels/CreateCoulomb.cpp | 5 ++---
MaterialLib/SolidModels/CreateCreepBGRa.cpp | 10 +++-------
MaterialLib/SolidModels/CreateEhlers.h | 7 +++----
MaterialLib/SolidModels/CreateLubby2.h | 7 +++----
.../CreateNewtonRaphsonSolverParameters.cpp | 13 +++++--------
.../CreateNewtonRaphsonSolverParameters.h | 11 +++--------
6 files changed, 19 insertions(+), 34 deletions(-)
rename {MaterialLib/SolidModels => NumLib}/CreateNewtonRaphsonSolverParameters.cpp (89%)
rename {MaterialLib/SolidModels => NumLib}/CreateNewtonRaphsonSolverParameters.h (73%)
diff --git a/MaterialLib/FractureModels/CreateCoulomb.cpp b/MaterialLib/FractureModels/CreateCoulomb.cpp
index 2c36eae3921..d107709d2e2 100644
--- a/MaterialLib/FractureModels/CreateCoulomb.cpp
+++ b/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,
diff --git a/MaterialLib/SolidModels/CreateCreepBGRa.cpp b/MaterialLib/SolidModels/CreateCreepBGRa.cpp
index 687078b1272..7f01bd1dd87 100644
--- a/MaterialLib/SolidModels/CreateCreepBGRa.cpp
+++ b/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(),
diff --git a/MaterialLib/SolidModels/CreateEhlers.h b/MaterialLib/SolidModels/CreateEhlers.h
index 36e6f9cab4e..a83ed79f8c2 100644
--- a/MaterialLib/SolidModels/CreateEhlers.h
+++ b/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,
diff --git a/MaterialLib/SolidModels/CreateLubby2.h b/MaterialLib/SolidModels/CreateLubby2.h
index 588a84c1c68..4a1f6f12cf2 100644
--- a/MaterialLib/SolidModels/CreateLubby2.h
+++ b/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}};
diff --git a/MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.cpp b/NumLib/CreateNewtonRaphsonSolverParameters.cpp
similarity index 89%
rename from MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.cpp
rename to NumLib/CreateNewtonRaphsonSolverParameters.cpp
index 35fa51b8c0c..e01626304fb 100644
--- a/MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.cpp
+++ b/NumLib/CreateNewtonRaphsonSolverParameters.cpp
@@ -1,23 +1,20 @@
/**
+ * \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
diff --git a/MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.h b/NumLib/CreateNewtonRaphsonSolverParameters.h
similarity index 73%
rename from MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.h
rename to NumLib/CreateNewtonRaphsonSolverParameters.h
index 8f934d8be3f..f3794fd4992 100644
--- a/MaterialLib/SolidModels/CreateNewtonRaphsonSolverParameters.h
+++ b/NumLib/CreateNewtonRaphsonSolverParameters.h
@@ -1,12 +1,10 @@
/**
+ * \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
--
GitLab