Skip to content

Commit

Permalink
Merge pull request #260 from openego/features/#256-hh-load-area-profi…
Browse files Browse the repository at this point in the history
…le-generator

Add HH load area profile generator
  • Loading branch information
nesnoj authored Sep 7, 2021
2 parents 2126540 + 1fbd656 commit 459412b
Show file tree
Hide file tree
Showing 5 changed files with 1,573 additions and 9 deletions.
2 changes: 1 addition & 1 deletion AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Authors
=======

* Guido Pleßmann, Ilka Cußman, Stephan Günther, Jonathan Amme - https://github.com/openego/eGon-data
* Guido Pleßmann, Ilka Cußman, Stephan Günther, Jonathan Amme, Julian Endres - https://github.com/openego/eGon-data
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ Added
`#198 <https://github.com/openego/eGon-data/issues/198>`_
* Integrate data bundle
`#272 <https://github.com/openego/eGon-data/issues/272>`_
* Add household electricity demand time series, mapping of
demand profiles to census cells and aggregated household
electricity demand time series at MV grid district level
`#256 <https://github.com/openego/eGon-data/issues/256>`_
* Integrate power-to-gas installation potential links
`#293 <https://github.com/openego/eGon-data/issues/293>`_
* Integrate distribution of wind onshore and pv ground mounted generation
Expand All @@ -131,6 +135,8 @@ Added
* Add random seed to CLI parameters
`#351 <https://github.com/openego/eGon-data/issues/351>`_

.. _PR #159: https://github.com/openego/eGon-data/pull/159


Changed
-------
Expand Down
48 changes: 41 additions & 7 deletions src/egon/data/airflow/dags/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
from egon.data.datasets.mastr import mastr_data_setup
from egon.data.datasets.mv_grid_districts import mv_grid_districts_setup
from egon.data.datasets.osm import OpenStreetMap
from egon.data.datasets.hh_demand_profiles import hh_demand_setup, mv_grid_district_HH_electricity_load, \
houseprofiles_in_census_cells
from egon.data.datasets.osmtgmod import Osmtgmod
from egon.data.datasets.power_plants import PowerPlants
from egon.data.datasets.re_potential_areas import re_potential_area_setup
Expand All @@ -41,7 +43,6 @@

from egon.data.datasets.gas_prod import GasProduction
from egon.data.datasets.industrial_gas_demand import IndustrialGasDemand
import airflow

import egon.data.importing.zensus as import_
import egon.data.importing.gas_grid as gas_grid
Expand All @@ -52,6 +53,9 @@
import egon.data.processing.power2gas as power2gas
import egon.data.processing.substation as substation

from egon.data import db


with airflow.DAG(
"egon-data-processing-pipeline",
description="The eGo^N data processing DAG.",
Expand Down Expand Up @@ -122,12 +126,13 @@
population_import >> zensus_misc_import

# Combine Zensus and VG250 data
zensus_vg250 = ZensusVg250(dependencies=[vg250, population_import])
zensus_vg250 = ZensusVg250(
dependencies=[vg250, population_import])
zensus_inside_ger = tasks["zensus_vg250.inside-germany"]

# DemandRegio data import
demandregio = DemandRegio(
dependencies=[setup, vg250, scenario_parameters, data_bundle]
)
demandregio = DemandRegio(dependencies=[
setup, vg250, scenario_parameters, data_bundle])
demandregio_demand_cts_ind = tasks["demandregio.insert-cts-ind-demands"]

# Society prognosis
Expand All @@ -136,7 +141,7 @@
demandregio,
zensus_vg250,
population_import,
zensus_misc_import,
zensus_misc_import
]
)

Expand Down Expand Up @@ -280,7 +285,7 @@
# Extract landuse areas from osm data set
create_landuse_table = PythonOperator(
task_id="create-landuse-table",
python_callable=loadarea.create_landuse_table,
python_callable=loadarea.create_landuse_table
)

landuse_extraction = PostgresOperator(
Expand Down Expand Up @@ -380,6 +385,35 @@
etrago_input_data >> solar_rooftop_etrago
map_zensus_grid_districts >> solar_rooftop_etrago

mv_hh_electricity_load_2035 = PythonOperator(
task_id="MV-hh-electricity-load-2035",
python_callable=mv_grid_district_HH_electricity_load,
op_args=["eGon2035", 2035, "0.0.0"],
op_kwargs={"drop_table": True},
)

mv_hh_electricity_load_2050 = PythonOperator(
task_id="MV-hh-electricity-load-2050",
python_callable=mv_grid_district_HH_electricity_load,
op_args=["eGon100RE", 2050, "0.0.0"],
)

hh_demand = hh_demand_setup(dependencies=[
vg250_clean_and_prepare,
zensus_misc_import,
map_zensus_grid_districts,
zensus_inside_ger,
demandregio,
],
tasks=(houseprofiles_in_census_cells,
mv_hh_electricity_load_2035,
mv_hh_electricity_load_2050,)
)
hh_demand.insert_into(pipeline)
householdprofiles_in_cencus_cells = tasks["hh_demand_profiles.houseprofiles-in-census-cells"]
mv_hh_electricity_load_2035 = tasks["MV-hh-electricity-load-2035"]
mv_hh_electricity_load_2050 = tasks["MV-hh-electricity-load-2050"]

# CHP locations
chp = Chp(dependencies=[mv_grid_districts, mastr_data])

Expand Down
10 changes: 9 additions & 1 deletion src/egon/data/datasets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,15 @@ electrical_load_curves_cts:
schema: 'demand'
table: 'egon_etrago_electricity_cts'

hh_demand_profiles:
sources:
household_electricity_demand_profiles:
path_testmode: "household_electricity_demand_profiles_2400.hdf5"
path: "household_electricity_demand_profiles_100k.hdf5"

zensus_household_types:
path: "Zensus2011_Personen.csv"

map_mvgrid_vg250:
sources:
egon_mv_grid_district:
Expand Down Expand Up @@ -643,7 +652,6 @@ etrago_electricity:
schema: 'grid'
table: 'egon_etrago_load_timeseries'


chp_location:
sources:
list_conv_pp:
Expand Down
Loading

0 comments on commit 459412b

Please sign in to comment.