Skip to content

Commit 78c6fe8

Browse files
committed
Merge remote-tracking branch 'origin/feature/grid-graphs-with-tikz' into feature/lu-solver-documentation
Signed-off-by: Martijn Govers <Martijn.Govers@Alliander.com>
2 parents 99a1fc8 + b1d6c7e commit 78c6fe8

25 files changed

+188
-176
lines changed

CITATION.cff

+60-15
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,27 @@ authors:
1414
given-names: "Yu"
1515
email: "Tony.Xiang@Alliander.com"
1616
affiliation: "Alliander"
17+
orcid: "https://orcid.org/0000-0001-5889-0067"
1718
- family-names: "Salemink"
1819
given-names: "Peter"
1920
email: "Peter.Salemink@Alliander.com"
2021
affiliation: "Alliander"
22+
- family-names: "Westering"
23+
name-particle: "van"
24+
given-names: "Werner"
25+
email: Werner.van.Westering@Alliander.com
26+
affiliation: "Alliander"
27+
orcid: "https://orcid.org/0000-0002-4058-2581"
2128
- family-names: "Bharambe"
2229
given-names: "Nitish"
2330
email: "Nitish.Bharambe@Alliander.com"
2431
affiliation: "Alliander"
32+
orcid: "https://orcid.org/0009-0007-9694-6077"
2533
- family-names: "Govers"
26-
given-names: "Martinus"
34+
given-names: "Martinus G.H."
2735
email: "Martijn.Govers@Alliander.com"
2836
affiliation: "Alliander"
37+
orcid: "https://orcid.org/0009-0008-6890-8353"
2938
- family-names: "Bogaard"
3039
name-particle: "van den"
3140
given-names: "Jonas"
@@ -37,9 +46,15 @@ authors:
3746
given-names: "Zhen"
3847
email: "Zhen.Wang@Alliander.com"
3948
affiliation: "Alliander"
49+
orcid: "https://orcid.org/0000-0003-4317-6455"
4050
- family-names: "Guo"
41-
given-names: "Jerry"
42-
email: "Jerry.Jinfeng.Guo@Alliander.com"
51+
given-names: "Jerry Jinfeng"
52+
email: "Jerry.Jinfeng.Guo@hotmail.com"
53+
affiliation: "Alliander"
54+
orcid: "https://orcid.org/0000-0002-8065-4084"
55+
- family-names: "Figueroa Manrique"
56+
given-names: "Santiago"
57+
email: "Santiago.Figueroa.Manrique@Alliander.com"
4358
affiliation: "Alliander"
4459
- family-names: "Jagutis"
4560
given-names: "Laurynas"
@@ -54,22 +69,20 @@ authors:
5469
given-names: "Marc"
5570
email: "Marc.van.Raalte@Alliander.com"
5671
affiliation: "Alliander"
57-
- family-names: "Figueroa Manrique"
58-
given-names: "Santiago"
59-
email: "Santiago.Figueroa.Manrique@Alliander.com"
60-
affiliation: "Alliander"
6172
- name: "Contributors to the LF Energy project Power Grid Model"
6273
contact:
6374
- name: "LF Energy project Power Grid Model"
64-
email: "powergridmodel+help@lists.lfenergy.org"
75+
email: "powergridmodel@lists.lfenergy.org"
6576

6677
references:
6778
- title: "Power grid model: A high-performance distribution grid calculation library"
79+
doi: "10.1049/icp.2023.0633"
6880
authors:
6981
- family-names: "Xiang"
7082
given-names: "Yu"
7183
email: Tony.Xiang@Alliander.com
7284
affiliation: "Alliander"
85+
orcid: "https://orcid.org/0000-0001-5889-0067"
7386
- family-names: "Salemink"
7487
given-names: "Peter"
7588
email: Peter.Salemink@Alliander.com
@@ -80,16 +93,43 @@ references:
8093
given-names: "Nitish"
8194
email: Nitish.Bharambe@Alliander.com
8295
affiliation: "Alliander"
96+
orcid: "https://orcid.org/0009-0007-9694-6077"
8397
- family-names: "Westering"
8498
name-particle: "van"
8599
given-names: "Werner"
100+
email: Werner.van.Westering@Alliander.com
101+
affiliation: "Alliander"
102+
orcid: "https://orcid.org/0000-0002-4058-2581"
86103
conference:
87104
name: "CIRED 2023 - The 27th International Conference and Exhibition on Electricity Distribution"
88105
type: conference-paper
89106
year: 2023
90107
volume: 2023
91108
pages: "1-5"
92109

