Allow specifying attribute name when reading meshtag #3257

mleoni-pf · 2024-06-06T14:20:40Z

If no attribute_name is provided, read the first attribute. Otherwise, read the attribute with the provided name or throw an error if it couldn't be found.

garth-wells · 2024-06-07T10:43:18Z

python/dolfinx/io/utils.py

        return MeshTags(mt)

+    def read_meshtags(self, mesh, name, xpath="/Xdmf/Domain"):


Needs docs.

garth-wells · 2024-06-07T10:43:56Z

python/dolfinx/io/utils.py

@@ -276,10 +276,13 @@ def read_mesh(
        )
        return Mesh(msh, domain)

-    def read_meshtags(self, mesh, name, attribute_name="", xpath="/Xdmf/Domain"):
-        mt = super().read_meshtags(mesh._cpp_object, name, attribute_name, xpath)
+    def read_meshtags_by_name(self, mesh, name, attribute_name, xpath="/Xdmf/Domain"):


Would it be better as one function and using default arg attribute_name=None?

I remember that you don't like having two default arguments in one function but I'm guessing that's only for C++, right?

Not good for C++, fine with Python if it's simple (which this is) and doesn't introduce complicated conditional handling.

garth-wells · 2024-06-07T10:46:31Z

cpp/dolfinx/io/XDMFFile.cpp

-    const mesh::Mesh<double>& mesh, const std::string name,
-    const std::string attribute_name, const std::string xpath)
+mesh::MeshTags<std::int32_t>
+XDMFFile::read_meshtags_by_name(const mesh::Mesh<double>& mesh,


Let's change name -> label in the function name. 'name' is ambiguous.

garth-wells

The code is XDMFFile.cpp looks to me more complicated than it needs to be. I've left some suggestions as a first pass. I can look again once it's been simplified some more.

cpp/dolfinx/io/XDMFFile.h

cpp/dolfinx/io/XDMFFile.cpp

python/dolfinx/wrappers/io.cpp

cpp/test/mesh/Domain.xdmf

garth-wells · 2024-09-12T08:39:47Z

cpp/dolfinx/io/XDMFFile.h

@@ -164,9 +164,21 @@ class XDMFFile
                      const mesh::Geometry<T>& x, std::string geometry_xpath,
                      std::string xpath = "/Xdmf/Domain");

+  /// Read MeshTags by name


This is a bit confusing - the docstring says "Read MeshTags by name" but the function name is "read_meshtags_by_label". Is it by name or by label?

The issue comes from the following fact: mesh tags are identified by "a word", so it is natural that this word be called the "name" of the mesh tag. The problem is that there is already another name parameter which refers to the name of the mesh node in the same file. I picked the word "label" to distinguish the two internally, in the code implementation, but a user should not be concerned with this implementation detail: a user saved a mesh tag giving it a "name" and wants to read it back by the same "name".
The fact remains that the user still needs to call a function whose name includes the word "label", not "name", which is indeed a bit confusing. I will change everything to be called more consistently, the code shouldn't become too unintelligible on the development side.

By the way, re-reading this conversation I noticed that in the first review, four months ago, you asked me to change the method name to avoid the word "name" in favour of "label". I had forgotten about that and, based on your comment, I reverted the change. Which one should I keep? To a user, a mesh tag's "label" means presumably very little...

cpp/dolfinx/io/XDMFFile.cpp

cpp/dolfinx/io/XDMFFile.h

cpp/dolfinx/io/XDMFFile.cpp

jorgensd · 2024-11-08T22:31:59Z

