diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index 924d8359c90fb414b60ef697d110e6162fe0c224..cccb64cb58452730baedadb9324f62e9a40483ab 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -192,7 +192,7 @@ void ProjectData::parseProcessVariables(
void ProjectData::parseProcesses(ConfigTree const& processes_config)
{
- DBUG("Reading processes:\n");
+ DBUG("Reading processes:");
for (auto pc_it : processes_config) {
ConfigTree const& process_config = pc_it.second;
@@ -209,7 +209,7 @@ void ProjectData::parseProcesses(ConfigTree const& processes_config)
void ProjectData::parseOutput(ConfigTree const& output_config,
std::string const& path)
{
- DBUG("Parse output configuration:\n");
+ DBUG("Parse output configuration:");
auto const file = output_config.get_optional<std::string>("file");
if (!file) {
diff --git a/AssemblerLib/LocalDataInitializer.h b/AssemblerLib/LocalDataInitializer.h
index 32393d21c2eaa6593d4b12011249acadf2f02e9f..968c62d401ec2bb97cf47cad770a914316de2846 100644
--- a/AssemblerLib/LocalDataInitializer.h
+++ b/AssemblerLib/LocalDataInitializer.h
@@ -65,36 +65,36 @@ class LocalDataInitializer
public:
LocalDataInitializer()
{
- _builder[std::type_index(typeid(MeshLib::Hex20 ))] =
- [](){ return new LAData<NumLib::ShapeHex20 >; };
- _builder[std::type_index(typeid(MeshLib::Hex ))] =
- [](){ return new LAData<NumLib::ShapeHex8 >; };
- _builder[std::type_index(typeid(MeshLib::Line ))] =
- [](){ return new LAData<NumLib::ShapeLine2 >; };
- _builder[std::type_index(typeid(MeshLib::Line3 ))] =
- [](){ return new LAData<NumLib::ShapeLine3 >; };
- _builder[std::type_index(typeid(MeshLib::Prism15 ))] =
+ _builder[std::type_index(typeid(MeshLib::Hex20))] =
+ [](){ return new LAData<NumLib::ShapeHex20>; };
+ _builder[std::type_index(typeid(MeshLib::Hex))] =
+ [](){ return new LAData<NumLib::ShapeHex8>; };
+ _builder[std::type_index(typeid(MeshLib::Line))] =
+ [](){ return new LAData<NumLib::ShapeLine2>; };
+ _builder[std::type_index(typeid(MeshLib::Line3))] =
+ [](){ return new LAData<NumLib::ShapeLine3>; };
+ _builder[std::type_index(typeid(MeshLib::Prism15))] =
[](){ return new LAData<NumLib::ShapePrism15>; };
- _builder[std::type_index(typeid(MeshLib::Prism ))] =
- [](){ return new LAData<NumLib::ShapePrism6 >; };
+ _builder[std::type_index(typeid(MeshLib::Prism))] =
+ [](){ return new LAData<NumLib::ShapePrism6>; };
_builder[std::type_index(typeid(MeshLib::Pyramid13))] =
- [](){ return new LAData<NumLib::ShapePyra13 >; };
- _builder[std::type_index(typeid(MeshLib::Pyramid ))] =
- [](){ return new LAData<NumLib::ShapePyra5 >; };
- _builder[std::type_index(typeid(MeshLib::Quad ))] =
- [](){ return new LAData<NumLib::ShapeQuad4 >; };
- _builder[std::type_index(typeid(MeshLib::Quad8 ))] =
- [](){ return new LAData<NumLib::ShapeQuad8 >; };
- _builder[std::type_index(typeid(MeshLib::Quad9 ))] =
- [](){ return new LAData<NumLib::ShapeQuad9 >; };
- _builder[std::type_index(typeid(MeshLib::Tet10 ))] =
- [](){ return new LAData<NumLib::ShapeTet10 >; };
- _builder[std::type_index(typeid(MeshLib::Tet ))] =
- [](){ return new LAData<NumLib::ShapeTet4 >; };
- _builder[std::type_index(typeid(MeshLib::Tri ))] =
- [](){ return new LAData<NumLib::ShapeTri3 >; };
- _builder[std::type_index(typeid(MeshLib::Tri6 ))] =
- [](){ return new LAData<NumLib::ShapeTri6 >; };
+ [](){ return new LAData<NumLib::ShapePyra13>; };
+ _builder[std::type_index(typeid(MeshLib::Pyramid))] =
+ [](){ return new LAData<NumLib::ShapePyra5>; };
+ _builder[std::type_index(typeid(MeshLib::Quad))] =
+ [](){ return new LAData<NumLib::ShapeQuad4>; };
+ _builder[std::type_index(typeid(MeshLib::Quad8))] =
+ [](){ return new LAData<NumLib::ShapeQuad8>; };
+ _builder[std::type_index(typeid(MeshLib::Quad9))] =
+ [](){ return new LAData<NumLib::ShapeQuad9>; };
+ _builder[std::type_index(typeid(MeshLib::Tet10))] =
+ [](){ return new LAData<NumLib::ShapeTet10>; };
+ _builder[std::type_index(typeid(MeshLib::Tet))] =
+ [](){ return new LAData<NumLib::ShapeTet4>; };
+ _builder[std::type_index(typeid(MeshLib::Tri))] =
+ [](){ return new LAData<NumLib::ShapeTri3>; };
+ _builder[std::type_index(typeid(MeshLib::Tri6))] =
+ [](){ return new LAData<NumLib::ShapeTri6>; };
}
/// Sets the provided data_ptr to the newly created local assembler data and
diff --git a/GeoLib/Point.cpp b/GeoLib/Point.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5f7b1df171b0d107e07b5d77664e9e2cd4063edb
--- /dev/null
+++ b/GeoLib/Point.cpp
@@ -0,0 +1,17 @@
+/**
+ * \file
+ *
+ * \copyright
+ * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ *
+ */
+
+#include "Point.h"
+
+namespace GeoLib
+{
+ const Point ORIGIN(0, 0, 0);
+}
diff --git a/GeoLib/Point.h b/GeoLib/Point.h
index 2858e817fb398a5681e7e788f6cf907128d80320..941f80b94521a3a7ce07c42eee1ece0dc23c9165 100644
--- a/GeoLib/Point.h
+++ b/GeoLib/Point.h
@@ -66,7 +66,7 @@ protected:
void setID(std::size_t id) { _id = id; }
};
-static const Point ORIGIN(0, 0, 0);
+extern const Point ORIGIN;
}
#endif /* POINT_H_ */
diff --git a/MeshLib/Elements/TemplateElement.cpp b/MeshLib/Elements/TemplateElement.cpp
index bad9b9975fab57f871a49374e24881cc3edd0afa..0934918e068b02610287e8e907dea8119543751e 100644
--- a/MeshLib/Elements/TemplateElement.cpp
+++ b/MeshLib/Elements/TemplateElement.cpp
@@ -29,18 +29,18 @@ template <class ELEMENT_RULE>
const unsigned MeshLib::TemplateElement<ELEMENT_RULE>::dimension;
#endif // WIN32
-template class MeshLib::TemplateElement<MeshLib::HexRule20 >;
-template class MeshLib::TemplateElement<MeshLib::HexRule8 >;
-template class MeshLib::TemplateElement<MeshLib::LineRule2 >;
-template class MeshLib::TemplateElement<MeshLib::LineRule3 >;
-template class MeshLib::TemplateElement<MeshLib::PrismRule15 >;
-template class MeshLib::TemplateElement<MeshLib::PrismRule6 >;
+template class MeshLib::TemplateElement<MeshLib::HexRule20>;
+template class MeshLib::TemplateElement<MeshLib::HexRule8>;
+template class MeshLib::TemplateElement<MeshLib::LineRule2>;
+template class MeshLib::TemplateElement<MeshLib::LineRule3>;
+template class MeshLib::TemplateElement<MeshLib::PrismRule15>;
+template class MeshLib::TemplateElement<MeshLib::PrismRule6>;
template class MeshLib::TemplateElement<MeshLib::PyramidRule13>;
-template class MeshLib::TemplateElement<MeshLib::PyramidRule5 >;
-template class MeshLib::TemplateElement<MeshLib::QuadRule4 >;
-template class MeshLib::TemplateElement<MeshLib::QuadRule8 >;
-template class MeshLib::TemplateElement<MeshLib::QuadRule9 >;
-template class MeshLib::TemplateElement<MeshLib::TetRule10 >;
-template class MeshLib::TemplateElement<MeshLib::TetRule4 >;
-template class MeshLib::TemplateElement<MeshLib::TriRule3 >;
-template class MeshLib::TemplateElement<MeshLib::TriRule6 >;
+template class MeshLib::TemplateElement<MeshLib::PyramidRule5>;
+template class MeshLib::TemplateElement<MeshLib::QuadRule4>;
+template class MeshLib::TemplateElement<MeshLib::QuadRule8>;
+template class MeshLib::TemplateElement<MeshLib::QuadRule9>;
+template class MeshLib::TemplateElement<MeshLib::TetRule10>;
+template class MeshLib::TemplateElement<MeshLib::TetRule4>;
+template class MeshLib::TemplateElement<MeshLib::TriRule3>;
+template class MeshLib::TemplateElement<MeshLib::TriRule6>;
diff --git a/Tests/NumLib/TestCoordinatesMapping.cpp b/Tests/NumLib/TestCoordinatesMapping.cpp
index 3c3032fe74ce2e5a9a98d00dd305c8230d5a3933..ddf44df0a2d050e58261ec40f255895d22eac8d7 100644
--- a/Tests/NumLib/TestCoordinatesMapping.cpp
+++ b/Tests/NumLib/TestCoordinatesMapping.cpp
@@ -311,7 +311,7 @@ TEST(NumLib, FemNaturalCoordinatesMappingLineY)
double exp_dNdx[2*e_nnodes] = {0, 0, -0.5, 0.5};
ASSERT_ARRAY_NEAR(exp_dNdx, shape.dNdx.data(), shape.dNdx.size(), eps);
- for (auto n = 0; n < line->getNNodes(); ++n)
+ for (auto n = 0u; n < line->getNNodes(); ++n)
delete line->getNode(n);
delete line;
}