Skip to content

Changes sorting in write_kfac_file and fixes documentation typo #4

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

Open
AWSisco wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Changes sorting in write_kfac_file and fixes documentation typo #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
648ae79
Changes sorting in write_kfac_file and fixes documentation typo
AWSisco Sep 15, 2023
729f642
Remove hard coded COMID reference in write_kfac_file
AWSisco Sep 27, 2023
4ca1d07
Adds line break arguments when writing connectivity file
AWSisco Nov 1, 2024
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
22 changes: 10 additions & 12 deletions rapid_utils/rapid_input_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from csv import writer as csv_writer
import numpy as np
import geopandas as gpd

import os

def write_connectivity_file(flowline_file,
flowline_id_field_name,
Expand Down Expand Up @@ -55,8 +55,8 @@ def write_connectivity_file(flowline_file,
np.array([flowline_id, downstream_id,
count_upstream]), list_upstream_id]).astype(int))

with open(out_csv_file, 'w', encoding='utf-8') as csv_file:
connectivity_writer = csv_writer(csv_file)
with open(out_csv_file, 'w', encoding='utf-8', newline='') as csv_file:
connectivity_writer = csv_writer(csv_file, lineterminator=os.linesep)
for row_list in list_write:
out = np.concatenate([row_list, np.repeat(0, max_count_upstream -
row_list[2])])
Expand Down Expand Up @@ -101,7 +101,7 @@ def write_kfac_file(flowline_file,

"""
Write a Muskingum kfac file containing first guesses (in seconds) of the
Muskingum k parameter. Three formula types are available, corresponing to
Muskingum k parameter. Three formula types are available, corresponding to
equations (5)–(7) in Tavakoly et al. 2017
(https://doi.org/10.1111/1752-1688.12456).

Expand Down Expand Up @@ -147,17 +147,15 @@ def write_kfac_file(flowline_file,
usecols=0, dtype=int)

# The kfac file must be ordered the same as the connectivity file
# Rewrite the length and slope arrays to ensure this requirement is met
# Reorder flowline_gdf to match the order of connect_rivid_array
flowline_gdf = flowline_gdf.set_index(flowline_id_field_name) \
.reindex(connect_rivid_array).reset_index()

# Read the length and slope arrays that are ordered as in the connectivity
# file
length_array = flowline_gdf[length_field_name].values
slope_array = flowline_gdf[slope_field_name].values

sort_idx = []
for connect_rivid in connect_rivid_array:
sort_idx.append(flowline_id_list.index(connect_rivid))

length_array = length_array[sort_idx]
slope_array = slope_array[sort_idx]

if input_length_units == 'km':
length_array *= 1000.
if input_slope_percent:
Expand Down