prepare_sector_networks: account correctely for msw co2
environment.yaml: add license comment
This commit is contained in:
parent
d2e7562962
commit
30bcddb66a
@ -1,6 +1,10 @@
|
||||
# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
|
||||
#
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
name: pypsa-eur-20240812
|
||||
channels:
|
||||
- http://conda.anaconda.org/gurobi
|
||||
- conda-forge
|
||||
- defaults
|
||||
- http://conda.anaconda.org/gurobi
|
||||
- conda-forge
|
||||
- defaults
|
||||
prefix: /home/fneum/miniconda3/envs/pypsa-eur-20240812
|
||||
|
@ -2377,12 +2377,9 @@ def add_biomass(n, costs):
|
||||
carrier="municipal solid waste",
|
||||
)
|
||||
|
||||
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)
|
||||
e_max_pu = pd.DataFrame(1, index=n.snapshots, columns=spatial.msw.nodes)
|
||||
e_max_pu.iloc[-1] = 0
|
||||
|
||||
n.madd(
|
||||
"Store",
|
||||
spatial.msw.nodes,
|
||||
@ -3383,9 +3380,13 @@ def add_industry(n, costs):
|
||||
spatial.msw.locations,
|
||||
bus0=spatial.msw.nodes,
|
||||
bus1=non_sequestered_hvc_locations,
|
||||
bus2="co2 atmosphere",
|
||||
carrier="municipal solid waste",
|
||||
p_nom_extendable=True,
|
||||
efficiency=1.0,
|
||||
efficiency2=-costs.at[
|
||||
"oil", "CO2 intensity"
|
||||
], # because msw is co2 neutral and will be burned in waste CHP or decomposed as oil
|
||||
)
|
||||
|
||||
n.madd(
|
||||
|
Loading…
Reference in New Issue
Block a user