From 70cb7e34946be07df27819886369086ebade05cf Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Thu, 30 Jan 2025 17:23:21 +0100 Subject: [PATCH 1/8] add Werner to PGM-IO references Signed-off-by: Martijn Govers --- CITATION.cff | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CITATION.cff b/CITATION.cff index 27181d28..353d2d3c 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -73,6 +73,11 @@ references: given-names: "Peter" email: "Peter.Salemink@Alliander.com" affiliation: "Alliander" + - family-names: "Westering" + name-particle: "van" + given-names: "Werner" + email: Werner.van.Westering@Alliander.com + affiliation: "Alliander" - family-names: "Bharambe" given-names: "Nitish" email: "Nitish.Bharambe@Alliander.com" @@ -134,6 +139,8 @@ references: - family-names: "Westering" name-particle: "van" given-names: "Werner" + email: Werner.van.Westering@Alliander.com + affiliation: "Alliander" conference: name: "CIRED 2023 - The 27th International Conference and Exhibition on Electricity Distribution" type: conference-paper From 78aa6628b97113ea15fbe33d9073681912a086a8 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Thu, 30 Jan 2025 17:31:04 +0100 Subject: [PATCH 2/8] black format Signed-off-by: Martijn Govers --- .pre-commit-config.yaml | 2 +- src/power_grid_model_io/utils/uuid_excel_cvtr.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fcda58a6..f736e1a6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 24.8.0 + rev: 25.1.0 hooks: - id: black-jupyter - repo: https://github.com/pre-commit/mirrors-mypy diff --git a/src/power_grid_model_io/utils/uuid_excel_cvtr.py b/src/power_grid_model_io/utils/uuid_excel_cvtr.py index da870391..aac0f165 100644 --- a/src/power_grid_model_io/utils/uuid_excel_cvtr.py +++ b/src/power_grid_model_io/utils/uuid_excel_cvtr.py @@ -3,13 +3,13 @@ # SPDX-License-Identifier: MPL-2.0 """ - This is a stand-alone conversion script that converts the GUID based Vision - excel files to a number based format. The script is designed to be used as - a light weight tool to run before running the PGM-IO conversion scripts. - Example usage: +This is a stand-alone conversion script that converts the GUID based Vision +excel files to a number based format. The script is designed to be used as +a light weight tool to run before running the PGM-IO conversion scripts. +Example usage: - new_file = convert_guid_vision_excel("vision_97_en.xlsx", number="Number", {"N1": "Grounding1"}) - nieuw_bestand = convert_guid_vision_excel("vision_97_nl.xlsx", number="Nummer", {"N1": "Arding1"}) +new_file = convert_guid_vision_excel("vision_97_en.xlsx", number="Number", {"N1": "Grounding1"}) +nieuw_bestand = convert_guid_vision_excel("vision_97_nl.xlsx", number="Nummer", {"N1": "Arding1"}) """ From 0588d4b06863005eab66cef267acfad24939fb62 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Fri, 31 Jan 2025 09:58:11 +0100 Subject: [PATCH 3/8] add orcid to citations Signed-off-by: Martijn Govers --- CITATION.cff | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 353d2d3c..5d0437ab 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -14,6 +14,7 @@ authors: given-names: "Yu" email: "Tony.Xiang@Alliander.com" affiliation: "Alliander" + orcid: "https://orcid.org/0000-0001-5889-0067" - family-names: "Salemink" given-names: "Peter" email: "Peter.Salemink@Alliander.com" @@ -22,10 +23,12 @@ authors: given-names: "Nitish" email: "Nitish.Bharambe@Alliander.com" affiliation: "Alliander" + orcid: "https://orcid.org/0009-0007-9694-6077" - family-names: "Govers" - given-names: "Martinus" + given-names: "Martinus G.H." email: "Martijn.Govers@Alliander.com" affiliation: "Alliander" + orcid: "https://orcid.org/0009-0008-6890-8353" - family-names: "Bogaard" name-particle: "van den" given-names: "Jonas" @@ -38,9 +41,10 @@ authors: email: "Zhen.Wang@Alliander.com" affiliation: "Alliander" - family-names: "Guo" - given-names: "Jerry" - email: "Jerry.Jinfeng.Guo@Alliander.com" + given-names: "Jerry Jinfeng" + email: "Jerry.Jinfeng.Guo@hotmail.com" affiliation: "Alliander" + orcid: "https://orcid.org/0000-0002-8065-4084" - family-names: "Jagutis" given-names: "Laurynas" email: "Laurynas.Jagutis@Alliander.com" @@ -69,6 +73,7 @@ references: given-names: "Yu" email: "Tony.Xiang@Alliander.com" affiliation: "Alliander" + orcid: "https://orcid.org/0000-0001-5889-0067" - family-names: "Salemink" given-names: "Peter" email: "Peter.Salemink@Alliander.com" @@ -78,14 +83,17 @@ references: given-names: "Werner" email: Werner.van.Westering@Alliander.com affiliation: "Alliander" + orcid: "https://orcid.org/0000-0002-4058-2581" - family-names: "Bharambe" given-names: "Nitish" email: "Nitish.Bharambe@Alliander.com" affiliation: "Alliander" + orcid: "https://orcid.org/0009-0007-9694-6077" - family-names: "Govers" - given-names: "Martinus" + given-names: "Martinus G.H." email: "Martijn.Govers@Alliander.com" affiliation: "Alliander" + orcid: "https://orcid.org/0009-0008-6890-8353" - family-names: "Bogaard" name-particle: "van den" given-names: "Jonas" @@ -98,9 +106,10 @@ references: email: "Zhen.Wang@Alliander.com" affiliation: "Alliander" - family-names: "Guo" - given-names: "Jerry" - email: "Jerry.Jinfeng.Guo@Alliander.com" + given-names: "Jerry Jinfeng" + email: "Jerry.Jinfeng.Guo@hotmail.com" affiliation: "Alliander" + orcid: "https://orcid.org/0000-0002-8065-4084" - family-names: "Jagutis" given-names: "Laurynas" email: "Laurynas.Jagutis@Alliander.com" @@ -126,6 +135,7 @@ references: given-names: "Yu" email: Tony.Xiang@Alliander.com affiliation: "Alliander" + orcid: "https://orcid.org/0000-0001-5889-0067" - family-names: "Salemink" given-names: "Peter" email: Peter.Salemink@Alliander.com @@ -136,11 +146,13 @@ references: given-names: "Nitish" email: Nitish.Bharambe@Alliander.com affiliation: "Alliander" + orcid: "https://orcid.org/0009-0007-9694-6077" - family-names: "Westering" name-particle: "van" given-names: "Werner" email: Werner.van.Westering@Alliander.com affiliation: "Alliander" + orcid: "https://orcid.org/0000-0002-4058-2581" conference: name: "CIRED 2023 - The 27th International Conference and Exhibition on Electricity Distribution" type: conference-paper From 9ae6639dfde66e4a3eda0a231841b0a96f559771 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Fri, 31 Jan 2025 10:06:02 +0100 Subject: [PATCH 4/8] update email Signed-off-by: Martijn Govers --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 5d0437ab..ad3ff039 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -60,7 +60,7 @@ authors: - name: "Contributors to the LF Energy project Power Grid Model" contact: - name: "LF Energy project Power Grid Model" - email: "powergridmodel+help@lists.lfenergy.org" + email: "powergridmodel@lists.lfenergy.org" references: - title: "PowerGridModel/power-grid-model" From f301a89f2921f0fef8b2e12eda8eaf94b4564aaa Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Fri, 31 Jan 2025 10:11:21 +0100 Subject: [PATCH 5/8] add PGM-DS to citations Signed-off-by: Martijn Govers --- CITATION.cff | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CITATION.cff b/CITATION.cff index ad3ff039..b33f715b 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -159,3 +159,25 @@ references: year: 2023 volume: 2023 pages: "1-5" + + - title: "PowerGridModel/power-grid-model-ds" + repository-code: "https://github.com/PowerGridModel/power-grid-model-ds" + license: "MPL-2.0" + type: software-code + authors: + - family-names: "Schouten" + given-names: "Jaap" + email: Jaap.Schouten@Alliander.com + affiliation: "Alliander" + - family-names: "Baaijen" + given-names: "Thijs" + email: Thijs.Baaijen@Alliander.com + affiliation: "Alliander" + - family-names: "Koppen" + given-names: "Vincent" + email: Vincent.Koppen@Alliander.com + - family-names: "Voort" + name-particle: "van der" + given-names: "Sven" + email: Sven.van.der.Voort@Alliander.com + - name: "Contributors to the LF Energy project Power Grid Model" From 6aacbea87e32329f978b31392e13bbc9d5e6a3c2 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Fri, 31 Jan 2025 12:06:32 +0100 Subject: [PATCH 6/8] add more ORCHID iD to citations Signed-off-by: Martijn Govers --- CITATION.cff | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CITATION.cff b/CITATION.cff index b33f715b..b8cd47e8 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -40,6 +40,7 @@ authors: given-names: "Zhen" email: "Zhen.Wang@Alliander.com" affiliation: "Alliander" + orcid: "https://orcid.org/0000-0003-4317-6455" - family-names: "Guo" given-names: "Jerry Jinfeng" email: "Jerry.Jinfeng.Guo@hotmail.com" @@ -105,6 +106,7 @@ references: given-names: "Zhen" email: "Zhen.Wang@Alliander.com" affiliation: "Alliander" + orcid: "https://orcid.org/0000-0003-4317-6455" - family-names: "Guo" given-names: "Jerry Jinfeng" email: "Jerry.Jinfeng.Guo@hotmail.com" From d07cf48158078c8b5dd7bc43da72096b3859faf0 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Thu, 6 Feb 2025 15:24:33 +0100 Subject: [PATCH 7/8] update citations Signed-off-by: Martijn Govers --- CITATION.cff | 17 +++++++++-------- README.md | 16 +++++++++------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index b8cd47e8..38fb8c30 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -46,6 +46,10 @@ authors: email: "Jerry.Jinfeng.Guo@hotmail.com" affiliation: "Alliander" orcid: "https://orcid.org/0000-0002-8065-4084" + - family-names: "Figueroa Manrique" + given-names: "Santiago" + email: "Santiago.Figueroa.Manrique@Alliander.com" + affiliation: "Alliander" - family-names: "Jagutis" given-names: "Laurynas" email: "Laurynas.Jagutis@Alliander.com" @@ -54,10 +58,6 @@ authors: given-names: "Chenguang" email: "Chenguang.Wang@Alliander.com" affiliation: "Alliander" - - family-names: "Figueroa Manrique" - given-names: "Santiago" - email: "Santiago.Figueroa.Manrique@Alliander.com" - affiliation: "Alliander" - name: "Contributors to the LF Energy project Power Grid Model" contact: - name: "LF Energy project Power Grid Model" @@ -112,6 +112,10 @@ references: email: "Jerry.Jinfeng.Guo@hotmail.com" affiliation: "Alliander" orcid: "https://orcid.org/0000-0002-8065-4084" + - family-names: "Figueroa Manrique" + given-names: "Santiago" + email: "Santiago.Figueroa.Manrique@Alliander.com" + affiliation: "Alliander" - family-names: "Jagutis" given-names: "Laurynas" email: "Laurynas.Jagutis@Alliander.com" @@ -125,10 +129,6 @@ references: given-names: "Marc" email: "Marc.van.Raalte@Alliander.com" affiliation: "Alliander" - - family-names: "Figueroa Manrique" - given-names: "Santiago" - email: "Santiago.Figueroa.Manrique@Alliander.com" - affiliation: "Alliander" - name: "Contributors to the LF Energy project Power Grid Model" - title: "Power grid model: A high-performance distribution grid calculation library" @@ -164,6 +164,7 @@ references: - title: "PowerGridModel/power-grid-model-ds" repository-code: "https://github.com/PowerGridModel/power-grid-model-ds" + doi: "10.5281/zenodo.8054429" license: "MPL-2.0" type: software-code authors: diff --git a/README.md b/README.md index fef2a4fd..515edd24 100644 --- a/README.md +++ b/README.md @@ -74,14 +74,14 @@ If you are using Power Grid Model IO in your research work, please consider citi ```bibtex @software{Xiang_PowerGridModel_power-grid-model-io, - author = {Xiang, Yu and Salemink, Peter and Bharambe, Nitish and Govers, Martinus and van den Bogaard, Jonas and Stoeller, Bram and Wang, Zhen and Guo, Jerry and Jagutis, Laurynas and Wang, Chenguang and {Contributors to the LF Energy project Power Grid Model}}, + author = {Xiang, Yu and Salemink, Peter and Bharambe, Nitish and Govers, Martinus G.H. and van den Bogaard, Jonas and Stoeller, Bram and Wang, Zhen and Guo, Jerry Jinfeng and Figueroa Manrique, Santiago and Jagutis, Laurynas and Wang, Chenguang and {Contributors to the LF Energy project Power Grid Model}}, doi = {10.5281/zenodo.8059257}, license = {MPL-2.0}, title = {{PowerGridModel/power-grid-model-io}}, url = {https://github.com/PowerGridModel/power-grid-model-io} } @software{Xiang_PowerGridModel_power-grid-model, - author = {Xiang, Yu and Salemink, Peter and Bharambe, Nitish and Govers, Martinus and van den Bogaard, Jonas and Stoeller, Bram and Wang, Zhen and Guo, Jerry and Jagutis, Laurynas and Wang, Chenguang and van Raalte, Marc and {Contributors to the LF Energy project Power Grid Model}}, + author = {Xiang, Yu and Salemink, Peter and van Westering, Werner and Bharambe, Nitish and Govers, Martinus G.H. and van den Bogaard, Jonas and Stoeller, Bram and Wang, Zhen and Guo, Jerry Jinfeng and Figueroa Manrique, Santiago and Jagutis, Laurynas and Wang, Chenguang and van Raalte, Marc and {Contributors to the LF Energy project Power Grid Model}}, doi = {10.5281/zenodo.8054429}, license = {MPL-2.0}, title = {{PowerGridModel/power-grid-model}}, @@ -89,12 +89,14 @@ If you are using Power Grid Model IO in your research work, please consider citi } @inproceedings{Xiang2023, author = {Xiang, Yu and Salemink, Peter and Stoeller, Bram and Bharambe, Nitish and van Westering, Werner}, - booktitle = {CIRED 2023 - The 27th International Conference and Exhibition on Electricity Distribution}, - title = {Power grid model: A high-performance distribution grid calculation library}, - year = {2023}, + booktitle={27th International Conference on Electricity Distribution (CIRED 2023)}, + title={Power grid model: a high-performance distribution grid calculation library}, + year={2023}, volume={2023}, - number = {}, - pages={1-5} + number={}, + pages={1089-1093}, + keywords={}, + doi={10.1049/icp.2023.0633} } ``` From 3e1da04351f5737b2c760d1502b1710dd5256b78 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Thu, 6 Feb 2025 15:46:17 +0100 Subject: [PATCH 8/8] fix pgm-ds doi Signed-off-by: Martijn Govers --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 38fb8c30..d0a2fe0e 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -164,7 +164,7 @@ references: - title: "PowerGridModel/power-grid-model-ds" repository-code: "https://github.com/PowerGridModel/power-grid-model-ds" - doi: "10.5281/zenodo.8054429" + doi: "10.5281/zenodo.14825565" license: "MPL-2.0" type: software-code authors: