Merge pull request #1016 from openego/fixes/#1015-add-scenario-filter…

…-in-chp-extension Filter existing chp capacity by scenario name
openego · Dec 14, 2022 · ab9aa75 · ab9aa75
2 parents 4acceba + 8a6dc89
commit ab9aa75
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -653,6 +653,8 @@ Bug Fixes
   `#1031 <https://github.com/openego/eGon-data/issues/1031>`_
 * Fix solar rooftop in test mode
   `#1055 <https://github.com/openego/eGon-data/issues/1055>`_
+* Add missing filter for scenario name in chp expansion
+  `#1015 <https://github.com/openego/eGon-data/issues/1015>`_
 
 .. _PR #692: https://github.com/openego/eGon-data/pull/692
 .. _#343: https://github.com/openego/eGon-data/issues/343

diff --git a/src/egon/data/datasets/chp/__init__.py b/src/egon/data/datasets/chp/__init__.py
@@ -528,7 +528,7 @@ class Chp(Dataset):
     def __init__(self, dependencies):
         super().__init__(
             name="Chp",
-            version="0.0.5",
+            version="0.0.6",
             dependencies=dependencies,
             tasks=(
                 create_tables,

diff --git a/src/egon/data/datasets/chp/small_chp.py b/src/egon/data/datasets/chp/small_chp.py
@@ -554,6 +554,7 @@ def extension_per_federal_state(federal_state, EgonChp):
             {target_table['table']}
             WHERE sources::json->>'el_capacity' = 'MaStR'
             AND carrier != 'biomass'
+            AND scenario = 'eGon2035'
             AND ST_Intersects(geom, (
             SELECT ST_Union(geometry) FROM
             {sources['vg250_lan']['schema']}.{sources['vg250_lan']['table']} b