@garth-wells
@mleoni-pf and I sat down and looked through the pugixml docs today.
The new solution is much cleaner and much closer to what we use in general in DOLFINx (i.e. lambda function for search predicate).
This is a very neat function to have, as it will allow storing multiple data arrays within the same grid (for instance material parameters.

jorgensd · 2024-11-11T10:13:21Z

cpp/dolfinx/io/XDMFFile.cpp

@@ -334,8 +334,9 @@ template void XDMFFile::write_meshtags(const mesh::MeshTags<std::int32_t>&,
 /// @endcond
 //-----------------------------------------------------------------------------
 mesh::MeshTags<std::int32_t>
-XDMFFile::read_meshtags(const mesh::Mesh<double>& mesh, std::string name,
-                        std::string xpath)
+XDMFFile::read_meshtags_by_name(const mesh::Mesh<double>& mesh,


Do we really want a separate function for this in C++? Couldn't we just put the attribute name as a fourth argument (optional) argument.

I don't see the added value of a constructor for handling one optional value to have a backwards compatible C++ interface. @garth-wells

Agree, one function would be better. Would is make sense to use std::optional for attribute_name?

Related to this, we should not pass empty strings as 'null' - use std::optional.

garth-wells · 2024-11-12T10:06:40Z

cpp/dolfinx/io/XDMFFile.cpp

@@ -334,8 +334,9 @@ template void XDMFFile::write_meshtags(const mesh::MeshTags<std::int32_t>&,
 /// @endcond
 //-----------------------------------------------------------------------------
 mesh::MeshTags<std::int32_t>
-XDMFFile::read_meshtags(const mesh::Mesh<double>& mesh, std::string name,
-                        std::string xpath)
+XDMFFile::read_meshtags_by_name(const mesh::Mesh<double>& mesh,


Agree, one function would be better. Would is make sense to use std::optional for attribute_name?

Related to this, we should not pass empty strings as 'null' - use std::optional.

cpp/dolfinx/io/XDMFFile.cpp

garth-wells · 2024-11-12T10:11:05Z

cpp/test/mesh/read_named_meshtags.cpp

+  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);


Just use std::vector<std::int32_t> domain_values(n_cells, domain_value);

garth-wells · 2024-11-12T10:11:14Z

cpp/test/mesh/read_named_meshtags.cpp

+  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);


See above comment.

garth-wells · 2024-11-12T10:12:57Z

python/dolfinx/io/utils.py

@@ -276,8 +276,15 @@ def read_mesh(
        )
        return Mesh(msh, domain)

-    def read_meshtags(self, mesh, name, xpath="/Xdmf/Domain"):
-        mt = super().read_meshtags(mesh._cpp_object, name, xpath)
+    def read_meshtags(self, mesh, name, attribute_label=None, xpath="/Xdmf/Domain"):


Follow the Google docs style with Arguments, etc. There are quite a few examples in the code.

garth-wells · 2024-11-12T12:21:32Z

@garth-wells @mleoni-pf and I sat down and looked through the pugixml docs today. The new solution is much cleaner and much closer to what we use in general in DOLFINx (i.e. lambda function for search predicate). This is a very neat function to have, as it will allow storing multiple data arrays within the same grid (for instance material parameters.

Nice - looking good.

python/dolfinx/io/utils.py

jorgensd

LGTM!

Co-authored-by: Jørgen Schartum Dokken <[email protected]>

garth-wells

I've pushed some fixes to the code. Last things that is missing is a Python test. @massimiliano-leoni can you add a Python test?

mleoni-pf · 2024-11-22T09:29:56Z

@garth-wells Python test added!

mleoni-pf changed the title ~~Allow to specify attribute name when reading meshtag~~ Allow specifying attribute name when reading meshtag Jun 6, 2024

garth-wells requested changes Jun 7, 2024

View reviewed changes

jorgensd added the io label Jun 7, 2024

garth-wells requested changes Jun 8, 2024

View reviewed changes

mleoni-pf requested a review from garth-wells June 21, 2024 08:03

garth-wells reviewed Jul 17, 2024

View reviewed changes

cpp/test/mesh/Domain.xdmf Outdated Show resolved Hide resolved

mleoni-pf requested a review from garth-wells July 31, 2024 16:17

mscroggs added this to the 0.9.0 milestone Sep 3, 2024

garth-wells reviewed Sep 12, 2024

View reviewed changes

garth-wells requested changes Sep 12, 2024

View reviewed changes

cpp/dolfinx/io/XDMFFile.cpp Outdated Show resolved Hide resolved

cpp/dolfinx/io/XDMFFile.cpp Outdated Show resolved Hide resolved

cpp/dolfinx/io/XDMFFile.cpp Outdated Show resolved Hide resolved

mleoni-pf requested a review from garth-wells September 26, 2024 16:27

garth-wells modified the milestones: 0.9.0, 0.10.0 Oct 4, 2024

Safe default value for unbound variables in dolfinx.conf

35a65b4

jorgensd reviewed Nov 8, 2024

View reviewed changes

cpp/dolfinx/io/XDMFFile.h Outdated Show resolved Hide resolved

jorgensd reviewed Nov 8, 2024

View reviewed changes

cpp/dolfinx/io/XDMFFile.h Outdated Show resolved Hide resolved

jorgensd reviewed Nov 8, 2024

View reviewed changes

cpp/dolfinx/io/XDMFFile.cpp Show resolved Hide resolved

jorgensd reviewed Nov 11, 2024

View reviewed changes

garth-wells requested changes Nov 12, 2024

View reviewed changes

jorgensd reviewed Nov 21, 2024

View reviewed changes

python/dolfinx/io/utils.py Outdated Show resolved Hide resolved

mleoni-pf requested review from jorgensd and garth-wells November 21, 2024 14:29

jorgensd approved these changes Nov 21, 2024

View reviewed changes

mleoni-pf and others added 5 commits November 21, 2024 17:40

Merge branch 'FEniCS:main' into main

dfca9ce

Allow to specify attribute name when reading meshtag

7cd17dc

Add python interface

b416660

Disambiguate functions

7ea0982

Fix Python wrapper

bcf71e4

mleoni-pf and others added 10 commits November 21, 2024 17:43

Sprinkling some const

f49d882

Apply revision

1511b27

Fix doc

d524140

Fix doc

c38ba2a

Ruff format

33e775a

Const and ref fixes

6310419

Ruff fixes

a1b75bd

Update python/dolfinx/io/utils.py

b4f2e88

Co-authored-by: Jørgen Schartum Dokken <[email protected]>

Add type hints

0f4251f

Fix dispatch

d348efa

mleoni-pf force-pushed the mleoni/readNamedMeshtags branch from 64ad359 to d348efa Compare November 21, 2024 16:43

garth-wells added 3 commits November 21, 2024 20:37

Fixes

1c23594

Add missing include

b2d4b9c

Tidy cmake order

6f059d6

garth-wells requested changes Nov 21, 2024

View reviewed changes

mleoni-pf and others added 4 commits November 22, 2024 09:47

Merge branch 'main' into mleoni/readNamedMeshtags

8396c05

Minor fixes

4b8978a

Added test

dd877c4

Ruff fixes

4583604

mleoni-pf requested a review from garth-wells November 22, 2024 10:19

garth-wells approved these changes Nov 22, 2024

View reviewed changes

garth-wells added this pull request to the merge queue Nov 22, 2024

github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Nov 22, 2024

mleoni-pf and others added 2 commits November 22, 2024 13:19

Merge branch 'main' into mleoni/readNamedMeshtags

599c86f

Ruff fixes

80c0216

jorgensd added this pull request to the merge queue Nov 22, 2024

Merged via the queue into FEniCS:main with commit 13bc37f Nov 22, 2024
15 checks passed

mleoni-pf deleted the mleoni/readNamedMeshtags branch November 25, 2024 08:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow specifying attribute name when reading meshtag #3257

Allow specifying attribute name when reading meshtag #3257

mleoni-pf commented Jun 6, 2024

garth-wells Jun 7, 2024

mleoni-pf Jun 7, 2024

garth-wells Jun 7, 2024

mleoni-pf Jun 7, 2024

garth-wells Jun 7, 2024

mleoni-pf Jun 7, 2024

garth-wells Jun 7, 2024

mleoni-pf Jun 7, 2024

garth-wells left a comment

garth-wells Sep 12, 2024

mleoni-pf Sep 26, 2024

mleoni-pf Sep 27, 2024

jorgensd commented Nov 8, 2024

jorgensd Nov 11, 2024

garth-wells Nov 12, 2024

garth-wells Nov 12, 2024

garth-wells Nov 12, 2024

garth-wells Nov 12, 2024

garth-wells Nov 12, 2024

garth-wells commented Nov 12, 2024

jorgensd left a comment

garth-wells left a comment

mleoni-pf commented Nov 22, 2024

		return MeshTags(mt)

		def read_meshtags(self, mesh, name, xpath="/Xdmf/Domain"):

Allow specifying attribute name when reading meshtag #3257

Allow specifying attribute name when reading meshtag #3257

Conversation

mleoni-pf commented Jun 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

garth-wells left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jorgensd commented Nov 8, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

garth-wells commented Nov 12, 2024

jorgensd left a comment

Choose a reason for hiding this comment

garth-wells left a comment

Choose a reason for hiding this comment

mleoni-pf commented Nov 22, 2024