From 30bcddb66afb77eba43c842567164aa8688b627c Mon Sep 17 00:00:00 2001 From: Philipp Glaum Date: Tue, 3 Sep 2024 14:10:20 +0200 Subject: [PATCH] prepare_sector_networks: account correctely for msw co2 environment.yaml: add license comment --- envs/environment.fixed.yaml | 10 +++++++--- scripts/prepare_sector_network.py | 13 +++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/envs/environment.fixed.yaml b/envs/environment.fixed.yaml index d625a5b1..ac2d7eee 100644 --- a/envs/environment.fixed.yaml +++ b/envs/environment.fixed.yaml @@ -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 diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 5f579c5d..89175b1f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -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(