Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Features/#450 metadata etrago tables #1117

Merged
merged 18 commits into from
Mar 15, 2023
Merged

Features/#450 metadata etrago tables #1117

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
196bff7
Rename 'license' to 'licenses'
ClaraBuettner Mar 13, 2023
4fbe7d1
Fix name
ClaraBuettner Mar 13, 2023
066f317
Fill metadata for static tables
ClaraBuettner Mar 13, 2023
2347b06
Apply black and isort
ClaraBuettner Mar 13, 2023
8feefdd
Add gas sector sources and contributors
AmeliaNadal Mar 13, 2023
b65f717
Adjust metadata sources
AmeliaNadal Mar 13, 2023
80b8687
Add technology data and dsm source
ClaraBuettner Mar 14, 2023
e341fff
Add metadata for generaotr and bus timeseries tables
ClaraBuettner Mar 14, 2023
9123cc7
Add time series meta data automised
ClaraBuettner Mar 15, 2023
19ad658
Delete unused imports
ClaraBuettner Mar 15, 2023
f857b09
Add dsm sources
ClaraBuettner Mar 15, 2023
baa66ad
Apply black and isort
ClaraBuettner Mar 15, 2023
082dbd1
Add vg250 to generator sources
ClaraBuettner Mar 15, 2023
2c6f96e
Update default values for meta data
ClaraBuettner Mar 15, 2023
0be7172
Fix licenses list in metadata
ClaraBuettner Mar 15, 2023
928b611
Change contributors of egon-data source
ClaraBuettner Mar 15, 2023
01df06f
Add era5 sources to line timeseries metadata
ClaraBuettner Mar 15, 2023
884cce9
Remove unused sources
ClaraBuettner Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 191 additions & 9 deletions src/egon/data/datasets/etrago_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,35 @@ def __init__(self, dependencies):


class EgonPfHvBus(Base):

