Skip to content

Commit

Permalink
use i,j,k for optional struct ele origin, instead of i0,j0,k0
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrush committed Oct 14, 2020
1 parent 1ea8e6b commit 9c6ce79
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -74,6 +74,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
#### Blueprint
- Refactored the Polygonal and Polyhedral mesh blueprint specification to leverage one-to-many concepts and to allow more zero-copy use cases.
- The `conduit_blueprint_mpi` library now depends on `conduit_relay_mpi`.
- Optional Mesh Blueprint structured topology logical element offsets are now `{i,j,k}` instead of `{i0,j0,k0}`.


## [0.5.1] - Released 2020-01-18
Expand Down
6 changes: 3 additions & 3 deletions src/docs/sphinx/blueprint_mesh.rst
Expand Up @@ -196,20 +196,20 @@ The mesh blueprint protocol accepts four implicit ways to define a topology on a

* topologies/topo/coordset: "coords"
* topologies/topo/type: “uniform”
* topologies/topo/elements/origin/{i0,j0,k0} (optional, default = {0,0,0})
* topologies/topo/elements/origin/{i,j,k} (optional, default = {0,0,0})

* **rectilinear**: An implicit topology that defines a grid of elements on top of a *rectilinear* coordinate set.

* topologies/topo/coordset: "coords"
* topologies/topo/type: “rectilinear”
* topologies/topo/elements/origin/{i0,j0,k0} (optional, default = {0,0,0})
* topologies/topo/elements/origin/{i,j,k} (optional, default = {0,0,0})


.. .. attention::
.. (can we collapse uniform + rectilinear?)
.. * topologies/topo/type: “structured”
.. * topologies/topo/elements/dims: "implicit"
.. * topologies/topo/elements/origin/{i0,j0,k0} (optional, default = {0,0,0})
.. * topologies/topo/elements/origin/{i,j,k} (optional, default = {0,0,0})
.. * topologies/coordset: "coords"
Expand Down
4 changes: 2 additions & 2 deletions src/libs/blueprint/conduit_blueprint_mesh_examples.cpp
Expand Up @@ -2860,8 +2860,8 @@ adjset_uniform(Node &res)
domain_coords["origin/y"].set_float64(0.5*(i%2));

Node &domain_topo = domain_node["topologies/topo"];
domain_topo["elements/origin/i0"].set_int32(20*(i/2));
domain_topo["elements/origin/j0"].set_int32(20*(i%2));
domain_topo["elements/origin/i"].set_int32(20*(i/2));
domain_topo["elements/origin/j"].set_int32(20*(i%2));
domain_topo["type"].set_string("uniform");
domain_topo["coordset"].set_string("coords");

Expand Down
6 changes: 3 additions & 3 deletions src/tests/relay/adios_test_utils.hpp
Expand Up @@ -218,9 +218,9 @@ void add_rectilinear_mesh(Node &n, conduit::float64 origin[3], conduit::float64
n["coordsets/coords/values/z"] = coords[2];
n["topologies/mesh/coordset"] = "coords";
n["topologies/mesh/type"] = "rectilinear";
n["topologies/mesh/elements/origin/i0"] = origin[0];
n["topologies/mesh/elements/origin/j0"] = origin[1];
n["topologies/mesh/elements/origin/k0"] = origin[2];
n["topologies/mesh/elements/origin/i"] = origin[0];
n["topologies/mesh/elements/origin/j"] = origin[1];
n["topologies/mesh/elements/origin/k"] = origin[2];

n["fields/radius/association"] = "vertex";
n["fields/radius/type"] = "scalar";
Expand Down

0 comments on commit 9c6ce79

Please sign in to comment.