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

Merge branch 'master' into add_methanol_techs

Browse Source
This commit is contained in:
lisazeyen 2024-09-10 16:51:52 +02:00 committed by GitHub
commit 424ae3b5e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/prepare_sector_network.py
View File

@ -2662,7 +2662,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()
@ -3023,7 +3023,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(