110+
- title: "PowerGridModel/power-grid-model-ds"
111+
repository-code: "https://github.com/PowerGridModel/power-grid-model-ds"
112+
doi: "10.5281/zenodo.14825565"
113+
license: "MPL-2.0"
114+
type: software-code
115+
authors:
116+
- family-names: "Schouten"
117+
given-names: "Jaap"
118+
email: Jaap.Schouten@Alliander.com
119+
affiliation: "Alliander"
120+
- family-names: "Baaijen"
121+
given-names: "Thijs"
122+
email: Thijs.Baaijen@Alliander.com
123+
affiliation: "Alliander"
124+
- family-names: "Koppen"
125+
given-names: "Vincent"
126+
email: Vincent.Koppen@Alliander.com
127+
- family-names: "Voort"
128+
name-particle: "van der"
129+
given-names: "Sven"
130+
email: Sven.van.der.Voort@Alliander.com
131+
- name: "Contributors to the LF Energy project Power Grid Model"
132+
93133
- title: "PowerGridModel/power-grid-model-io"
94134
repository-code: "https://github.com/PowerGridModel/power-grid-model-io"
95135
doi: "10.5281/zenodo.8059257"
@@ -100,6 +140,7 @@ references:
100140
given-names: "Yu"
101141
email: "Tony.Xiang@Alliander.com"
102142
affiliation: "Alliander"
143+
orcid: "https://orcid.org/0000-0001-5889-0067"
103144
- family-names: "Salemink"
104145
given-names: "Peter"
105146
email: "Peter.Salemink@Alliander.com"
@@ -108,10 +149,12 @@ references:
108149
given-names: "Nitish"
109150
email: "Nitish.Bharambe@Alliander.com"
110151
affiliation: "Alliander"
152+
orcid: "https://orcid.org/0009-0007-9694-6077"
111153
- family-names: "Govers"
112-
given-names: "Martinus"
154+
given-names: "Martinus G.H."
113155
email: "Martijn.Govers@Alliander.com"
114156
affiliation: "Alliander"
157+
orcid: "https://orcid.org/0009-0008-6890-8353"
115158
- family-names: "Bogaard"
116159
name-particle: "van den"
117160
given-names: "Jonas"
@@ -123,9 +166,15 @@ references:
123166
given-names: "Zhen"
124167
email: "Zhen.Wang@Alliander.com"
125168
affiliation: "Alliander"
169+
orcid: "https://orcid.org/0000-0003-4317-6455"
126170
- family-names: "Guo"
127-
given-names: "Jerry"
128-
email: "Jerry.Jinfeng.Guo@Alliander.com"
171+
given-names: "Jerry Jinfeng"
172+
email: "Jerry.Jinfeng.Guo@hotmail.com"
173+
affiliation: "Alliander"
174+
orcid: "https://orcid.org/0000-0002-8065-4084"
175+
- family-names: "Figueroa Manrique"
176+
given-names: "Santiago"
177+
email: "Santiago.Figueroa.Manrique@Alliander.com"
129178
affiliation: "Alliander"
130179
- family-names: "Jagutis"
131180
given-names: "Laurynas"
@@ -135,8 +184,4 @@ references:
135184
given-names: "Chenguang"
136185
email: "Chenguang.Wang@Alliander.com"
137186
affiliation: "Alliander"
138-
- family-names: "Figueroa Manrique"
139-
given-names: "Santiago"
140-
email: "Santiago.Figueroa.Manrique@Alliander.com"
141-
affiliation: "Alliander"
142187
- name: "Contributors to the LF Energy project Power Grid Model"

README.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,22 @@ If you are using Power Grid Model in your research work, please consider citing
100100

101101
```bibtex
102102
@software{Xiang_PowerGridModel_power-grid-model,
103-
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}},
103+
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}},
104104
doi = {10.5281/zenodo.8054429},
105105
license = {MPL-2.0},
106106
title = {{PowerGridModel/power-grid-model}},
107107
url = {https://github.com/PowerGridModel/power-grid-model}
108108
}
109109
@inproceedings{Xiang2023,
110110
author = {Xiang, Yu and Salemink, Peter and Stoeller, Bram and Bharambe, Nitish and van Westering, Werner},
111-
booktitle = {CIRED 2023 - The 27th International Conference and Exhibition on Electricity Distribution},
112-
title = {Power grid model: A high-performance distribution grid calculation library},
113-
year = {2023},
111+
booktitle={27th International Conference on Electricity Distribution (CIRED 2023)},
112+
title={Power grid model: a high-performance distribution grid calculation library},
113+
year={2023},
114114
volume={2023},
115-
number = {},
116-
pages={1-5}
115+
number={},
116+
pages={1089-1093},
117+
keywords={},
118+
doi={10.1049/icp.2023.0633}
117119
}
118120
```
119121

docs/images/validation/asym_gen.svg

-7
This file was deleted.

docs/images/validation/asym_gen.svg.license

-3
This file was deleted.

0 commit comments

Comments
 (0)