1D to Strip #1018

agcapps · 2022-09-29T17:03:42Z

Adds a verify() function and strip-conversion routines

agcapps · 2022-09-29T17:05:17Z

This is at the discussion stage. In particular, the results need to be tested against other libraries that expect strip meshes, and we need to examine assumptions.

agcapps · 2022-09-29T17:11:31Z

Currently, the oneD::verify function expects a structured mesh, as do the conversion routines. verify, at least, should support uniform meshes (specifying a dx and an origin). The conversion routines should support uniform meshes if needed by users. In addition, we should probably also support conversion between 1D structured and 1D uniform and back.

cyrush · 2022-09-29T17:36:29Z

Instead of a new verify case, can we identity existing verified meshes with a subset of properties for this case?

cyrush · 2022-10-13T19:53:37Z

Suggested methods for strip creation:

Suggested top level method:

blueprint::mesh::generate_strip(conduit::Node& mesh,
      const std::string& src_topo_name,
      const std::string& dst_topo_name);

Suggested topology specific method:

blueprint::mesh::topology::generate_strip(const conduit::Node &topo,
       conduit::Node &topo_dest,
       conduit::Node &coords_dest)

cyrush · 2022-10-13T19:57:31Z

Q: For the result strip mesh, does that have to be uniform/rectilinear/structured for the carter use case, or could it be unstructured for any case we could care about?

cyrush · 2022-10-13T20:02:30Z

src/libs/blueprint/conduit_blueprint_mesh.cpp

+
+    // Each coordset c in mesh["coordsets"] must have two children of c["values"]
+    bool consistent_dim = is_dimension_consistent(mesh);
+    if (!consistent_dim)


We will be interested in a specific topology, so I thinl we can check the coordset linked with that topology vs all possible coordsets.

That will probably make the code more specific and constrained (in this case, both good things).

cyrush · 2022-10-13T20:06:15Z

src/libs/blueprint/conduit_blueprint_mesh.cpp

+        res = false;
+    }
+
+    index_t mesh_dim = max_dimension(mesh);


We can use: conduit::blueprint::mesh::utils::coordset::dims for the specific coordset

agcapps · 2022-10-13T21:32:59Z

I don't know for sure if Carter wants uniform/rectilinear/structured. I will try to track down a test case and model off that.

cyrush

New methods are on the right track 👍

I a few questions about implementation.

src/libs/blueprint/conduit_blueprint_mesh.cpp

cyrush · 2022-10-25T18:02:15Z

src/libs/blueprint/conduit_blueprint_mesh.cpp

+    // Convert nodal fields
+}
+
+


remove these before merge

cyrush · 2022-10-25T18:11:07Z

src/libs/blueprint/conduit_blueprint_mesh.cpp

+    conduit::Node & n = to[key];
+    const std::string from_name = n.child(0).name();
+    n.rename_child(from_name, new_name);
+    n[new_sibling].set(n[new_name]);


Despite the name - I am having a hard time parsing this.

Do we need to pass from & to and the child key?
Why not just pass those nodes like:
copy_node_rename_first_child(src[key],dest[key], new_name, new_sibling)

I also don't understand the context of new_sibling?

I see the rename, but then n[new_sibling] is a copy of the first child after it was renamed?

cyrush · 2022-10-25T18:12:22Z

src/libs/blueprint/conduit_blueprint_mesh.cpp

