bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

resolve remaining merge conflicts

Browse Source
This commit is contained in:
Fabian Neumann 2023-06-02 17:12:05 +02:00
commit ff6f3a1b7e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.default.yaml
View File

@ -266,12 +266,15 @@ lines:
s_nom_max: .inf s_nom_max: .inf
length_factor: 1.25 length_factor: 1.25
under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity
<<<<<<< HEAD
dynamic_line_rating: dynamic_line_rating:
activate: false activate: false
# factor compensate overestimation of the wind speed in hourly averaged wind data # factor compensate overestimation of the wind speed in hourly averaged wind data
correction_factor: 0.95 correction_factor: 0.95
max_voltage_difference: 45 # in deg or `false` to disable max_voltage_difference: 45 # in deg or `false` to disable
max_line_rating: false # over capacity relative to nominal capacity e.g. 1.3 or `false`to disable max_line_rating: false # over capacity relative to nominal capacity e.g. 1.3 or `false`to disable
=======
>>>>>>> master
links: links:
p_max_pu: 1.0 p_max_pu: 1.0

2
scripts/add_electricity.py
View File

@ -859,8 +859,6 @@ if __name__ == "__main__":
attach_OPSD_renewables(n, tech_map) attach_OPSD_renewables(n, tech_map)
estimate_renewable_capacities(n, snakemake.config) estimate_renewable_capacities(n, snakemake.config)
estimate_renewable_capacities(n, snakemake.config)
update_p_nom_max(n) update_p_nom_max(n)
line_rating_config = snakemake.config["lines"]["dynamic_line_rating"] line_rating_config = snakemake.config["lines"]["dynamic_line_rating"]