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

no machinery electric share, fix add to madd

Browse Source
This commit is contained in:
Fabian Neumann 2021-08-18 16:17:59 +02:00
parent a9196f001b
commit 13251d33cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.default.yaml
View File

@ -175,7 +175,7 @@ sector:
2050: 0.85 2050: 0.85
transport_fuel_cell_efficiency: 0.5 transport_fuel_cell_efficiency: 0.5
transport_internal_combustion_efficiency: 0.3 transport_internal_combustion_efficiency: 0.3
agriculture_machinery_electric_share: 0.12 # approximately as today agriculture_machinery_electric_share: 0
agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
agriculture_machinery_electric_efficiency: 0.3 # electricity per use agriculture_machinery_electric_efficiency: 0.3 # electricity per use
shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011 shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011

2
scripts/prepare_sector_network.py
View File

@ -1992,7 +1992,7 @@ def add_agriculture(n, costs):
efficiency_gain = options["agriculture_machinery_fuel_efficiency"] / options["agriculture_machinery_electric_efficiency"] efficiency_gain = options["agriculture_machinery_fuel_efficiency"] / options["agriculture_machinery_electric_efficiency"]
n.add("Load", n.madd("Load",
nodes, nodes,
suffix=" agriculture machinery electric", suffix=" agriculture machinery electric",
bus=nodes, bus=nodes,