Skip to content

Commit

Permalink
Merge pull request #153 from changliao1025/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
changliao1025 committed Jul 18, 2023
2 parents 1dc2e0d + 7ceef64 commit c96f637
Show file tree
Hide file tree
Showing 29 changed files with 1,145 additions and 898 deletions.
9 changes: 0 additions & 9 deletions data/susquehanna/input/mesh_boundary_buffer.geojson

This file was deleted.

288 changes: 0 additions & 288 deletions docs/source/conf_compare.py

This file was deleted.

2 changes: 2 additions & 0 deletions pyflowline/algorithms/merge/merge_flowline.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
from pyflowline.algorithms.cython.kernel import find_vertex_in_list
else:
from pyflowline.algorithms.auxiliary.find_vertex_in_list import find_vertex_in_list

lID = 0

def merge_flowline(aFlowline_in, aVertex_in, \
pVertex_outlet_in, \
aIndex_headwater_in,\
Expand Down
Loading

0 comments on commit c96f637

Please sign in to comment.