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.

Sign up for GitHub

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

Jump to bottom

34 Merge EBC Main into Main #36

Merged
merged 65 commits into from
Jan 20, 2025
Merged

34 Merge EBC Main into Main #36

merged 65 commits into from
Jan 20, 2025

Conversation

c0nb4
Copy link
Owner

@c0nb4 c0nb4 commented Jan 20, 2025

  • Reverted the rebase
  • Merge Main into forked main

ISHINJaR and others added 30 commits February 3, 2023 14:34
@ISHINJaR
Enhanced docstrings and more readable code
44bbeb6
@ISHINJaR
Design of energy technical devices
7464776
@ISHINJaR
Some docstring improvements
358fc01
@ISHINJaR
Clustering
502b5e4 
Results are typical days/weeks/etc. with their weights
@ISHINJaR
Improved clustering
bc64389 
More realistic clustering input, if EV/PV/STC does not exist
@ISHINJaR
Optimization
c85dd6f 
dockstings; datahandler.py: function to optimize clusters; house.py: deleted not used variables, STC was not part of optimization, correction of storage balance, minimal EH for DHW, SoC für timesteps+1, heat exchanger for source of HP, higher readability by import of profiles in function "initializeParameters"
@ISHINJaR
Central energy unit for district
246dc83 
heat exchanger at HP source; bug fix storage balances; improved clustering inputs; write debug file; integrated central renewable generation to plots; aggregator.py: factor 1000 for costs; added directory "results/renewableGeneration"
@ISHINJaR
KPIs
90d03fc
@ISHINJaR
Integration of EHDO into the districtgenerator
31b4fd3
update params EHDO
bdda50c
update optimizer
9afc621
update optimizer
5b8828e
Change DHW calculation and use precalculated profiles
d772627 
Use DHWcalc/ OpenDHW
Add Ratio of total gross floor area to net floor area
598853b
Add ratio of total gross floor area to net floor area
b7a4fac
update opti
fad3e22
update opti
148cb51
Merge branch 'develop' of github.com:RWTH-EBC/districtgenerator into …
2d20ced 
…develop
Add location from zip code and prediciton of run time
72ea701
Add possibility to use old TRY weather data
7240ad7
Update zip code to weather file
dddd332
Change weather data to examples of 10 cities
2f828e3
better functionality
46d210c
merge opti_central
1c1f5ee
merge specific files from webtool to develop
37ffdea
update EHDO
ee038ac
update EHDO COP
91805ce
update opti ev
a019a71
EHDO interface
4225400
update webtool
8008bc6
Joel Schölzel and others added 26 commits October 10, 2024 21:55
new examples
7ec6635
update examples
0f98184
add functional test
cdd28cf
delete wrong example
3ffe76b
add gitlab-ci.yml
bd31cc4
add requirements
b2d0852
new structure img
77a6e93
bugfix
e42844f
extend opti_central with energy hub
9b550ee
update
791ed76
update clustering with energy hub
472906a
update 2 clustering with energy hub
9a50236
@RawadHamze
Change in the method for determining the number of residents in resid…
dca29cc 
…ential buildings (#23)
@RawadHamze
#24 Correcting the 5R1C Method and the norm heat load calculation (#25)
fff1a09
@RawadHamze
#26 Changing the number of flats in MFH (#27)
1d5143c
@RawadHamze
#28 Accounting for seasonal fluctuations to reflect changes in the de…
104f59f 
…sired domestic hot water temperature and the cold water temperature throughout the year. (#29)
@RawadHamze
#30 Improve Residential Electricity Consumption with a Probabilistic …
088017e 
…Approach. (#31)

Correcting text, adding comments and sources, and fixing bugs.
@RawadHamze
Add files via upload
5112796 
Correct the names of the weather stations
@RawadHamze
Correct the names of the weather stations
a1d174e
delete EHDO folder
086ab94
Merge branch 'develop' to 'master'
e64b681
bugfixes
0afc679
@c0nb4
Add: Function to export building model
2a964c7
@c0nb4
Merge remote-tracking branch 'RWTH-EBC/master' into 34-revert-rebase
20e81cc
@c0nb4
FIX: EBC tests running again
607d041
@c0nb4
Fix: Tests are working again
1cf3a55
@c0nb4 c0nb4 linked an issue Jan 20, 2025 that may be closed by this pull request
Revert Rebase #34
Closed
@c0nb4 c0nb4 merged commit a517766 into master Jan 20, 2025
1 check passed
@c0nb4 c0nb4 mentioned this pull request Jan 20, 2025
Closed
@c0nb4 c0nb4 deleted the 34-revert-rebase branch January 28, 2025 10:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Revert Rebase
3 participants
@c0nb4 @ISHINJaR @RawadHamze