Skip to content

Commit

Permalink
fix merge bug (#908)
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiasdusch committed Nov 20, 2019
1 parent 6fd948b commit 1dc07f5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion oggm/core/flowline.py
Original file line number Diff line number Diff line change
Expand Up @@ -2163,7 +2163,7 @@ def clean_merged_flowlines(gdir, buffer=None):
for atr, value in fl1.__dict__.items():
if atr in ['_ptrap', '_prec']:
# those are indices, remove those above nx
fl1.__setattr__(atr, value[value <= fl1.nx])
fl1.__setattr__(atr, value[value < fl1.nx])
elif isinstance(value, np.ndarray) and (len(value) > fl1.nx):
# those are actual parameters on the grid
fl1.__setattr__(atr, value[:fl1.nx])
Expand Down

0 comments on commit 1dc07f5

Please sign in to comment.