Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coord_type typo #1408

Merged
merged 1 commit into from
Nov 20, 2024
Merged

coord_type typo #1408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/libs/ascent/runtimes/expressions/ascent_blueprint_topologies.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ PointTopology<T, N>::PointTopology(const std::string &topo_name,
<< " which has type '" << this->topo_type << "'.");
}

if(this->coord_type == "uniform")
if(this->coords_type == "uniform")
{
const conduit::Node &n_coords = domain["coordsets/" + this->coords_name];
const conduit::Node &n_dims = n_coords["dims"];
Expand All @@ -177,7 +177,7 @@ PointTopology<T, N>::PointTopology(const std::string &topo_name,
num_cells *= dims[i] - 1;
}
}
else if(this->coord_type == "rectilinear")
else if(this->coords_type == "rectilinear")
{
const conduit::Node &values =
domain["coordsets/" + this->coords_name + "/values"];
Expand All @@ -189,7 +189,7 @@ PointTopology<T, N>::PointTopology(const std::string &topo_name,
num_points *= coords[i].dtype().number_of_elements();
}
}
else if(this->coord_type == "explicit")
else if(this->coords_type == "explicit")
{
const conduit::Node &values =
domain["coordsets/" + this->coords_name + "/values"];
Expand All @@ -203,7 +203,7 @@ PointTopology<T, N>::PointTopology(const std::string &topo_name,
else
{
ASCENT_ERROR("Unknown coordinate type '"
<< this->coord_type << "' for point topology '" << topo_name
<< this->coords_type << "' for point topology '" << topo_name
<< "' in domain " << domain.name() << ".");
}
}
Expand All @@ -213,15 +213,15 @@ std::array<conduit::float64, 3>
PointTopology<T, N>::vertex_location(const size_t index) const
{
std::array<conduit::float64, 3> loc{};
if(this->coord_type == "uniform")
if(this->coords_type == "uniform")
{
auto l_index = detail::logical_index(index, dims);
for(size_t i = 0; i < N; ++i)
{
loc[i] = origin[i] + l_index[i] * spacing[i];
}
}
else if(this->coord_type == "rectilinear")
else if(this->coords_type == "rectilinear")
{
std::array<size_t, N> dims;
for(size_t i = 0; i < N; ++i)
Expand All @@ -234,7 +234,7 @@ PointTopology<T, N>::vertex_location(const size_t index) const
loc[i] = coords[i][l_index[i]];
}
}
else if(this->coord_type == "explicit")
else if(this->coords_type == "explicit")
{
for(size_t i = 0; i < N; ++i)
{
Expand All @@ -244,7 +244,7 @@ PointTopology<T, N>::vertex_location(const size_t index) const
else
{
ASCENT_ERROR("Unknown coordinate type '"
<< this->coord_type << "' for point topology '" << topo_name
<< this->coords_type << "' for point topology '" << topo_name
<< "' in domain " << domain.name() << ".");
}
return loc;
Expand Down