From e60ef1d9be565cc68a482c93eae498f384b12ca9 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Tue, 1 Mar 2016 18:25:13 +0100
Subject: [PATCH] removed "error" string from error messages
---
MeshLib/MeshEditing/MeshRevision.cpp | 6 +++---
MeshLib/MeshSearch/MeshElementGrid.cpp | 2 +-
.../Fem/CoordinatesMapping/NaturalCoordinatesMapping-impl.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/MeshLib/MeshEditing/MeshRevision.cpp b/MeshLib/MeshEditing/MeshRevision.cpp
index 5b1e959bec8..9a6ee7b16bb 100644
--- a/MeshLib/MeshEditing/MeshRevision.cpp
+++ b/MeshLib/MeshEditing/MeshRevision.cpp
@@ -90,7 +90,7 @@ MeshLib::Mesh* MeshRevision::simplifyMesh(const std::string &new_mesh_name,
subdivideElement(elem, new_nodes, new_elements));
if (n_new_elements == 0)
{
- ERR("Error: Element %d has unknown element type.", k);
+ ERR("Element %d has unknown element type.", k);
this->resetNodeIDs();
this->cleanUp(new_nodes, new_elements);
return nullptr;
@@ -158,7 +158,7 @@ MeshLib::Mesh* MeshRevision::subdivideMesh(const std::string &new_mesh_name) con
subdivideElement(elem, new_nodes, new_elements));
if (n_new_elements == 0)
{
- ERR("Error: Element %d has unknown element type.", k);
+ ERR("Element %d has unknown element type.", k);
this->cleanUp(new_nodes, new_elements);
return nullptr;
}
@@ -321,7 +321,7 @@ std::size_t MeshRevision::reduceElement(MeshLib::Element const*const element,
return reducePrism(element, n_unique_nodes, nodes, elements, min_elem_dim);
}
- ERR ("Error: Unknown element type.");
+ ERR ("Unknown element type.");
return 0;
}
diff --git a/MeshLib/MeshSearch/MeshElementGrid.cpp b/MeshLib/MeshSearch/MeshElementGrid.cpp
index a21e639aac8..55297d6cd33 100644
--- a/MeshLib/MeshSearch/MeshElementGrid.cpp
+++ b/MeshLib/MeshSearch/MeshElementGrid.cpp
@@ -104,7 +104,7 @@ void MeshElementGrid::sortElementsInGridCells(MeshLib::Mesh const& sfc_mesh)
{
for (auto const element : sfc_mesh.getElements()) {
if (! sortElementInGridCells(*element)) {
- ERR("Fatal error: Sorting element (id=%d) into mesh element grid.",
+ ERR("Sorting element (id=%d) into mesh element grid.",
element->getID());
std::abort();
}
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping-impl.h b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping-impl.h
index d331733febe..55b637de0b4 100644
--- a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping-impl.h
+++ b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping-impl.h
@@ -91,7 +91,7 @@ computeMappingMatrices(
#ifndef NDEBUG
if (shapemat.detJ<=.0)
- ERR("***error: det|J|=%e is not positive.\n", shapemat.detJ);
+ ERR("det|J|=%e is not positive.\n", shapemat.detJ);
#endif
}
template <class T_MESH_ELEMENT, class T_SHAPE_FUNC, class T_SHAPE_MATRICES>
--
GitLab