From 4a9a3e91a0a3fe0c7b65ea102e0e4d21ece3055e Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <github@naumov.de> Date: Fri, 2 Apr 2021 20:13:53 +0200 Subject: [PATCH] clang-format ParameterLib --- ParameterLib/ConstantParameter.cpp | 1 + ParameterLib/CoordinateSystem.cpp | 2 +- ParameterLib/CurveScaledParameter.cpp | 1 + ParameterLib/MeshElementParameter.cpp | 1 + ParameterLib/MeshNodeParameter.cpp | 1 + ParameterLib/Parameter.cpp | 2 +- ParameterLib/RandomFieldMeshElementParameter.cpp | 5 +++-- ParameterLib/TimeDependentHeterogeneousParameter.cpp | 2 +- 8 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ParameterLib/ConstantParameter.cpp b/ParameterLib/ConstantParameter.cpp index 0df4d9caf1d..819100c7c58 100644 --- a/ParameterLib/ConstantParameter.cpp +++ b/ParameterLib/ConstantParameter.cpp @@ -9,6 +9,7 @@ */ #include "ConstantParameter.h" + #include "BaseLib/ConfigTree.h" #include "BaseLib/Error.h" #include "BaseLib/Logging.h" diff --git a/ParameterLib/CoordinateSystem.cpp b/ParameterLib/CoordinateSystem.cpp index 397fc394a8b..52423f6b50b 100644 --- a/ParameterLib/CoordinateSystem.cpp +++ b/ParameterLib/CoordinateSystem.cpp @@ -17,7 +17,7 @@ namespace ParameterLib { static double const tolerance = 1.e-15; -static const char*const error_info = +static const char* const error_info = "The determinant of the coordinate system transformation matrix is " "'{:g}', which is not sufficiently close to unity with the tolerance of " "'{:g}'. Please adjust the accuracy of the local system bases"; diff --git a/ParameterLib/CurveScaledParameter.cpp b/ParameterLib/CurveScaledParameter.cpp index 2a6c4f380bf..5169e46def0 100644 --- a/ParameterLib/CurveScaledParameter.cpp +++ b/ParameterLib/CurveScaledParameter.cpp @@ -9,6 +9,7 @@ */ #include "CurveScaledParameter.h" + #include "Utils.h" namespace ParameterLib diff --git a/ParameterLib/MeshElementParameter.cpp b/ParameterLib/MeshElementParameter.cpp index 56b8e0d423b..ed75cb9e2f6 100644 --- a/ParameterLib/MeshElementParameter.cpp +++ b/ParameterLib/MeshElementParameter.cpp @@ -9,6 +9,7 @@ */ #include "MeshElementParameter.h" + #include "BaseLib/ConfigTree.h" #include "MeshLib/Mesh.h" diff --git a/ParameterLib/MeshNodeParameter.cpp b/ParameterLib/MeshNodeParameter.cpp index a51001e3563..a8c859c1ca5 100644 --- a/ParameterLib/MeshNodeParameter.cpp +++ b/ParameterLib/MeshNodeParameter.cpp @@ -9,6 +9,7 @@ */ #include "MeshNodeParameter.h" + #include "BaseLib/ConfigTree.h" #include "MeshLib/Mesh.h" diff --git a/ParameterLib/Parameter.cpp b/ParameterLib/Parameter.cpp index 0cc7332faaa..decebbda548 100644 --- a/ParameterLib/Parameter.cpp +++ b/ParameterLib/Parameter.cpp @@ -9,9 +9,9 @@ */ #include "Parameter.h" + #include "BaseLib/ConfigTree.h" #include "BaseLib/Error.h" - #include "ConstantParameter.h" #include "CurveScaledParameter.h" #include "FunctionParameter.h" diff --git a/ParameterLib/RandomFieldMeshElementParameter.cpp b/ParameterLib/RandomFieldMeshElementParameter.cpp index 511b701237d..3f40f49536e 100644 --- a/ParameterLib/RandomFieldMeshElementParameter.cpp +++ b/ParameterLib/RandomFieldMeshElementParameter.cpp @@ -10,10 +10,11 @@ #include "RandomFieldMeshElementParameter.h" +#include <functional> +#include <random> + #include "BaseLib/ConfigTree.h" #include "MeshLib/Mesh.h" -#include <random> -#include <functional> namespace ParameterLib { diff --git a/ParameterLib/TimeDependentHeterogeneousParameter.cpp b/ParameterLib/TimeDependentHeterogeneousParameter.cpp index 3c251a3fdb6..c998f469ab0 100644 --- a/ParameterLib/TimeDependentHeterogeneousParameter.cpp +++ b/ParameterLib/TimeDependentHeterogeneousParameter.cpp @@ -121,7 +121,7 @@ std::unique_ptr<ParameterBase> createTimeDependentHeterogeneousParameter( //! \ogs_file_param{prj__parameters__parameter__TimeDependentHeterogeneousParameter__time_series__pair__time} auto time = p.getConfigParameter<double>("time"); auto parameter_name = - //! \ogs_file_param{prj__parameters__parameter__TimeDependentHeterogeneousParameter__time_series__pair__parameter_name} + //! \ogs_file_param{prj__parameters__parameter__TimeDependentHeterogeneousParameter__time_series__pair__parameter_name} p.getConfigParameter<std::string>("parameter_name"); time_series.emplace_back(time, parameter_name); } -- GitLab