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

Webtool and Development merge #10

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

Webtool and Development merge #10

wants to merge 59 commits into from

Conversation

marvin-kluge
Copy link

No description provided.

ISHINJaR and others added 30 commits February 3, 2023 14:34
Results are typical days/weeks/etc. with their weights
More realistic clustering input, if EV/PV/STC does not exist
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"
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"
marvin-kluge and others added 17 commits March 18, 2024 10:04
# Conflicts:
#	classes/KPIs.py
#	classes/datahandler.py
#	classes/optimizer.py
#	classes/participants/aggregator.py
#	classes/participants/device.py
#	classes/participants/house.py
#	classes/profils.py
#	classes/solar.py
#	classes/users.py
#	data/design_building_data.json
#	data/scenarios/example.csv
#	data/site_data.json
#	examples/e2_generate_custom_district.py
#	examples/e8_scenario_evaluation.py
#	functions/opti_central.py
#	functions/wind_turbines.py
#	setup.py
# Conflicts:
#	classes/datahandler.py
@c0nb4
Copy link

c0nb4 commented May 14, 2024

Dear Joel and Carla,

just wanted to check in what the suggested time of merge will be? Thanks Felix

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants