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

Merge branch 'master' into fix_building_fec

Browse Source
This commit is contained in:
lisazeyen 2024-09-10 18:29:38 +02:00 committed by GitHub
commit 086beb7bd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build_biomass_transport_costs.py
View File

@ -79,7 +79,7 @@ def build_biomass_transport_costs():
transport_costs.name = "EUR/km/MWh" transport_costs.name = "EUR/km/MWh"
# rename country names # rename country names
to_rename = {"UK": "GB", "XK": "KO", "EL": "GR"} to_rename = {"UK": "GB", "EL": "GR"}
transport_costs.rename(to_rename, inplace=True) transport_costs.rename(to_rename, inplace=True)
# add missing Norway with data from Sweden # add missing Norway with data from Sweden

4
scripts/definitions/heat_system.py
View File

@ -5,8 +5,8 @@
from enum import Enum from enum import Enum
from scripts.definitions.heat_sector import HeatSector from definitions.heat_sector import HeatSector
from scripts.definitions.heat_system_type import HeatSystemType from definitions.heat_system_type import HeatSystemType
class HeatSystem(Enum): class HeatSystem(Enum):

9
scripts/prepare_sector_network.py
View File

@ -2337,7 +2337,7 @@ def add_biomass(n, costs):
].rename(index=lambda x: x + " municipal solid waste") ].rename(index=lambda x: x + " municipal solid waste")
unsustainable_solid_biomass_potentials_spatial = biomass_potentials[ unsustainable_solid_biomass_potentials_spatial = biomass_potentials[
"unsustainable solid biomass" "unsustainable solid biomass"
].rename(index=lambda x: x + " solid biomass") ].rename(index=lambda x: x + " unsustainable solid biomass")
else: else:
solid_biomass_potentials_spatial = biomass_potentials["solid biomass"].sum() solid_biomass_potentials_spatial = biomass_potentials["solid biomass"].sum()
@ -2698,7 +2698,12 @@ def add_biomass(n, costs):
carrier="unsustainable solid biomass", carrier="unsustainable solid biomass",
p_nom=10000, p_nom=10000,
marginal_cost=costs.at["fuelwood", "fuel"] marginal_cost=costs.at["fuelwood", "fuel"]
+ bus_transport_costs * average_distance, + bus_transport_costs.rename(
dict(
zip(spatial.biomass.nodes, spatial.biomass.nodes_unsustainable)
)
)
* average_distance,
) )
# Set last snapshot of e_max_pu for unsustainable solid biomass to 1 to make operational limit work # Set last snapshot of e_max_pu for unsustainable solid biomass to 1 to make operational limit work
unsus_stores_idx = n.stores.query( unsus_stores_idx = n.stores.query(