Skip to content
Snippets Groups Projects
Commit ad249969 authored by wenqing's avatar wenqing Committed by Dmitri Naumov
Browse files

[MeshLib] Changed a function name

i.e. replaced getElementSizes with
getMaxiumElementEdgeLengths
parent da5e78b9
No related branches found
No related tags found
No related merge requests found
......@@ -9,18 +9,17 @@
* Created on June 2, 2022, 3:05 PM
*/
#include "GetElementSizes.h"
#include "getMaxiumElementEdgeLengths.h"
#include "MeshLib/Elements/Element.h"
#include "MeshLib/Mesh.h"
#include "MeshLib/Node.h"
namespace MeshLib
{
std::vector<double> getElementSizes(Mesh const& mesh)
std::vector<double> getMaxiumElementEdgeLengths(
std::vector<Element*> const& elements)
{
const auto& elements = mesh.getElements();
std::vector<double> element_sizes(elements.size());
std::vector<double> element_edge_lengths(elements.size());
for (auto const element : elements)
{
assert(element->getGeomType() != MeshElemType::POINT);
......@@ -29,9 +28,9 @@ std::vector<double> getElementSizes(Mesh const& mesh)
MeshLib::computeSqrEdgeLengthRange(*element);
(void)min_edge_length;
element_sizes[element->getID()] = std::sqrt(max_edge_length);
element_edge_lengths[element->getID()] = std::sqrt(max_edge_length);
}
return element_sizes;
return element_edge_lengths;
}
} // namespace MeshLib
......@@ -15,7 +15,8 @@
namespace MeshLib
{
class Mesh;
class Element;
/// Returns the maximum lengths of the edges for each element.
std::vector<double> getElementSizes(Mesh const& mesh);
std::vector<double> getMaxiumElementEdgeLengths(
std::vector<Element*> const& elements);
} // namespace MeshLib
......@@ -13,7 +13,7 @@
#include "BaseLib/ConfigTree.h"
#include "BaseLib/Error.h"
#include "MeshLib/Mesh.h"
#include "MeshLib/Utils/GetElementSizes.h"
#include "MeshLib/Utils/getMaxiumElementEdgeLengths.h"
namespace NumLib
{
......@@ -80,7 +80,7 @@ std::unique_ptr<NumericalStabilization> createNumericalStabilization(
return std::make_unique<IsotropicDiffusionStabilization>(
*stabilization_cutoff_velocity_opt,
tuning_parameter,
MeshLib::getElementSizes(mesh));
MeshLib::getMaxiumElementEdgeLengths(mesh.getElements()));
}
OGS_FATAL("The stabilization type {:s} is not available.", type);
......
......@@ -91,6 +91,8 @@ private:
/// The tuning parameter in the range [0,1].
double const tuning_parameter_ = 0.5;
/// Element sizes, which are represented by the maximum element edge
/// lengths.
std::vector<double> const element_sizes_;
};
......
......@@ -19,9 +19,9 @@
#include "InfoLib/TestInfo.h"
#include "MeshLib/IO/readMeshFromFile.h"
#include "MeshLib/Mesh.h"
#include "MeshLib/Utils/GetElementSizes.h"
#include "MeshLib/Utils/getMaxiumElementEdgeLengths.h"
TEST(MeshLib, getElementSizes)
TEST(MeshLib, getMaxiumElementEdgeLengths)
{
// Use mesh quadratic_mesh.vtu that contains 8 elements with different
// types:
......@@ -35,7 +35,8 @@ TEST(MeshLib, getElementSizes)
file_name);
}
auto const element_sizes = MeshLib::getElementSizes(*mesh);
auto const element_sizes =
MeshLib::getMaxiumElementEdgeLengths(mesh->getElements());
std::vector<double> const expected_element_sizes = {
1, std::sqrt(2), 1, 1, std::sqrt(2), 1, std::sqrt(2), std::sqrt(1.5)};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment