Merge branch 'features/#940-adjust-H2-industrial-loads' into continuo…

…us-integration/run-everything-over-the-weekend-2022-10-10
openego · Oct 11, 2022 · 8fe58d4 · 8fe58d4
2 parents 180c152 + 67cd406
commit 8fe58d4
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 180 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -432,6 +432,8 @@ Changed
   `#856 <https://github.com/openego/eGon-data/issues/856>`_
 * Introduce carrier name 'others'
   `#819 <https://github.com/openego/eGon-data/issues/819>`_
+* Adjust H2 industry profiles abroad for eGon2035
+  `#940 <https://github.com/openego/eGon-data/issues/940>`_
 
 Bug Fixes
 ---------
@@ -627,6 +629,8 @@ Bug Fixes
   `#403 <https://github.com/openego/eGon-data/issues/403>`_
 * Delete gas bus with wrong country code
   `#958 <https://github.com/openego/eGon-data/issues/958>`_
+* Remove drop of p_set and q_set for loads without timeserie
+  `#971 <https://github.com/openego/eGon-data/issues/971>`_
 
 
 .. _PR #692: https://github.com/openego/eGon-data/pull/692

diff --git a/src/egon/data/datasets/etrago_setup.py b/src/egon/data/datasets/etrago_setup.py
@@ -29,7 +29,7 @@ class EtragoSetup(Dataset):
     def __init__(self, dependencies):
         super().__init__(
             name="EtragoSetup",
-            version="0.0.9",
+            version="0.0.10",
             dependencies=dependencies,
             tasks=(create_tables, {temp_resolution, insert_carriers}),
         )
@@ -556,19 +556,33 @@ def insert_carriers():
     df = pd.DataFrame(
         data={
             "name": [
+                "biogas",
+                "biogas_feedin",
+                "biogas_to_gas",
                 "biomass",
-                "CH4",
                 "pv",
                 "wind_offshore",
                 "wind_onshore",
                 "central_heat_pump",
                 "central_resistive_heater",
+                "CH4",
+                "CH4_for_industry",
+                "CH4_system_boundary",
                 "CH4_to_H2",
                 "dsm",
+                "H2",
                 "H2_feedin",
+                "H2_for_industry",
+                "H2_grid",
+                "H2_gridextension",
+                "H2_hgv_load",
+                "H2_overground",
+                "H2_retrofit",
+                "H2_saltcavern",
+                "H2_system_boundary",
                 "H2_to_CH4",
                 "H2_to_power",
-                "H2_retrofit",
+                "H2_underground",
                 "rural_heat_pump",
                 "industrial_biomass_CHP",
                 "industrial_gas_CHP",
@@ -579,17 +593,11 @@ def insert_carriers():
                 "power_to_H2",
                 "rural_gas_boiler",
                 "central_gas_boiler",
-                "H2_overground",
-                "H2_underground",
                 "solar_thermal_collector",
                 "geo_thermal",
                 "AC",
                 "central_heat",
-                "H2",
                 "rural_heat",
-                "H2_grid",
-                "H2_saltcavern",
-                "biogas_feedin",
                 "natural_gas_feedin",
                 "pumped_hydro",
                 "battery",