Skip to content
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.

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

Add VDI profiles based on lpagg #50

Draft
wants to merge 148 commits into
base: v0.2dev
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
477c92e
Add lpagg code to demanlib
uvchik Apr 6, 2022
4c63562
Add example for VDI profiles
uvchik Apr 11, 2022
73480cd
Fix grammar
uvchik Apr 11, 2022
6109b41
Add extra requirements for examples
uvchik Apr 11, 2022
d512612
Use black style
uvchik Apr 11, 2022
ea24008
Revise region module
uvchik Apr 11, 2022
7b258b8
Make it possible to import Region from demandlib.vdi
uvchik Apr 11, 2022
ab21b5b
Add function to find TRY region by coordinates
uvchik Apr 11, 2022
33a5964
Add geometry as extra requirements
uvchik Apr 11, 2022
4160146
Add docstrings
uvchik Apr 11, 2022
a3660ae
Remove binary file from repository
uvchik Apr 12, 2022
3785bc9
Do not read unused columns
uvchik Apr 12, 2022
b11468e
Fix style issues
uvchik Apr 12, 2022
4eeed80
Fix style issues
uvchik Apr 12, 2022
ac2eb6c
Use new black style
uvchik Apr 12, 2022
d9e0d8d
Use temperature limits from config file
uvchik Apr 13, 2022
31640f7
Add missing config import
uvchik Apr 13, 2022
00e1114
Fix time stamp to left index
uvchik Apr 13, 2022
2e205c9
Fix filepath for TRY data
uvchik Apr 13, 2022
f5a6e78
Remove blank line
uvchik Apr 13, 2022
5d75001
Make VDI header clearer
uvchik May 6, 2022
e720e39
Added label to the parameters of the used pandas functions to prevent…
GregorBecker Jun 5, 2022
7cccf52
Temperature limit is part of the house data
uvchik Jun 21, 2022
7a2856a
Remove more deprecations found.
GregorBecker Jul 9, 2022
9be72f0
Merge pull request #51 from GregorBecker/dev
uvchik Jul 12, 2022
a54ca63
Update src/demandlib/vdi/regions.py
uvchik Jul 12, 2022
652ef05
Fix deprecated warning
Sep 6, 2022
b3fd0c4
Make it possible to fetch weather data by knowing the TRY region
Sep 6, 2022
da5cebe
Release v0.1.9
p-snft Mar 28, 2023
c1f951f
Set version to v0.1.10
p-snft Mar 29, 2023
ea48365
Adhere to Black style
p-snft Mar 29, 2023
889b6e9
Remove Appveyor
p-snft Mar 29, 2023
b1be228
Add long_description_content_type
p-snft Mar 29, 2023
4e3fafa
Add changes to changelog
p-snft Mar 29, 2023
f44f449
Merge pull request #52 from oemof/revision/remove_appveyor
p-snft Mar 29, 2023
6206dfd
Fix/ remove broken links
p-snft Mar 29, 2023
b2e5e5b
Remove broken links
p-snft Mar 29, 2023
59d5f91
Do not check link that blocks GitHub
p-snft Jun 26, 2023
5cb5784
Move linkcheck_ignore to correct place
p-snft Jun 26, 2023
26b910b
Update heat_building.py
ddceruti Oct 25, 2023
56c9814
Update heat_building.py
ddceruti Oct 25, 2023
b13fadf
Update heat_building.py
ddceruti Oct 25, 2023
1e87642
update with new error message
Oct 26, 2023
bb39a03
amend previous changes, update AUTHORS and CHANGELOG
Oct 26, 2023
8db53ec
Update src/demandlib/bdew/heat_building.py
ddceruti Apr 15, 2024
864824d
Update src/demandlib/bdew/heat_building.py
ddceruti Apr 15, 2024
1ebdc92
Fix FutureWarnings
maurerle Apr 15, 2024
a8e869f
Simplify error message
ddceruti Apr 24, 2024
00452ca
Merge pull request #55 from ddceruti/dev
p-snft Jun 25, 2024
343f938
update type casts to use int for hour and minute
maurerle Jun 25, 2024
898a10d
Merge branch 'fix_future_warnings' of github.com:maurerle/demandlib i…
p-snft Jun 26, 2024
b79f69a
Adhere to Black
p-snft Jun 26, 2024
3d69d16
Merge branch 'maurerle-fix_future_warnings' into dev
p-snft Jun 26, 2024
a70a7b8
Merge MANIFEST.in into pyproject.toml
p-snft Jun 26, 2024
dda0d31
update github runner actions
maurerle Jun 26, 2024
42170de
add maurerle to authors
maurerle Jun 26, 2024
2c72ea7
update python envs to supported versions
maurerle Jun 26, 2024
5ab1d38
Update Python version support info
p-snft Jun 26, 2024
94dd6b4
Merge pull request #61 from maurerle/update_actions
p-snft Jun 27, 2024
7faa3cb
Merge branch 'dev' into revision/update_build_system
p-snft Jun 27, 2024
2485da2
Remove a lot of old junk
fwitte Jun 27, 2024
ab75918
Add features into pyproject.toml
fwitte Jun 27, 2024
28e947c
Tidy up tox.ini and fix the dependecies
fwitte Jun 27, 2024
e9aaa1a
Try to fix the gh-action configration to work with extra requirements
fwitte Jun 27, 2024
3c6c3ec
Remove unnecessary step in pytest
fwitte Jun 27, 2024
0d2f2c6
Add tox dependency for gh actions checks and pytest
fwitte Jun 27, 2024
4c8796c
Adhere to Black
p-snft Jun 27, 2024
20fc94d
Move matplotlib to test dependencies
fwitte Jun 27, 2024
5006df1
Ignore venv
p-snft Jun 27, 2024
0ea6652
Merge branch 'dev' into revision/update_build_system
fwitte Jun 27, 2024
f1177a9
Adhere to Black
p-snft Jun 27, 2024
3bd2bf7
Merge branch 'dev' into revision/update_build_system
fwitte Jun 27, 2024
3b69550
Try to install things more better
fwitte Jun 27, 2024
83bc21f
Shorten line
p-snft Jun 27, 2024
a92ec81
Fix dependency installation between gh actions and tox
fwitte Jun 27, 2024
7d3dae0
Fix typo and rename job
fwitte Jun 27, 2024
d495ee0
Reformat AUTHORS.rst
p-snft Jun 27, 2024
e137c83
Final clean up for today?
fwitte Jun 27, 2024
d587cfd
No
fwitte Jun 27, 2024
816e11a
Delete report tox env
p-snft Jun 27, 2024
760d0ec
Merge pull request #62 from oemof/revision/update_build_system
p-snft Jun 27, 2024
f030f15
Add Francesco to autor list
p-snft Jun 27, 2024
05201e1
Add build to readthedocs.yml
p-snft Jun 27, 2024
5e2d578
Show latest pytest badge in README.rst
p-snft Jun 27, 2024
c4ecf4b
Remove utf-8 characters from docstring
p-snft Jun 27, 2024
38a6117
Update copyriht year in docs config
p-snft Jun 27, 2024
157847a
Remove hardcoded version from doc config
p-snft Jun 27, 2024
2500bf7
Improve compatibility with Pandas 3.0
p-snft Jun 27, 2024
e33d648
Require Pandas 2.0+
p-snft Jun 27, 2024
7f9d042
Release v0.2.0
p-snft Jun 27, 2024
604090a
Update CHANGELOG.rst
p-snft Jun 27, 2024
9c4ea83
Update commits since in README.rst
p-snft Jun 27, 2024
4343838
i am not particular happy with this solution, but it includes not hav…
maurerle Jul 17, 2024
cacedb8
simplify mask usage
maurerle Jul 17, 2024
149dafd
Merge branch 'dev' of https://github.com/oemof/demandlib into feature…
uvchik Jul 30, 2024
b6d1558
Adhere to Black
p-snft Jul 31, 2024
4b6b268
Merge branch 'maurerle-fix_between_time' into dev
p-snft Jul 31, 2024
ab83b52
Adhere to Black
p-snft Jul 31, 2024
f9ecc91
Minor changes in electricity_demand_example
birgits Aug 1, 2024
fa4b868
Add information on industrial step load profile and how to use it to …
birgits Aug 1, 2024
388776f
Make it possible to define different scaling factors for holidays
birgits Aug 1, 2024
103bf6e
Add check for consistency of profile_factors dictionary
birgits Aug 1, 2024
77e2b97
Adhere to maximum line length
birgits Aug 1, 2024
ee3c235
Elaborate docstrings and comments
birgits Aug 1, 2024
a9eeb2f
Use day_mask to define night time hours to avoid that some hours appe…
birgits Aug 1, 2024
30df01e
Add tests for industrial step load profile
birgits Aug 1, 2024
2d3cba3
Fix line length
birgits Aug 1, 2024
2f904ce
PEP8
birgits Aug 1, 2024
592c13a
Fix failing example due to new necessary profile factors for holidays
birgits Aug 2, 2024
ed68214
Fix tox issues
birgits Aug 2, 2024
5fb7d15
Add check for total demand
birgits Aug 2, 2024
8894298
Black
birgits Aug 2, 2024
516595d
Separate tests into different functions
birgits Aug 2, 2024
1ad043e
Remove unused variable
birgits Aug 2, 2024
2c3bd2a
Adhere to current pandas API
p-snft Aug 2, 2024
34f004a
Remove comment
birgits Aug 5, 2024
f464daf
Add further explanation on what is tested
birgits Aug 5, 2024
809535a
Merge branch 'feature/holidays_in_industrial_profile' of github.com:o…
birgits Aug 5, 2024
6c47a03
Delete NaN check as NaN values are hardly possible
birgits Aug 5, 2024
c3211fa
Remove now unnecessary import of logging
birgits Aug 5, 2024
82ecd09
Merge pull request #68 from oemof/feature/holidays_in_industrial_profile
p-snft Aug 6, 2024
a9a7b44
Release v0.2.1
p-snft Aug 6, 2024
9b28071
Develop towards 0.2.2
p-snft Aug 6, 2024
a68d124
Allow retrieving only warm water profile
jnettels Feb 3, 2025
2cd4c50
Fix 'incompatible dtype' FutureWarning in pandas 2.2.1
jnettels Feb 3, 2025
4649681
Fix code style in elec_slp.py
jnettels Feb 3, 2025
1d12c19
Fix code style in tools.py
jnettels Feb 3, 2025
5871813
Include test for new attribute ww_only
jnettels Feb 4, 2025
61a222c
Fix code style issues
jnettels Feb 4, 2025
b4f7e53
Fix code style issues
jnettels Feb 4, 2025
d85bdcf
Merge pull request #72 from oemof/fix/pandas_future_warning
p-snft Feb 14, 2025
4672b19
Merge branch 'dev' into features/ww_only_from_bdew
jnettels Feb 19, 2025
bbc3a0b
Convert ww_only test class to function
jnettels Feb 19, 2025
afe1729
Merge pull request #74 from oemof/features/ww_only_from_bdew
p-snft Feb 24, 2025
3f29495
Fix small issues
uvchik Feb 25, 2025
0216661
Merge branch 'dev' of https://github.com/oemof/demandlib into feature…
uvchik Feb 25, 2025
15262e8
Add manifest
uvchik Feb 25, 2025
98206f6
Fix manifest
uvchik Feb 25, 2025
bb6aff4
Fix manifest
uvchik Feb 25, 2025
68cae41
Fix pytest warnings
uvchik Feb 25, 2025
f9dacec
Fix black issues
uvchik Feb 25, 2025
118381f
Fix manifest
uvchik Feb 25, 2025
ec1fb2a
Remove Python 3.9 and add 3.12 for tests
uvchik Feb 25, 2025
166a4af
Fix github actions
uvchik Feb 25, 2025
2288c1f
Extract weather from class
uvchik Feb 26, 2025
aba3ef8
Add config tests
uvchik Feb 26, 2025
6ba1252
Automatically get weather data if no data is given
uvchik Feb 26, 2025
6a3e41a
Fix black issues
uvchik Feb 27, 2025
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
Next Next commit
Add lpagg code to demanlib
uvchik committed Apr 6, 2022
commit 477c92e6a93d51ebf3c89c70ca93b29e37f38f9a
Empty file added src/demandlib/vdi/__init__.py
Empty file.
52 changes: 52 additions & 0 deletions src/demandlib/vdi/dwd_try.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import pandas as pd

