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

Merge pull request #1243 from PyPSA/fix_msw_stores

Browse Source 
fix municipal waste store timeseries
This commit is contained in:
lisazeyen 2024-08-29 15:59:46 +02:00 committed by GitHub
commit 35e81b90a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build_energy_totals.py
View File

@ -1066,7 +1066,9 @@ def build_eurostat_co2(eurostat: pd.DataFrame, year: int = 1990) -> pd.Series:
# emissions in tCO2_equiv per MWh_th # emissions in tCO2_equiv per MWh_th
specific_emissions["Solid fossil fuels"] = 0.36 # Approximates coal specific_emissions["Solid fossil fuels"] = 0.36 # Approximates coal
specific_emissions["Oil and petroleum products"] = 0.285 # Average of distillate and residue specific_emissions["Oil and petroleum products"] = (
0.285 # Average of distillate and residue
)
specific_emissions["Natural gas"] = 0.2 # For natural gas specific_emissions["Natural gas"] = 0.2 # For natural gas
return eurostat_year.multiply(specific_emissions).sum(axis=1) return eurostat_year.multiply(specific_emissions).sum(axis=1)
@ -1099,7 +1101,9 @@ def build_co2_totals(
co2 = eea_co2.reindex(countries) co2 = eea_co2.reindex(countries)
for ct in pd.Index(countries).intersection(["BA", "RS", "AL", "ME", "MK", "UA", "MD"]): for ct in pd.Index(countries).intersection(
["BA", "RS", "AL", "ME", "MK", "UA", "MD"]
):
mappings = { mappings = {
"electricity": (ct, "+", "Electricity & heat generation", np.nan), "electricity": (ct, "+", "Electricity & heat generation", np.nan),
"residential non-elec": (ct, "+", "+", "Residential"), "residential non-elec": (ct, "+", "+", "Residential"),

7
scripts/prepare_sector_network.py
View File

@ -2345,7 +2345,12 @@ def add_biomass(n, costs):
carrier="municipal solid waste", carrier="municipal solid waste",
) )
e_max_pu = pd.Series([1] * (len(n.snapshots) - 1) + [0], index=n.snapshots) e_max_pu = np.array(
len(spatial.msw.nodes) * [[1] * (len(n.snapshots) - 1) + [0]]
).T
e_max_pu = pd.DataFrame(
e_max_pu, index=n.snapshots, columns=spatial.msw.nodes
).astype(float)
n.madd( n.madd(
"Store", "Store",
spatial.msw.nodes, spatial.msw.nodes,