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

fix unresolved merge conflict in config.default.yaml

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

3
config/config.default.yaml
View File

@ -266,15 +266,12 @@ lines:
s_nom_max: .inf
length_factor: 1.25
under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity
<<<<<<< HEAD
dynamic_line_rating:
activate: false
# factor compensate overestimation of the wind speed in hourly averaged wind data
correction_factor: 0.95
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
=======
>>>>>>> master
links:
p_max_pu: 1.0