Merge branch 'SmallImprovements' into 'master'

[MeL] Small code quality improvements.

See merge request ogs/ogs!3799

MeshLib/Elements/Element.cpp

@@ -41,7 +41,8 @@ void Element::setNeighbor(Element* neighbor, unsigned const face_id)
 
 std::optional<unsigned> Element::addNeighbor(Element* e)
 {
-    if (e == this || e == nullptr || e->getDimension() != this->getDimension())
+    const unsigned dim(this->getDimension());
+    if (e == this || e == nullptr || e->getDimension() != dim)
     {
         return std::optional<unsigned>();
     }
@@ -56,7 +57,6 @@ std::optional<unsigned> Element::addNeighbor(Element* e)
     const unsigned eNodes(e->getNumberOfBaseNodes());
     const Node* const* e_nodes = e->getNodes();
     unsigned count(0);
-    const unsigned dim(this->getDimension());
     for (unsigned i(0); i < nNodes; i++)
     {
         for (unsigned j(0); j < eNodes; j++)

MeshLib/Elements/Element.h

@@ -68,7 +68,7 @@ public:
     virtual Node* const* getNodes() const = 0;
 
     /// Get dimension of the mesh element.
-    virtual unsigned getDimension() const = 0;
+    virtual constexpr unsigned getDimension() const = 0;
 
     /// Returns the i-th edge of the element.
     virtual const Element* getEdge(unsigned i) const = 0;

MeshLib/Elements/TemplateElement.h

@@ -74,7 +74,7 @@ public:
     }
 
     /// Get dimension of the mesh element.
-    unsigned getDimension() const override { return dimension; }
+    constexpr unsigned getDimension() const override { return dimension; }
     /// Returns the edge i of the element.
     const Element* getEdge(unsigned i) const override
     {

MeshLib/MeshGenerators/VtkMeshConverter.h

@@ -18,11 +18,9 @@
 #include <vtkType.h>
 
 #include "BaseLib/Logging.h"
-
 #include "GeoLib/Raster.h"
 #include "MeshLib/Location.h"
 #include "MeshLib/MeshEnums.h"
-#include "MeshLib/Node.h"
 #include "MeshLib/Properties.h"
 #include "MeshLib/PropertyVector.h"
 
@@ -32,7 +30,8 @@ class vtkDataArray;         // For node/cell properties
 namespace MeshLib
 {
 class Mesh;
-class Properties;
+class Element;
+class Node;
 
 /**
  * \brief Converter for VtkUnstructured Grids to OGS meshes