diff --git a/src/egon/data/airflow/dags/pipeline.py b/src/egon/data/airflow/dags/pipeline.py index 8b1712cca..7aa338aee 100755 --- a/src/egon/data/airflow/dags/pipeline.py +++ b/src/egon/data/airflow/dags/pipeline.py @@ -278,7 +278,12 @@ # Insert hydrogen buses insert_hydrogen_buses = HydrogenBusEtrago( - dependencies=[saltcavern_storage, gas_grid_insert_data]) + dependencies=[ + saltcavern_storage, + gas_grid_insert_data, + create_voronoi_substation + ] + ) # H2 steel tanks and saltcavern storage insert_H2_storage = HydrogenStoreEtrago( diff --git a/src/egon/data/datasets/hydrogen_etrago/storage.py b/src/egon/data/datasets/hydrogen_etrago/storage.py index b65353e39..3bc221e2a 100644 --- a/src/egon/data/datasets/hydrogen_etrago/storage.py +++ b/src/egon/data/datasets/hydrogen_etrago/storage.py @@ -194,10 +194,15 @@ def calculate_and_map_saltcavern_storage_potential(): individual_areas = {} # individual state areas for federal_state in data["federal_states"]: - individual_areas[federal_state] = saltcavern_data.overlay( - vg250_data[vg250_data["gen"] == federal_state], - how="intersection" - ).to_crs(epsg=25832).area.sum() + print(vg250_data[vg250_data["gen"] == federal_state]) + print(saltcavern_data) + try: + individual_areas[federal_state] = saltcavern_data.overlay( + vg250_data[vg250_data["gen"] == federal_state], + how="intersection" + ).to_crs(epsg=25832).area.sum() + except ValueError: + individual_areas[federal_state]=0 # derives weights from fraction of individual state area to total area total_area = sum(individual_areas.values()) diff --git a/src/egon/data/processing/h2_to_ch4.py b/src/egon/data/processing/h2_to_ch4.py index 4a1052a05..0ac540438 100644 --- a/src/egon/data/processing/h2_to_ch4.py +++ b/src/egon/data/processing/h2_to_ch4.py @@ -10,7 +10,7 @@ class H2toCH4toH2(Dataset): def __init__(self, dependencies): super().__init__( - name="PowertoH2toPower", + name="H2CH4Links", version="0.0.0", dependencies=dependencies, tasks=(insert_h2_to_ch4_to_h2), diff --git a/src/egon/data/processing/power_to_h2.py b/src/egon/data/processing/power_to_h2.py index 4739502cd..7701c860a 100755 --- a/src/egon/data/processing/power_to_h2.py +++ b/src/egon/data/processing/power_to_h2.py @@ -16,7 +16,7 @@ class PowertoH2toPower(Dataset): def __init__(self, dependencies): super().__init__( - name="PowertoH2toPower", + name="H2PowerLinks", version="0.0.0", dependencies=dependencies, tasks=(insert_power_to_h2_to_power),