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.

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

Fix HY_Features_MPI to match feature-type behavior of HY_Features from PR #665 #674

Merged
merged 1 commit into from
Nov 9, 2023
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/core/HY_Features_MPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ HY_Features_MPI::HY_Features_MPI( PartitionData partition_data, geojson::GeoJSON
destinations = network.get_destination_ids(feat_id);
//Find upstream ids
origins = network.get_origination_ids(feat_id);
if(feat_type == "cat" || feat_type == "agg")
if(hy_features::identifiers::isCatchment(feat_type))
{
//Find and prepare formulation
auto formulation = formulations->get_formulation(feat_id);
Expand All @@ -60,7 +60,7 @@ HY_Features_MPI::HY_Features_MPI( PartitionData partition_data, geojson::GeoJSON

_catchments.emplace(feat_id, c);
}
else if(feat_type == "nex" || feat_type == "tnx")
else if(hy_features::identifiers::isNexus(feat_type))
{ //origins only contains LOCAL origin features (catchments) as read from
//the geojson/partition subset. We need to make sure `origins` passed to remote nexus
//contain IDS of ALL upstream features, including those in remote partitions
Expand Down
Loading