Allow specifying attribute name when reading meshtag #3257
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -334,8 +334,9 @@ template void XDMFFile::write_meshtags(const mesh::MeshTags<std::int32_t>&, | |
| /// @endcond | ||
| //----------------------------------------------------------------------------- | ||
| mesh::MeshTags<std::int32_t> | ||
| XDMFFile::read_meshtags_by_label(const mesh::Mesh<double>& mesh, | ||
| std::string name, std::string attribute_label, | ||
| std::string xpath) | ||
| { | ||
| spdlog::info("XDMF read meshtags ({})", name); | ||
| pugi::xml_node node = _xml_doc->select_node(xpath.c_str()).node(); | ||
|
|
@@ -348,8 +349,28 @@ XDMFFile::read_meshtags(const mesh::Mesh<double>& mesh, std::string name, | |
|
|
||
| const auto [entities, eshape] = read_topology_data(name, xpath); | ||
|
|
||
| pugi::xml_node attribute_node = grid_node.child("Attribute"); | ||
| pugi::xml_node values_data_node = attribute_node.child("DataItem"); | ||
| if (!attribute_label.empty()) | ||
| { | ||
| bool found = false; | ||
| while (!found and attribute_node) | ||
| { | ||
| pugi::xml_attribute hint; | ||
|
There was a problem hiding this comment. It's something that There was a problem hiding this comment. The hint is not set or re-used - does the code compile without it? |
||
| pugi::xml_attribute name = attribute_node.attribute("Name", hint); | ||
| if (std::string(name.value()) == attribute_label) | ||
|
There was a problem hiding this comment. Creating the string is a bit clumsy, maybe use https://en.cppreference.com/w/cpp/string/char_traits/compare. There was a problem hiding this comment. Using the function you suggested requires providing a number of characters to compare, so it would have to be something like if (auto len = std::max(std::strlen(name.value()), attribute_label.size());
std::char_traits<char>::compare(name.value(), attribute_label.c_str(),
len) == 0)right? There was a problem hiding this comment. I think |
||
| { | ||
| values_data_node = attribute_node.child("DataItem"); | ||
| found = true; | ||
| } | ||
| attribute_node = attribute_node.next_sibling("Attribute"); | ||
| } | ||
| if (!found) | ||
| { | ||
| throw std::runtime_error("Attribute with name '" + attribute_label | ||
| + "' not found."); | ||
| } | ||
| } | ||
| const std::vector values = xdmf_utils::get_dataset<std::int32_t>( | ||
| _comm.comm(), values_data_node, _h5_id); | ||
|
|
||
|
|
@@ -388,6 +409,13 @@ XDMFFile::read_meshtags(const mesh::Mesh<double>& mesh, std::string name, | |
| return meshtags; | ||
| } | ||
| //----------------------------------------------------------------------------- | ||
| mesh::MeshTags<std::int32_t> | ||
| XDMFFile::read_meshtags(const mesh::Mesh<double>& mesh, std::string name, | ||
| std::string xpath) | ||
| { | ||
| return read_meshtags_by_label(mesh, name, std::string(), xpath); | ||
| } | ||
| //----------------------------------------------------------------------------- | ||
| std::pair<mesh::CellType, int> XDMFFile::read_cell_type(std::string grid_name, | ||
| std::string xpath) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // Copyright (C) 2024 Massimiliano Leoni | ||
| // | ||
| // This file is part of DOLFINx (https://www.fenicsproject.org) | ||
| // | ||
| // SPDX-License-Identifier: LGPL-3.0-or-later | ||
| // | ||
| // Unit tests for reading meshtags by name | ||
|
|
||
| #include <catch2/catch_template_test_macros.hpp> | ||
| #include <catch2/catch_test_macros.hpp> | ||
| #include <dolfinx/common/IndexMap.h> | ||
| #include <dolfinx/common/MPI.h> | ||
| #include <dolfinx/io/XDMFFile.h> | ||
| #include <dolfinx/la/Vector.h> | ||
| #include <dolfinx/mesh/MeshTags.h> | ||
| #include <dolfinx/mesh/generation.h> | ||
| #include <dolfinx/mesh/utils.h> | ||
|
|
||
| #include <numeric> | ||
| #include <string> | ||
|
|
||
| using namespace dolfinx; | ||
|
|
||
| namespace | ||
| { | ||
|
|
||
| void test_read_named_meshtags() | ||
| { | ||
| const std::string mesh_file = "Domain.xdmf"; | ||
|
|
||
| constexpr std::int32_t domain_value = 1; | ||
| constexpr std::int32_t material_value = 2; | ||
|
|
||
| // Create mesh | ||
| auto part = mesh::create_cell_partitioner(mesh::GhostMode::none); | ||
| auto mesh = std::make_shared<mesh::Mesh<double>>( | ||
| mesh::create_rectangle(MPI_COMM_WORLD, {{{0.0, 0.0}, {1.0, 1.0}}}, {3, 3}, | ||
| mesh::CellType::triangle, part)); | ||
|
|
||
| const std::int32_t n_cells = mesh->topology()->index_map(2)->size_local(); | ||
| std::vector<std::int32_t> indices(n_cells); | ||
| std::iota(std::begin(indices), std::end(indices), 0); | ||
|
|
||
| std::vector<std::int32_t> domain_values(n_cells); | ||
| std::ranges::fill(domain_values, domain_value); | ||
|
|
||
| std::vector<std::int32_t> material_values(n_cells); | ||
| std::ranges::fill(material_values, material_value); | ||
|
|
||
| mesh::MeshTags<std::int32_t> mt_domains(mesh->topology(), 2, indices, | ||
| domain_values); | ||
| mt_domains.name = "domain"; | ||
|
|
||
| mesh::MeshTags<std::int32_t> mt_materials(mesh->topology(), 2, indices, | ||
| material_values); | ||
| mt_materials.name = "material"; | ||
|
|
||
| io::XDMFFile file(mesh->comm(), mesh_file, "w", io::XDMFFile::Encoding::HDF5); | ||
| file.write_mesh(*mesh); | ||
| file.write_meshtags(mt_domains, mesh->geometry(), | ||
| "/Xdmf/Domain/mesh/Geometry"); | ||
| file.write_meshtags(mt_materials, mesh->geometry(), | ||
| "/Xdmf/Domain/Grid/Geometry"); | ||
|
|
||
| file.close(); | ||
|
|
||
| io::XDMFFile meshFile(MPI_COMM_WORLD, mesh_file, "r", | ||
| io::XDMFFile::Encoding::HDF5); | ||
| mesh = std::make_shared<mesh::Mesh<double>>(meshFile.read_mesh( | ||
| fem::CoordinateElement<double>(mesh::CellType::triangle, 1), | ||
| mesh::GhostMode::none, "mesh")); | ||
|
|
||
| const auto mt_domain = meshFile.read_meshtags_by_label( | ||
| *mesh, "domain", "domain", "/Xdmf/Domain"); | ||
|
|
||
| CHECK(mt_domain.values().front() == domain_value); | ||
|
|
||
| const auto mt_material = meshFile.read_meshtags_by_label( | ||
| *mesh, "material", "material", "/Xdmf/Domain"); | ||
|
|
||
| CHECK(mt_material.values().front() == material_value); | ||
|
|
||
| CHECK_THROWS(meshFile.read_meshtags_by_label(*mesh, "mesh", "missing")); | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| TEST_CASE("Read meshtag by name", "[read_meshtag_by_name]") | ||
| { | ||
| CHECK_NOTHROW(test_read_named_meshtags()); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this just iterating through the attributes? If yes, can it be made simpler using pugixml functionality, see https://pugixml.org/docs/manual.html#access.basic.
The code is hard to follow - at a minimum it needs a comment on what it is doing.