Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
c5b2a1c
Add process_groups function
ptomasula Feb 19, 2021
152d7ed
Merge branch 'develop' into develop_readWDM
aufdenkampe Feb 22, 2021
90e7ff7
Adding rpo772.wdm
ptomasula Feb 22, 2021
bad3771
Numpy Array chunk allocation approach
ptomasula Feb 22, 2021
129a228
End of block on 511th element of record
ptomasula Feb 22, 2021
762b90c
Add WDM Programmers Guide
aufdenkampe Feb 22, 2021
b6fbef4
Adding rpo772.wdm debugging files
aufdenkampe Feb 22, 2021
0f5a2d1
alternative implementation of process_group:
htaolimno Mar 1, 2021
b600ebf
remove deprecated functions
ptomasula Mar 2, 2021
2561869
renaming internal functions
ptomasula Mar 2, 2021
2e205f1
tidy up readWDM
ptomasula Mar 3, 2021
8b701e9
Searchable WDMProgrammersGuide+Search+Nav.pdf with sidebar navigation
aufdenkampe Mar 4, 2021
ef2d8df
Upload HSPF v12.2 manual with added sidebar navigation
aufdenkampe Mar 5, 2021
0cfd7c2
Merge pull request #32 from LimnoTech/develop
bcous Mar 5, 2021
e5d64a1
Numba support
ptomasula Mar 5, 2021
677adaa
Merge branch 'develop_readWDM' of https://github.com/LimnoTech/HSPsqu…
ptomasula Mar 5, 2021
1a62f38
Explicit Int64 assignment for datetime
ptomasula Mar 9, 2021
1b52a17
numba compatible datetime converter
ptomasula Mar 9, 2021
9b19a92
Remove old datetime conversion
ptomasula Mar 12, 2021
2a8373e
Test10 no longer runs since readWDM time series updates
aufdenkampe Mar 30, 2021
2014cd0
Datetime shift fix
ptomasula Mar 30, 2021
b0edc39
Remove sparse timeseries fill
ptomasula Mar 31, 2021
a094cfe
Merge branch 'develop' into develop_readWDM
aufdenkampe Mar 31, 2021
0f1f7bc
Merge branch 'develop' into develop_readWDM
aufdenkampe Mar 31, 2021
c52eaad
TimeSeries dtypes change in readWDM
aufdenkampe Apr 8, 2021
2d09713
Update HDF5_compare notebook
aufdenkampe Apr 8, 2021
ca50dd0
Merge branch 'develop' into develop_readWDM
aufdenkampe Apr 9, 2021
543ea20
Stop datetime fix
ptomasula Apr 12, 2021
ae374f1
Adding missing lines to stop datetime fix
ptomasula Apr 12, 2021
0d910ed
Merge branch 'develop' into develop_readWDM
aufdenkampe Apr 14, 2021
6e6beab
Testing outputs. Fix worked!
aufdenkampe Apr 14, 2021
479e6d6
Sparse time series fill added back
aufdenkampe Apr 23, 2021
b9e635f
timeseries freq assignment
ptomasula Apr 23, 2021
1c450ae
Update conda env & notebooks
aufdenkampe Apr 23, 2021
ee429de
block control word indexing fix
ptomasula Apr 26, 2021
e7d8ca2
Merge pull request #36 from respec/develop, with Unit Testing
aufdenkampe Apr 28, 2021
4b55545
Update .gitignore for merge
aufdenkampe Apr 28, 2021
146036c
Error handling for irregular timeseries
ptomasula Apr 28, 2021
c62adb6
renaming private function
ptomasula Apr 28, 2021
5039cf2
Merge branch 'develop' into develop_readWDM2
ptomasula Apr 28, 2021
e651d08
rename bits_to_date
ptomasula Apr 28, 2021
4f4f15a
remove unnecessary dependencies
ptomasula Apr 28, 2021
12dc1d5
deprecation notices
ptomasula Apr 28, 2021
ba64128
Merge pull request #37 from LimnoTech/develop_readWDM2
ptomasula Apr 28, 2021
647ca7f
Update ReadMe to add `docs` + fixes
aufdenkampe Apr 29, 2021
9ceb13f
Add Visual Studio to .gitignore
aufdenkampe Apr 29, 2021
0902bc1
Update .gitignore
aufdenkampe Apr 29, 2021
518ec78
Delete VSWorkspaceState.json
aufdenkampe Apr 29, 2021
b3e9649
Update .gitignore
aufdenkampe Apr 29, 2021
7163599
Removing temporary test files
aufdenkampe Apr 30, 2021
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
20 changes: 15 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Editors & IDEs
.vscode/
.vscode
.vs
.idea

# Jupyter Notebook
.ipynb_checkpoints
Expand Down Expand Up @@ -34,11 +36,19 @@ __pycache__/*
htmlcov
.tox
.tox/*

stats.dat
.ropeproject
.idea
.coverage
.coverage/*
*.ech
*.log
*.hbnhead
*.units.dbf

# Translations
*.mo

# Stashes, etc.
stats.dat
.ropeproject
.hg
*.tmp*
tests/_LargeFileStash
2 changes: 1 addition & 1 deletion HSP2/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def transform(ts, name, how, siminfo):
if freq == tsfreq:
pass
elif tsfreq == None: # Sparse time base, frequency not defined
ts = ts.reindex(siminfo['tbase']).ffill().bfill()
ts = ts.reindex(siminfo['tbase']).ffill().bfill()
elif how == 'SAME':
ts = ts.resample(freq).ffill() # tsfreq >= freq assumed, or bad user choice
elif not how:
Expand Down
Loading