source_list = [
sources()["egon-data"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we really cite this eGon-data as a source in our metadata?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We added it like this to every table, so I think it's fine.

sources()["openstreetmap"],
sources()["peta"],
sources()["SciGRID_gas"],
sources()["bgr_inspeeds_data_bundle"],
]

contributor_list = contributors(["ic", "cb", "ke", "an", "fw"])
contributor_list[0]["comment"] = "Added electricity substations"
contributor_list[1]["comment"] = "Added heat buses"
contributor_list[2]["comment"] = "Added DSM buses"
contributor_list[3]["comment"] = "Added CH4 sector buses"
contributor_list[4]["comment"] = "Added H2 sector buses"

license_list = [data["licenses"] for data in source_list]

__tablename__ = "egon_etrago_bus"
__table_args__ = {"schema": "grid", "comment": get_meta("grid", "Bus")}
__table_args__ = {
"schema": "grid",
"comment": get_meta(
"grid",
"Bus",
source_list=source_list,
license_list=license_list,
contributor_list=contributor_list,
),
}

scn_name = Column(String, primary_key=True, nullable=False)
bus_id = Column(BigInteger, primary_key=True, nullable=False)
Expand All @@ -156,10 +183,36 @@ class EgonPfHvBusTimeseries(Base):


class EgonPfHvGenerator(Base):

source_list = [
sources()["egon-data"],
sources()["openstreetmap"],
sources()["mastr"],
sources()["nep2021"],
sources()["tyndp"],
sources()["SciGRID_gas"],
sources()["Einspeiseatlas"],
]

contributor_list = contributors(["ic", "cb", "ce", "an", "ke"])
contributor_list[0]["comment"] = "Added hydro and biomass plants"
contributor_list[1]["comment"] = "Added solar and geothermal plants"
contributor_list[2]["comment"] = "Added wind on- and offshore plants"
contributor_list[3]["comment"] = "Added gas feedin generators"
contributor_list[4]["comment"] = "Added pv ground mounted"

license_list = [data["licenses"] for data in source_list]

__tablename__ = "egon_etrago_generator"
__table_args__ = {
"schema": "grid",
"comment": get_meta("grid", "Generator"),
"comment": get_meta(
"grid",
"Generator",
source_list=source_list,
license_list=license_list,
contributor_list=contributor_list,
),
}

scn_name = Column(String, primary_key=True, nullable=False)
Expand Down Expand Up @@ -213,8 +266,29 @@ class EgonPfHvGeneratorTimeseries(Base):


class EgonPfHvLine(Base):

source_list = [
sources()["egon-data"],
sources()["openstreetmap"],
]

contributor_list = contributors(["ic", "cb"])
contributor_list[0]["comment"] = "Added lines from osmTGmod tables"
contributor_list[1]["comment"] = "Added meta data"

license_list = [data["licenses"] for data in source_list]

__tablename__ = "egon_etrago_line"
__table_args__ = {"schema": "grid", "comment": get_meta("grid", "Line")}
__table_args__ = {
"schema": "grid",
"comment": get_meta(
"grid",
"Line",
source_list=source_list,
license_list=license_list,
contributor_list=contributor_list,
),
}

scn_name = Column(String, primary_key=True, nullable=False)
line_id = Column(BigInteger, primary_key=True, nullable=False)
Expand Down Expand Up @@ -256,6 +330,39 @@ class EgonPfHvLineTimeseries(Base):


class EgonPfHvLink(Base):

source_list = [
sources()["egon-data"],
sources()["openstreetmap"],
sources()["nep2021"],
sources()["peta"],
sources()["mastr"],
sources()["SciGRID_gas"],
sources()["pipeline_classification"],
]

contributor_list = contributors(["ic", "cb", "ke", "ja", "fw", "an"])
contributor_list[0]["comment"] = "Added DC lines from osmTGmod tables"
contributor_list[1]["comment"] = "Added CHPs and heat links"
contributor_list[2]["comment"] = "Added DSM links"
contributor_list[3]["comment"] = "Added e-Mobility links"
contributor_list[4]["comment"] = "Added H2 related links"
contributor_list[5]["comment"] = "Added CH4 links"

license_list = [data["licenses"] for data in source_list]

__tablename__ = "egon_etrago_link"
__table_args__ = {
"schema": "grid",
"comment": get_meta(
"grid",
"Link",
source_list=source_list,
license_list=license_list,
contributor_list=contributor_list,
),
}

__tablename__ = "egon_etrago_link"
__table_args__ = {"schema": "grid", "comment": get_meta("grid", "Link")}

Expand Down Expand Up @@ -298,8 +405,38 @@ class EgonPfHvLinkTimeseries(Base):


class EgonPfHvLoad(Base):

source_list = [
sources()["egon-data"],
sources()["demandregio"],
sources()["nep2021"],
sources()["peta"],
sources()["schmidt"],
sources()["hotmaps_industrial_sites"],
sources()["openstreetmap"],
sources()["openffe_gas"],
sources()["tyndp"],
]

contributor_list = contributors(["ic", "cb", "an", "ja"])
contributor_list[0]["comment"] = "Added electrical demands"
contributor_list[1]["comment"] = "Added heat deands"
contributor_list[2]["comment"] = "Added gas demands"
contributor_list[3]["comment"] = "Added mobility demands"

license_list = [data["licenses"] for data in source_list]

__tablename__ = "egon_etrago_load"
__table_args__ = {"schema": "grid", "comment": get_meta("grid", "Load")}
__table_args__ = {
"schema": "grid",
"comment": get_meta(
"grid",
"Load",
source_list=source_list,
license_list=license_list,
contributor_list=contributor_list,
),
}

scn_name = Column(String, primary_key=True, nullable=False)
load_id = Column(BigInteger, primary_key=True, nullable=False)
Expand Down Expand Up @@ -334,8 +471,31 @@ class EgonPfHvCarrier(Base):


class EgonPfHvStorage(Base):

source_list = [
sources()["egon-data"],
sources()["nep2021"],
sources()["mastr"],
]

contributor_list = contributors(["ic"])
contributor_list[0][
"comment"
] = "Added battery and pumped hydro storage units"

license_list = [data["licenses"] for data in source_list]

__tablename__ = "egon_etrago_storage"
__table_args__ = {"schema": "grid", "comment": get_meta("grid", "Storage")}
__table_args__ = {
"schema": "grid",
"comment": get_meta(
"grid",
"Storage",
source_list=source_list,
license_list=license_list,
contributor_list=contributor_list,
),
}

scn_name = Column(String, primary_key=True, nullable=False)
storage_id = Column(BigInteger, primary_key=True, nullable=False)
Expand Down Expand Up @@ -388,13 +548,17 @@ class EgonPfHvStore(Base):
source_dict["bgr_inspee"],
source_dict["bgr_inspeeds"],
source_dict["bgr_inspeeds_data_bundle"],
source_dict["bgr_inspeeds_data_bundle"],
source_dict["bgr_inspeeds_report"],
source_dict["SciGRID_gas"],
]
ClaraBuettner marked this conversation as resolved.
Show resolved Hide resolved
contributor_list = contributors(["an", "fw"])
contributor_list = contributors(["an", "fw", "ke", "cb", "ja"])
contributor_list[0]["comment"] = "Add H2 storage"
contributor_list[1]["comment"] = "Add CH4 storage"
license_list = [data["license"] for data in source_list]
contributor_list[2]["comment"] = "Add DSM storage"
contributor_list[3]["comment"] = "Add heat storage"
contributor_list[4]["comment"] = "Add e-mobility storage"

license_list = [data["licenses"] for data in source_list]
__tablename__ = "egon_etrago_store"
__table_args__ = {
"schema": "grid",
Expand Down Expand Up @@ -455,10 +619,28 @@ class EgonPfHvTempResolution(Base):


class EgonPfHvTransformer(Base):

source_list = [
sources()["egon-data"],
sources()["openstreetmap"],
]

contributor_list = contributors(["ic", "cb"])
contributor_list[0]["comment"] = "Added transformes from osmTGmod tables"
contributor_list[1]["comment"] = "Added meta data"

license_list = [data["licenses"] for data in source_list]

__tablename__ = "egon_etrago_transformer"
__table_args__ = {
"schema": "grid",
"comment": get_meta("grid", "Transformer"),
"comment": get_meta(
"grid",
"Transformer",
source_list=source_list,
license_list=license_list,
contributor_list=contributor_list,
),
}

scn_name = Column(String, primary_key=True, nullable=False)
Expand Down
Loading