Merge pull request PyPSA#1256 from PyPSA/fix_msw

account correctely for msw co2
bobbyxng · Sep 4, 2024 · b328169 · b328169
2 parents aa79ca0 + e940e4b
commit b328169
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/envs/environment.fixed.yaml b/envs/environment.fixed.yaml
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
+#
+# SPDX-License-Identifier: CC0-1.0
+
 name: pypsa-eur-20240812
 channels:
 - http://conda.anaconda.org/gurobi

diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
@@ -2355,7 +2355,7 @@ def add_biomass(n, costs):
     if (
         options["municipal_solid_waste"]
         and not options["industry"]
-        and (cf_industry["waste_to_energy"] or cf_industry["waste_to_energy_cc"])
+        and not (cf_industry["waste_to_energy"] or cf_industry["waste_to_energy_cc"])
     ):
         logger.warning(
             "Flag municipal_solid_waste can be only used with industry "
@@ -2375,12 +2375,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,
@@ -3381,9 +3378,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(