def read_DWD_weather_file(weather_file_path):
"""Read and interpolate "DWD Testreferenzjahr" files."""
# The comments in DWD files before the header are not commented out.
# Thus we have to search for the line with the header information:
header_row = None
with open(weather_file_path, 'r') as rows:
for number, row in enumerate(rows, 1):
# The header is the row before the appearance of '***'
if '***' in row:
header_row = number - 1
break

# Plausibility check:
if header_row is None:
logger.error('Error: Header row not found in weather file. '
'Is the data type "DWD" correct? Exiting...')
logger.error('File is: ' + weather_file_path)
exit()

# Read the file and store it in a DataFrame
weather_data = pd.read_csv(
weather_file_path,
delim_whitespace=True,
skiprows=header_row-1,
index_col=['MM', 'DD', 'HH'],
usecols=['MM', 'DD', 'HH', 'B', 'D', 't', 'WG', 'RF', 'WR', 'N', 'p'],
comment='*',
)

# Rename the columns to the TRNSYS standard:
weather_data.rename(columns={'B': 'IBEAM_H',
'D': 'IDIFF_H',
't': 'TAMB',
'WG': 'WSPEED',
'RF': 'RHUM',
'WR': 'WDIR',
'N': 'CCOVER',
'p': 'PAMB'},
inplace=True)

# Add an 'HOUR' column:
weather_data['HOUR'] = range(1, 8761)

# Make sure all columns are in the correct order
# weather_data = weather_data.reindex(columns=['HOUR', 'IBEAM_H', 'IDIFF_H',
# 'TAMB', 'WSPEED', 'RHUM',
# 'WDIR', 'CCOVER', 'PAMB'])

# print weather_data
return weather_data
Loading