+    if (coord_type == "uniform")
+    {
+        copy_node_rename_first_child(coordset, dest, "dims", "j", "i");
+        dest["dims/i"].set(1);


copy_node_rename_first_child(coordset, dest, "dims", "j", "i");

This will copy coordset["dims"] into dest["dims"].
Then rename dest["dims"].child(0) to be named j or dest["dims/j"]
Then copy dest["dims/j"] so it is also dest["dims/i"]
And then you reset:
dest["dims/i"].set(1);

Why have the sibling copy if we are going to reset it in these cases?

cyrush

@agcapps a few more questions. Let me know if you want to meet to discuss.

cyrush · 2022-10-28T19:44:45Z

src/libs/blueprint/conduit_blueprint_mesh_examples.cpp

+    {
+        res["coordsets/coords/type"] = "rectilinear";
+    }
+


Not sure I understand this change.

braid_structured aims to create implicit logical topology with on an explicit coordset.

woops. I mixed up rectilinear and structured. Just trying to keep the amount of allocation to a minimum.

src/libs/blueprint/conduit_blueprint_mesh.cpp

cyrush · 2022-10-28T19:59:13Z

src/libs/blueprint/conduit_blueprint_mesh.cpp

@@ -1101,6 +1101,7 @@ convert_oneD_coordset_to_strip(const conduit::Node &coordset,
    else
    {
        copy_node_rename_first_child(coordset, dest, "values", "y", "x");
+        dest["values/x"].reset();


reset isn't needed b/c set will take care of it if needed.

Before I added the call to reset(), I was seeing dest["values/x"] hold the same values and dimension as dest["values/y"], except elements 0 and 1 were 0.0 and 1.0. Now much has changed, and after trying it without the call to reset() I see that the expected two values are there.

Removed the call to reset().

agcapps · 2022-11-01T18:22:20Z

@cyrush , any more thoughts on this PR?

cyrush · 2022-11-01T18:45:32Z

Yes, I have been pondering.

We can chat at our meeting today.

src/libs/blueprint/conduit_blueprint_mesh.cpp

Co-authored-by: Cyrus Harrison <cyrush@llnl.gov>

…duit into feature/capps2/1D_strip

cyrush

Look good,thanks for the iteration on this.

agcapps added 4 commits September 2, 2022 14:26

Start on functions to convert 1D mesh to strip mesh and back.

4caf5ea

Merge branch 'develop' into feature/capps2/1D_strip

a299092

More prep work for 1D verify and strip conversion

cc0de73

Rough draft at adding verify() and strip-conversion routines.

6d1396c

agcapps requested a review from cyrush September 29, 2022 17:03

agcapps self-assigned this Sep 29, 2022

agcapps marked this pull request as draft September 29, 2022 17:18

agcapps added 2 commits October 10, 2022 13:11

Progress on mesh conversion helpers

1a1eb6a

Added more of the blueprint

8987a50

cyrush reviewed Oct 13, 2022

View reviewed changes

More fully developed predicates and conversion methods.

4192b29

agcapps added 2 commits October 21, 2022 09:41

Refined interface, further incorporating review comments

eadf8cc

Fixed wrong name in test

f23f6d7

cyrush reviewed Oct 25, 2022

View reviewed changes

Resolved inconsistent coordset type and topo-coordset link.

fff01f9

cyrush reviewed Oct 28, 2022

View reviewed changes

agcapps added 6 commits October 28, 2022 15:27

Simplify, simplify

b0e69f5

Set test to correct type.

2773c1e

Test the right mesh type

eb205ec

Remove construction debris

b5b952e

Remove extraneous whitespace

af24c9a

Don't add a flag at this level.

9e54ca2

cyrush reviewed Nov 1, 2022

View reviewed changes

src/libs/blueprint/conduit_blueprint_mesh.cpp Outdated Show resolved Hide resolved

agcapps and others added 3 commits November 2, 2022 08:26

Update src/libs/blueprint/conduit_blueprint_mesh.cpp

2d33d5a

Co-authored-by: Cyrus Harrison <cyrush@llnl.gov>

Reorder to ij, xy, dxdy

0400735

Merge branch 'feature/capps2/1D_strip' of https://github.com/LLNL/con…

3fececc

…duit into feature/capps2/1D_strip

agcapps marked this pull request as ready for review November 2, 2022 15:35

cyrush approved these changes Nov 2, 2022

View reviewed changes

agcapps merged commit 74b2fdf into develop Nov 3, 2022

agcapps deleted the feature/capps2/1D_strip branch November 3, 2022 18:03

agcapps mentioned this pull request Nov 4, 2022

Generated one-D fields #1034

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

1D to Strip #1018

1D to Strip #1018

agcapps commented Sep 29, 2022

agcapps commented Sep 29, 2022

agcapps commented Sep 29, 2022 •

edited

cyrush commented Sep 29, 2022

cyrush commented Oct 13, 2022 •

edited

cyrush commented Oct 13, 2022

cyrush Oct 13, 2022 •

edited

agcapps Oct 13, 2022 •

edited

cyrush Oct 13, 2022

agcapps commented Oct 13, 2022

cyrush left a comment

cyrush Oct 25, 2022 •

edited by agcapps

cyrush Oct 25, 2022

cyrush Oct 25, 2022

cyrush left a comment

cyrush Oct 28, 2022

agcapps Oct 28, 2022

cyrush Oct 28, 2022

agcapps Oct 28, 2022

agcapps commented Nov 1, 2022

cyrush commented Nov 1, 2022

cyrush left a comment

1D to Strip #1018

1D to Strip #1018

Conversation

agcapps commented Sep 29, 2022

agcapps commented Sep 29, 2022

agcapps commented Sep 29, 2022 • edited

cyrush commented Sep 29, 2022

cyrush commented Oct 13, 2022 • edited

cyrush commented Oct 13, 2022

cyrush Oct 13, 2022 • edited

Choose a reason for hiding this comment

agcapps Oct 13, 2022 • edited

Choose a reason for hiding this comment

cyrush Oct 13, 2022

Choose a reason for hiding this comment

agcapps commented Oct 13, 2022

cyrush left a comment

Choose a reason for hiding this comment

cyrush Oct 25, 2022 • edited by agcapps

Choose a reason for hiding this comment

cyrush Oct 25, 2022

Choose a reason for hiding this comment

cyrush Oct 25, 2022

Choose a reason for hiding this comment

cyrush left a comment

Choose a reason for hiding this comment

cyrush Oct 28, 2022

Choose a reason for hiding this comment

agcapps Oct 28, 2022

Choose a reason for hiding this comment

cyrush Oct 28, 2022

Choose a reason for hiding this comment

agcapps Oct 28, 2022

Choose a reason for hiding this comment

agcapps commented Nov 1, 2022

cyrush commented Nov 1, 2022

cyrush left a comment

Choose a reason for hiding this comment

agcapps commented Sep 29, 2022 •

edited

cyrush commented Oct 13, 2022 •

edited

cyrush Oct 13, 2022 •

edited

agcapps Oct 13, 2022 •

edited

cyrush Oct 25, 2022 •

edited by agcapps