Skip to content

Feature/#814 modeling on interest area #815

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
Draft
wants to merge 125 commits into
base: features/#800-clustering-with-focus
Choose a base branch
from
Draft

Feature/#814 modeling on interest area #815

wants to merge 125 commits into from

Conversation

@NormanZielke
Copy link

closes #814

CarlosEpia and others added 30 commits August 7, 2023 15:29
@CarlosEpia
include exclusion area
6e2a0d5
@CarlosEpia
add plot_carrier to the etrago methods
670ff5e
@CarlosEpia
include engine and session to loaded etrago obj
4dac3b1
@CarlosEpia
include function find_buses_area for clustering
761b503
@CarlosEpia
merge dev
c4c09c5
@CarlosEpia
Simplify adjust_no_electric_network by not creating new buses
ea86aa0
@CarlosEpia
receive also shapefiles to not clustered area
030f8ec
@CarlosEpia
Document exclusion_area
0d78999
@CarlosEpia
apply Black
adccc1f
@CarlosEpia
use isort
75cbf94
@CarlosEpia
merge dev
8ad8894
@CarlosEpia
Black and delete comments
bf2ca6c
@ClaraBuettner
Allow importing extnesion scenario, e.g. for lines from NEP
c2436da
@ClaraBuettner
Update documentation for scenario_extension
92d6480
@CarlosEpia
merge dev
ec5b7f2
@CarlosEpia
using flake8
da2ee15
@CarlosEpia
adapt select_elec_network
eee7911
@CarlosEpia
include weighting for area
b817a10
@CarlosEpia
perform clustering area of interest
80303b7
@CarlosEpia
gas adaptation to cluster interest area
9703ed0
@CarlosEpia
using isort
b543366
@CarlosEpia
fix incorrect name
c267178
@CarlosEpia
include area of interest in kmeans clustering
33fa5e9
@CarlosEpia
include cluster_exclusion_area in args
4acd371
@CarlosEpia
create function include_busmap_area
06e3476
@CarlosEpia
Merge branch 'features/extendable_lines_from_nep' into hybit
e6beaa6
@CarlosEpia
Merge branch 'dev' into hybit
ef4db3e
@CarlosEpia
hot fix DLR
6d99955
@CarlosEpia
avoid error when no generators
033df50
@CarlosEpia
include busmap_area in general busmap
3142f15
NormanZielke added 17 commits July 8, 2025 18:10
@NormanZielke
Add function to adjust global capital_cost for optimized components
1974d9c
@NormanZielke
Remove add_chp_constraints_linopy to original version
b0c7409
@NormanZielke
Add replace_gas_links_with_extendable()
2878e0c
@NormanZielke
Adapt effiency of interest biogas CHP
9f6c942
@NormanZielke
Add new contraints for CHP - dispatch in a fixed ratio
36871d0
@NormanZielke
Fix Settings for Base_scenario
3645df4
@NormanZielke
Add new sensitivity-function for rural_heat_pump in sensitivity_runne…
d804c8a 
…r.py
@NormanZielke
Fix Bugs
9b76023
@NormanZielke
Add new sensitivity-function for central_heat_store in sensitivity_ru…
03b5bbb 
…nner.py
@NormanZielke
Adapt capital_cost of interest CHP-plants
9f4e7bf
@NormanZielke
Adapt capital_cost of interest CHP-plants
0c89732
@NormanZielke
Set max Solarpotential for interest area
b2e3c7d
@NormanZielke
Add method run_modified_base_model_with_biomass_and_solar in sensitiv…
f350d48 
…ity_runner.py for new scenario
@NormanZielke
Add method run_battery_cost_sensitivity in sensitivity_runner.py to c…
2bb5930 
…hange capital_cost parameter for batteries
@NormanZielke
Removes functions "add_gas_CHP_fixed" and "add_gas_CHP_extendable" wh…
0fa3dd6 
…ich are unnecessary
@NormanZielke
Updates docstrings for new functions in utilities.py and sensitivitie…
1dfba2d 
…s in sensitivity_runner.py to adapt network on municipality level
@NormanZielke
Removes constraint "_add_resistive_heater_vollaststunden_constraint_l…
1d954ce 
…inopy" because it's not needed anymore and remove "update_capital_cost_of_solar_ingolstadt" in utitilities.py
@NormanZielke NormanZielke requested review from CarlosEpia, ClaraBuettner and mohsenmansouri and removed request for ClaraBuettner October 8, 2025 21:52
@CarlosEpia
Copy link
Contributor

Hi Norman,
It was decided that the hybit branch will not be merged into dev. Other branches, partialy based on the hybit one, replaced it and are suppose to be merged in the future. For example #800

@NormanZielke NormanZielke force-pushed the feature/modeling_on_interest_area branch from d5d4fd5 to 1d954ce Compare October 14, 2025 11:07
@NormanZielke NormanZielke force-pushed the feature/modeling_on_interest_area branch from b09b09b to ee7823a Compare October 14, 2025 11:14
@NormanZielke
Merge remote-tracking branch 'origin/features/#800-clustering-with-fo…
1c931d4 
…cus' into feature/modeling_on_interest_area

# Conflicts:
#	etrago/appl.py
#	etrago/args.json
#	etrago/cluster/electrical.py
#	etrago/cluster/gas.py
#	etrago/cluster/spatial.py
#	etrago/network.py
#	etrago/tools/utilities.py
@NormanZielke NormanZielke changed the base branch from hybit to features/#800-clustering-with-focus October 14, 2025 12:43
@NormanZielke NormanZielke marked this pull request as draft October 20, 2025 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mohsenmansouri mohsenmansouri Awaiting requested review from mohsenmansouri

@CarlosEpia CarlosEpia Awaiting requested review from CarlosEpia

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@NormanZielke @CarlosEpia @ClaraBuettner @birgits