mask output #806
Merged
mask output #806
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AminTorabi-NOAA
requested review from
shorvath-noaa,
kumdonoaa and
JurgenZach-NOAA
JurgenZach-NOAA
previously approved these changes
Jul 17, 2024
JurgenZach-NOAA
previously approved these changes
Jul 20, 2024
AminTorabi-NOAA
force-pushed
the
masking_output
branch
from
3fe9c46 to
58a55cf
Compare
shorvath-noaa
requested changes
Jul 24, 2024
|
|
||
| def crosswalk_nex_flowpath_poi(self, flowpaths, nexus): | ||
|
|
||
| mask_flowpaths = flowpaths['toid'].str.startswith('nex-') |
There was a problem hiding this comment.
Can you add toids that start with tnex- as well? We should capture these terminal nexus points as well.
| @@ -414,7 +416,15 @@ def preprocess_network(self, flowpaths, nexus): | |||
| # Location information will be used to advertise tailwater locations of diffusive domains | |||
| # to the model engine/coastal models | |||
| self._nexus_latlon = nexus | |||
|
|
|||
There was a problem hiding this comment.
Can you add this space back? Just for aesthetics.
| if 'poi_id' in nexus.columns: | ||
| self._poi_nex_dict = nexus.groupby('poi_id')['id'].apply(list).to_dict() | ||
| else: | ||
| self._poi_nex_dict = None |
There was a problem hiding this comment.
Can you add a space between functions. Just for aesthetics.
src/troute-network/troute/nhd_io.py
Outdated
Comment on lines
2196
to
2215
| if nex_id: | ||
| for nex_key, nex_val in nex_id.items(): | ||
| new_index = pd.MultiIndex.from_tuples([(nex_key, 'nex')], names=['featureID', 'Type']) | ||
| flowveldepth_nex = flowveldepth[create_mask(nex_val)] | ||
|
|
||
| if not flowveldepth_nex.empty: | ||
| if len(flowveldepth_nex.index) > 1: | ||
| summed_data = flowveldepth_nex.sum() | ||
| new_data = pd.DataFrame([summed_data], index=new_index) | ||
| new_data.loc[(nex_key, 'nex'), filtered_v_columns] = np.nan | ||
| new_data.loc[(nex_key, 'nex'), filtered_d_columns] = flowveldepth_nex[filtered_d_columns].mean() | ||
| else: | ||
| new_data = flowveldepth_nex.copy() | ||
| new_data.index = new_index | ||
|
|
||
| nex_data_list.append(new_data) | ||
|
|
||
| all_nex_data = pd.concat(nex_data_list) if nex_data_list else pd.DataFrame() | ||
| else: | ||
| all_nex_data = pd.DataFrame() |
There was a problem hiding this comment.
This chunk seems quite slow if 9999 is included. I wonder if this could be sped up by adding a column to flowveldepth that is the toid for each wb- featureID. These would obviously be nex- IDs, then you could just group by the toid column and sum? Something like that.
shorvath-noaa
approved these changes
Jul 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR user can define some specific nexus points or flowpaths and based on that results will be filtered. It creates a crosswalk between nexus points and flowpaths and if there are more than one flowpaths going to a nexus points it add up the flowrate and average the waterdepth.
reading POI capability will be added soon (waiting for final version of gpkg)
Additions
Removals
Changes
Testing
Screenshots
Notes
Todos
Checklist
Testing checklist
Target Environment support
Accessibility
Other