From 5a5b36183ffd0ce37317f0972f48f634d854b073 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 9 Apr 2020 11:18:59 +0200
Subject: [PATCH] [MeL] Clang format on output msg.
---
MeshLib/MeshEditing/ConvertToLinearMesh.cpp | 3 +--
MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp | 3 +--
MeshLib/MeshGenerators/LayeredMeshGenerator.cpp | 6 +++++-
MeshLib/MeshSubset.h | 3 +--
MeshLib/MeshSurfaceExtraction.cpp | 3 +--
MeshLib/Vtk/VtkMappedMeshSource.cpp | 3 +--
6 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/MeshLib/MeshEditing/ConvertToLinearMesh.cpp b/MeshLib/MeshEditing/ConvertToLinearMesh.cpp
index 959d6d89dfe..56f70547cb7 100644
--- a/MeshLib/MeshEditing/ConvertToLinearMesh.cpp
+++ b/MeshLib/MeshEditing/ConvertToLinearMesh.cpp
@@ -45,8 +45,7 @@ T_ELEMENT* createLinearElement(MeshLib::Element const* e,
{
OGS_FATAL(
"A base node {:d} (with original global node id {:d}) not "
- "found in "
- "the list for element {:d}.",
+ "found in the list for element {:d}.",
i, e->getNode(i)->getID(), e->getID());
}
nodes[i] = const_cast<MeshLib::Node*>(*it);
diff --git a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
index 973d46ec424..a7f588aae8c 100644
--- a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
+++ b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
@@ -39,8 +39,7 @@ bool Mesh2MeshPropertyInterpolation::setPropertiesForMesh(Mesh& dest_mesh) const
if (_src_mesh.getDimension() != dest_mesh.getDimension()) {
ERR("MeshLib::Mesh2MeshPropertyInterpolation::setPropertiesForMesh() "
"dimension of source (dim = {:d}) and destination (dim = {:d}) "
- "mesh "
- "does not match.",
+ "mesh does not match.",
_src_mesh.getDimension(), dest_mesh.getDimension());
return false;
}
diff --git a/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp b/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
index d7ee063c579..8f26863354c 100644
--- a/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
+++ b/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
@@ -65,7 +65,11 @@ LayeredMeshGenerator::getMesh(std::string const& mesh_name) const
std::back_inserter(*materials));
}
else
- WARN ("Skipping MaterialID information, number of entries does not match element number");
+ {
+ WARN(
+ "Skipping MaterialID information, number of entries does not match "
+ "element number");
+ }
std::unique_ptr<MeshLib::Mesh> result(new MeshLib::Mesh(mesh_name, _nodes, _elements, properties));
MeshLib::NodeSearch ns(*result);
diff --git a/MeshLib/MeshSubset.h b/MeshLib/MeshSubset.h
index c4ea7e4dd1b..b514b861513 100644
--- a/MeshLib/MeshSubset.h
+++ b/MeshLib/MeshSubset.h
@@ -54,8 +54,7 @@ public:
if (it == end(mesh_nodes))
{
ERR("A node {:d} ({:g}, {:g}, {:g}) in mesh subset is not "
- "a part "
- "of the mesh.",
+ "a part of the mesh.",
n->getID(), (*n)[0], (*n)[1], (*n)[2]);
return false;
}
diff --git a/MeshLib/MeshSurfaceExtraction.cpp b/MeshLib/MeshSurfaceExtraction.cpp
index 354a43ae568..20c3973bf76 100644
--- a/MeshLib/MeshSurfaceExtraction.cpp
+++ b/MeshLib/MeshSurfaceExtraction.cpp
@@ -84,8 +84,7 @@ bool createSfcMeshProperties(MeshLib::Mesh& sfc_mesh,
if (element_ids_map.size() != n_elems)
{
ERR("createSfcMeshProperties() - Incorrect number of element IDs "
- "({:d}) "
- "compared to actual number of surface elements ({:d}).",
+ "({:d}) compared to actual number of surface elements ({:d}).",
element_ids_map.size(), n_elems);
return false;
}
diff --git a/MeshLib/Vtk/VtkMappedMeshSource.cpp b/MeshLib/Vtk/VtkMappedMeshSource.cpp
index 064dff910b9..692a087aae9 100644
--- a/MeshLib/Vtk/VtkMappedMeshSource.cpp
+++ b/MeshLib/Vtk/VtkMappedMeshSource.cpp
@@ -173,8 +173,7 @@ int VtkMappedMeshSource::RequestData(vtkInformation* /*request*/,
OGS_FATAL(
"Mesh property '{:s}' with unknown data type. Please check the "
- "data "
- "type of the mesh properties. The available data types are:"
+ "data type of the mesh properties. The available data types are:"
"\n\t double,"
"\n\t float,"
"\n\t int,"
--
GitLab