From 71de76f6c662926f5da5408853e22786055a6194 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 9 Jul 2021 08:29:00 +0200
Subject: [PATCH] [MeL/Elements] Calculate content on the fly.
The getContent() method is used only on very few
places. Especially, it isn't used in the computation
of any THMC processes. So the content doesn't need
to be stored which saves memory. Furthermore, the time
time for reading / initializing a mesh is reduced.
In a hex mesh with 100x100x100 elements this saves
2.6% of storage and circa 25% time.
---
MeshLib/Elements/Element.cpp | 2 +-
MeshLib/Elements/Element.h | 4 +---
MeshLib/Elements/TemplateElement-impl.h | 8 +++++---
MeshLib/Elements/TemplateElement.h | 1 +
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index e2866d0cbef..a2b010aa341 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -23,7 +23,7 @@
namespace MeshLib
{
Element::Element(std::size_t id)
- : _nodes(nullptr), _id(id), _content(-1.0), _neighbors(nullptr)
+ : _nodes(nullptr), _id(id), _neighbors(nullptr)
{
}
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index 65b62a6bf9d..590527f20a4 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -43,7 +43,7 @@ public:
std::optional<unsigned> addNeighbor(Element* e);
/// Returns the length, area or volume of a 1D, 2D or 3D element
- double getContent() const { return _content; }
+ virtual double getContent() const = 0;
/**
* Get node with local index i where i should be at most the number
@@ -194,8 +194,6 @@ protected:
Node** _nodes;
std::size_t _id;
- /// Content corresponds to length for 1D, area for 2D, and volume for 3D elements
- double _content;
Element** _neighbors;
/// Sets the neighbor over the face with \c face_id to the given \c
diff --git a/MeshLib/Elements/TemplateElement-impl.h b/MeshLib/Elements/TemplateElement-impl.h
index 7a210f3f439..27d48904350 100644
--- a/MeshLib/Elements/TemplateElement-impl.h
+++ b/MeshLib/Elements/TemplateElement-impl.h
@@ -20,7 +20,6 @@ TemplateElement<ELEMENT_RULE>::TemplateElement(Node* nodes[n_all_nodes], std::si
this->_nodes = nodes;
this->_neighbors = new Element*[getNumberOfNeighbors()];
std::fill(this->_neighbors, this->_neighbors + getNumberOfNeighbors(), nullptr);
- this->_content = ELEMENT_RULE::computeVolume(this->_nodes);
this->space_dimension_ = ELEMENT_RULE::dimension;
}
@@ -33,7 +32,6 @@ TemplateElement<ELEMENT_RULE>::TemplateElement(std::array<Node*, n_all_nodes> co
std::copy(nodes.begin(), nodes.end(), this->_nodes);
this->_neighbors = new Element*[getNumberOfNeighbors()];
std::fill(this->_neighbors, this->_neighbors + getNumberOfNeighbors(), nullptr);
- this->_content = ELEMENT_RULE::computeVolume(this->_nodes);
this->space_dimension_ = ELEMENT_RULE::dimension;
}
@@ -52,11 +50,15 @@ TemplateElement<ELEMENT_RULE>::TemplateElement(const TemplateElement &e)
{
this->_neighbors[i] = e._neighbors[i];
}
- this->_content = e.getContent();
this->space_dimension_ = e.space_dimension_;
}
+template <class ELEMENT_RULE>
+double TemplateElement<ELEMENT_RULE>::getContent() const
+{
+ return ELEMENT_RULE::computeVolume(this->_nodes);
+}
namespace details
{
diff --git a/MeshLib/Elements/TemplateElement.h b/MeshLib/Elements/TemplateElement.h
index db06fbebba0..2de5766335c 100644
--- a/MeshLib/Elements/TemplateElement.h
+++ b/MeshLib/Elements/TemplateElement.h
@@ -209,6 +209,7 @@ public:
return ELEMENT_RULE::testElementNodeOrder(*this);
}
+ double getContent() const override final;
};
} // namespace MeshLib
--
GitLab