Skip to content

Commit 71a88bb

Browse files
Merge pull request #52 from LimnoTech/develop
Merge LimnoTech readWDM & other updates to RESPEC develop
2 parents 6b04078 + 7163599 commit 71a88bb

19 files changed

+596061
-43125
lines changed

.gitignore

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Editors & IDEs
2-
.vscode/
2+
.vscode
3+
.vs
4+
.idea
35

46
# Jupyter Notebook
57
.ipynb_checkpoints
@@ -34,11 +36,19 @@ __pycache__/*
3436
htmlcov
3537
.tox
3638
.tox/*
37-
38-
stats.dat
39-
.ropeproject
40-
.idea
39+
.coverage
40+
.coverage/*
4141
*.ech
4242
*.log
4343
*.hbnhead
4444
*.units.dbf
45+
46+
# Translations
47+
*.mo
48+
49+
# Stashes, etc.
50+
stats.dat
51+
.ropeproject
52+
.hg
53+
*.tmp*
54+
tests/_LargeFileStash

HSP2/utilities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def transform(ts, name, how, siminfo):
7777
if freq == tsfreq:
7878
pass
7979
elif tsfreq == None: # Sparse time base, frequency not defined
80-
ts = ts.reindex(siminfo['tbase']).ffill().bfill()
80+
ts = ts.reindex(siminfo['tbase']).ffill().bfill()
8181
elif how == 'SAME':
8282
ts = ts.resample(freq).ffill() # tsfreq >= freq assumed, or bad user choice
8383
elif not how:

0 commit comments

Comments
 (0)