Minor edits to MSW

This commit is contained in:
millingermarkus 2024-07-04 13:34:05 +02:00
parent c81d208da2
commit fbacb76e9c
2 changed files with 15 additions and 1 deletions

View File

@ -365,7 +365,6 @@ biomass:
- Secondary Forestry residues - woodchips - Secondary Forestry residues - woodchips
- Sawdust - Sawdust
- Residues from landscape care - Residues from landscape care
- Municipal waste
not included: not included:
- Sugar from sugar beet - Sugar from sugar beet
- Rape seed - Rape seed
@ -379,6 +378,8 @@ biomass:
biogas: biogas:
- Manure solid, liquid - Manure solid, liquid
- Sludge - Sludge
municipal solid waste:
- Municipal waste
# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#solar-thermal # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#solar-thermal
solar_thermal: solar_thermal:
@ -1017,6 +1018,7 @@ plotting:
biogas: '#e3d37d' biogas: '#e3d37d'
biomass: '#baa741' biomass: '#baa741'
solid biomass: '#baa741' solid biomass: '#baa741'
municipal solid waste: '#91ba41'
solid biomass transport: '#baa741' solid biomass transport: '#baa741'
solid biomass for industry: '#7a6d26' solid biomass for industry: '#7a6d26'
solid biomass for industry CC: '#47411c' solid biomass for industry CC: '#47411c'

View File

@ -56,6 +56,7 @@ def define_spatial(nodes, options):
# biomass # biomass
spatial.biomass = SimpleNamespace() spatial.biomass = SimpleNamespace()
spatial.msw = SimpleNamespace()
if options.get("biomass_spatial", options["biomass_transport"]): if options.get("biomass_spatial", options["biomass_transport"]):
spatial.biomass.nodes = nodes + " solid biomass" spatial.biomass.nodes = nodes + " solid biomass"
@ -3110,6 +3111,17 @@ def add_industry(n, costs):
efficiency3=process_co2_per_naphtha, efficiency3=process_co2_per_naphtha,
) )
if options.get("biomass",True):
n.madd(
"Link",
spatial.msw.locations,
bus0=spatial.msw.nodes,
bus1=non_sequestered_hvc_locations,
carrier="municipal solid waste",
p_nom_extendable=True,
efficiency=1.,
)
n.madd( n.madd(
"Link", "Link",
spatial.oil.demand_locations, spatial.oil.demand_locations,