Skip to content

Commit

Permalink
Merge pull request #814 from openego/fix/#813_gas_pipeline_DE-AT
Browse files Browse the repository at this point in the history
Fix/#813 Cross-bording gas pipeline DE-AT
  • Loading branch information
AmeliaNadal committed Jul 7, 2022
2 parents add4944 + 44e064a commit 08962a7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ Bug Fixes
`#748 <https://github.com/openego/eGon-data/issues/748>`_
* Add missing dependency to heat_etrago
`#771 <https://github.com/openego/eGon-data/issues/771>`_
* Fix country code of gas pipeline DE-AT
`#813 <https://github.com/openego/eGon-data/issues/813>`_
* Fix distribution of resistive heaters in district heating grids
`#783 <https://github.com/openego/eGon-data/issues/783>`_
* Fix missing reservoir and run_of_river power plants in eTraGo tables,
Expand Down
9 changes: 6 additions & 3 deletions src/egon/data/datasets/gas_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class GasNodesandPipes(Dataset):
def __init__(self, dependencies):
super().__init__(
name="GasNodesandPipes",
version="0.0.6",
version="0.0.7",
dependencies=dependencies,
tasks=(insert_gas_data, insert_gas_data_eGon100RE),
)
Expand Down Expand Up @@ -476,12 +476,15 @@ def insert_gas_pipeline_list(
gas_pipelines_list.loc[
gas_pipelines_list["country_1"] == "FI", "country_1"
] = "RU"
gas_pipelines_list.loc[
gas_pipelines_list["id"] == "ST_2612_Seg_0_Seg_0", "country_0"
] = "AT" # bus "INET_N_1182" DE -> AT
gas_pipelines_list.loc[
gas_pipelines_list["id"] == "INET_PL_385_EE_3_Seg_0_Seg_1", "country_1"
] = "AT"
] = "AT" # "INET_N_1182" DE -> AT
gas_pipelines_list.loc[
gas_pipelines_list["id"] == "LKD_PS_0_Seg_0_Seg_3", "country_0"
] = "NL"
] = "NL" # bus "SEQ_10608_p" DE -> NL

# Remove link test if length = 0
gas_pipelines_list = gas_pipelines_list[
Expand Down

0 comments on commit 08962a7

Please sign in to comment.