Merge branch 'features/#929-H2-carrier-name' into continuous-integrat…

…ion/run-everything-over-the-weekend-2022-10-10
openego · Oct 11, 2022 · e5257e9 · e5257e9
2 parents 803345c + 0338dd3
commit e5257e9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -419,6 +419,8 @@ Changed
   `#882 <https://github.com/openego/eGon-data/issues/882>`_
 * Insert crossboarding gas pipeline with Germany in eGon100RE
   `#881 <https://github.com/openego/eGon-data/issues/881>`_
+* Harmonize H2 carrier names in eGon100RE
+  `#929 <https://github.com/openego/eGon-data/issues/929>`_
 * Rename noflex to lowflex scenario for motorized individual travel
   `#921 <https://github.com/openego/eGon-data/issues/921>`_
 * Update creation of heat demand timeseries

diff --git a/src/egon/data/datasets/gas_neighbours/__init__.py b/src/egon/data/datasets/gas_neighbours/__init__.py
@@ -2,8 +2,14 @@
 """
 
 from egon.data.datasets import Dataset
-from egon.data.datasets.gas_neighbours.eGon2035 import tyndp_gas_generation, tyndp_gas_demand, grid
-from egon.data.datasets.gas_neighbours.eGon100RE import insert_gas_neigbours_eGon100RE
+from egon.data.datasets.gas_neighbours.eGon100RE import (
+    insert_gas_neigbours_eGon100RE,
+)
+from egon.data.datasets.gas_neighbours.eGon2035 import (
+    grid,
+    tyndp_gas_demand,
+    tyndp_gas_generation,
+)
 
 
 class GasNeighbours(Dataset):
@@ -12,5 +18,8 @@ def __init__(self, dependencies):
             name="GasNeighbours",
             version="0.0.1",
             dependencies=dependencies,
-            tasks=({tyndp_gas_generation, tyndp_gas_demand, grid}, insert_gas_neigbours_eGon100RE),
-        )
+            tasks=(
+                {tyndp_gas_generation, tyndp_gas_demand, grid},
+                insert_gas_neigbours_eGon100RE,
+            ),
+        )
diff --git a/src/egon/data/datasets/gas_neighbours/eGon100RE.py b/src/egon/data/datasets/gas_neighbours/eGon100RE.py
@@ -182,7 +182,7 @@ def define_DE_crossbording_pipes_geom_eGon100RE(scn_name="eGon100RE"):
             f"""
             SELECT * FROM grid.egon_etrago_bus
             WHERE scn_name = 'eGon100RE'
-            AND carrier = '{carrier}'
+            AND carrier = '{carrier_bus_DE}'
             AND country != 'DE'
             """,
             epsg=4326,

diff --git a/src/egon/data/datasets/gas_neighbours/gas_abroad.py b/src/egon/data/datasets/gas_neighbours/gas_abroad.py
@@ -63,10 +63,7 @@ def insert_gas_grid_capacities(Neighbouring_pipe_capacities_list, scn_name):
             """
         )
 
-    carriers = {
-        "CH4": {"bus_inDE": "CH4", "bus_abroad": "CH4"},
-        "H2_retrofit": {"bus_inDE": "H2_grid", "bus_abroad": "H2"},
-    }
+    carriers = {"CH4": "CH4", "H2_retrofit": "H2_grid"}
 
     if scn_name == "eGon100RE":
         for c in carriers:
@@ -78,27 +75,27 @@ def insert_gas_grid_capacities(Neighbouring_pipe_capacities_list, scn_name):
                         SELECT bus_id FROM 
                         {sources['buses']['schema']}.{sources['buses']['table']}
                         WHERE country != 'DE'
-                        AND carrier = '{carriers[c]["bus_abroad"]}'
+                        AND carrier = '{carriers[c]}'
                         AND scn_name = '{scn_name}')
                     AND "bus1" IN (SELECT bus_id FROM 
                         {sources['buses']['schema']}.{sources['buses']['table']}
                         WHERE country = 'DE'
-                        AND carrier = '{carriers[c]["bus_inDE"]}' 
+                        AND carrier = '{carriers[c]}'
                         AND scn_name = '{scn_name}'))
                 OR ("bus0" IN (
                         SELECT bus_id FROM 
                         {sources['buses']['schema']}.{sources['buses']['table']}
                         WHERE country = 'DE'
-                        AND carrier = '{carriers[c]["bus_inDE"]}'
+                        AND carrier = '{carriers[c]}'
                         AND scn_name = '{scn_name}')
-                AND "bus1" IN (
+                    AND "bus1" IN (
                         SELECT bus_id FROM 
                         {sources['buses']['schema']}.{sources['buses']['table']}
                         WHERE country != 'DE'
-                        AND carrier = '{carriers[c]["bus_abroad"]}' 
+                        AND carrier = '{carriers[c]}'
                         AND scn_name = '{scn_name}'))
                 AND scn_name = '{scn_name}'
-                AND carrier = '{c.index}'            
+                AND carrier = '{c}'
                 ;
                 """
             )

diff --git a/src/egon/data/datasets/pypsaeursec/__init__.py b/src/egon/data/datasets/pypsaeursec/__init__.py
@@ -607,6 +607,7 @@ def neighbor_reduction():
         {
             "gas": "CH4",
             "gas_for_industry": "CH4_for_industry",
+            "H2": "H2_grid",
         },
         inplace=True,
     )