Skip to content

Commit 3c4e178

Browse files
authored
Merge branch 'master' into incar-multiline-str
2 parents 20d30ca + bd29947 commit 3c4e178

File tree

13 files changed

+266
-216
lines changed

13 files changed

+266
-216
lines changed

dev_scripts/periodic_table_resources/_periodic_table.yaml

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ Common oxidation states:
11431143
Li: [1]
11441144
Be: [2]
11451145
B: [3]
1146-
C: [-4, 4]
1146+
C: [-4, -3, -2, -1, 0, 1, 2, 3, 4]
11471147
N: [-3, 3, 5]
11481148
O: [-2]
11491149
F: [-1]
@@ -1170,7 +1170,8 @@ Common oxidation states:
11701170
Ge: [-4, 2, 4]
11711171
As: [-3, 3, 5]
11721172
Se: [-2, 2, 4, 6]
1173-
Br: [-1, 1, 3, 5, 7]
1173+
Br: [-1, 1, 3, 5]
1174+
Kr: [2]
11741175
Rb: [1]
11751176
Sr: [2]
11761177
Y: [3]
@@ -1188,6 +1189,7 @@ Common oxidation states:
11881189
Sb: [-3, 3, 5]
11891190
Te: [-2, 2, 4, 6]
11901191
I: [-1, 1, 3, 5, 7]
1192+
Xe: [2, 4, 6]
11911193
Cs: [1]
11921194
Ba: [2]
11931195
La: [3]
@@ -1208,7 +1210,7 @@ Common oxidation states:
12081210
Hf: [4]
12091211
Ta: [5]
12101212
W: [4, 6]
1211-
Re: [4]
1213+
Re: [4, 7]
12121214
Os: [4]
12131215
Ir: [3, 4]
12141216
Pt: [2, 4]
@@ -1236,13 +1238,15 @@ Common oxidation states:
12361238
Md: [3]
12371239
No: [3]
12381240
Lr: [3]
1241+
Rf: [4]
12391242
Critical temperature:
12401243
unit: K
12411244
reference:
12421245
https://en.wikipedia.org/wiki/Critical_points_of_the_elements_(data_page)
1243-
data: {H: 33, He: 5.19, Li: 3223, N: 126.2, O: 154.6, F: 144, Ne: 44.4, Na:
1244-
2573, P: 994, S: 1314, Cl: 417, Ar: 150.8, K: 2223, As: 1700, Se: 1766, Br:
1245-
586, Kr: 209.4, Rb: 2093, I: 819, Xe: 289.7, Cs: 1938, Hg: 1750, Rn: 377}
1246+
data: {H: 32.97, He: 5.19, Li: 3223, N: 126.21, O: 154.59, F: 144.13, Ne: 44.4,
1247+
Na: 2573, P: 994, S: 1314, Cl: 416.9, Ar: 150.87, K: 2223, As: 1673, Se:
1248+
1766, Br: 588, Kr: 209.41, Rb: 2093, I: 819, Xe: 289.77, Cs: 1938, Hg:
1249+
1750, Rn: 377}
12461250
Density of solid:
12471251
unit: kg m^-3
12481252
reference: https://en.wikipedia.org/wiki/Densities_of_the_elements_(data_page)
@@ -1262,20 +1266,22 @@ Electrical resistivity:
12621266
unit: ohm m
12631267
reference:
12641268
https://en.wikipedia.org/wiki/Electrical_resistivities_of_the_elements_(data_page)
1265-
data: {Li: 9.5e-08, Be: 3.8e-08, B: 15000.0, C: 1e-05, Na: 4.9e-08, Mg:
1266-
4.4e-08, Al: 2.7e-08, Si: 0.001, P: 1e-07, S: 2000000000000000.0, Cl: 10.0,
1267-
K: 7.5e-08, Ca: 3.4e-08, Sc: 5.5e-07, Ti: 4e-07, V: 2e-07, Cr: 1.27e-07, Mn:
1268-
1.44e-06, Fe: 1e-07, Co: 6e-08, Ni: 7.2e-08, Cu: 1.72e-08, Zn: 6e-08, Ga:
1269-
1.4e-07, Ge: 0.0005, As: 3.3e-07, Br: 78000000000.0, Rb: 1.33e-07, Sr:
1270-
1.35e-07, Y: 6e-07, Zr: 4.33e-07, Nb: 1.52e-07, Mo: 5.5e-08, Tc: 2.2e-07,
1271-
Ru: 7.1e-08, Rh: 4.3e-08, Pd: 1.08e-07, Ag: 1.63e-08, Cd: 7e-08, In: 8e-08,
1272-
Sn: 1.15e-07, Sb: 4e-07, Te: 0.0001, I: 13000000.0, Cs: 2.1e-07, Ba: 3.4e-07,
1273-
La: 6.15e-07, Ce: 7.4e-07, Pr: 7e-07, Nd: 6.43e-07, Pm: 7.5e-07, Sm: 9.4e-07,
1274-
Eu: 9e-07, Gd: 1.31e-06, Tb: 1.15e-06, Dy: 9.26e-07, Ho: 8.14e-07, Er:
1275-
8.6e-07, Tm: 6.76e-07, Yb: 2.5e-07, Lu: 5.8e-07, Hf: 3.4e-07, Ta: 1.35e-07,
1276-
W: 5.4e-08, Re: 1.8e-07, Os: 8.1e-08, Ir: 4.7e-08, Pt: 1.06e-07, Au: 2.2e-08,
1277-
Hg: 9.6e-07, Tl: 1.5e-07, Pb: 2.1e-07, Bi: 1.3e-06, Po: 4e-07, Ra: 1e-06, Th:
1278-
1.5e-07, Pa: 1.8e-07, U: 2.8e-07, Np: 1.2e-06, Pu: 1.5e-06}
1269+
data: {Li: 9.28e-08, Be: 3.56e-08, B: 15000.0, C: 1e-05, Na: 4.77e-08, Mg:
1270+
4.39e-08, Al: 2.65e-08, Si: 0.001, P: 1e-07, S: 2000000000000000.0, Cl:
1271+
10.0, K: 7.2e-08, Ca: 3.36e-08, Sc: 5.62e-07, Ti: 4.2e-07, V: 1.97e-07, Cr:
1272+
1.25e-07, Mn: 1.44e-06, Fe: 9.61e-08, Co: 6.24e-08, Ni: 6.93e-08, Cu:
1273+
1.678e-08, Zn: 5.9e-08, Ga: 1.4e-07, Ge: 0.0005, As: 3.33e-07, Br:
1274+
78000000000.0, Rb: 1.28e-07, Sr: 1.32e-07, Y: 5.96e-07, Zr: 4.21e-07, Nb:
1275+
1.52e-07, Mo: 5.34e-08, Tc: 2e-07, Ru: 7.1e-08, Rh: 4.33e-08, Pd:
1276+
1.054e-07, Ag: 1.587e-08, Cd: 7.27e-08, In: 8.37e-08, Sn: 1.1e-07, Sb:
1277+
4.17e-07, Te: 0.0001, I: 13000000.0, Cs: 2.05e-07, Ba: 3.32e-07, La:
1278+
6.15e-07, Ce: 7.44e-07, Pr: 7e-07, Nd: 6.43e-07, Pm: 7.5e-07, Sm: 9.4e-07,
1279+
Eu: 9e-07, Gd: 1.31e-06, Tb: 1.15e-06, Dy: 9.26e-07, Ho: 8.14e-07, Er:
1280+
8.6e-07, Tm: 6.76e-07, Yb: 2.5e-07, Lu: 5.82e-07, Hf: 3.31e-07, Ta:
1281+
1.31e-07, W: 5.28e-08, Re: 1.93e-07, Os: 8.12e-08, Ir: 4.71e-08, Pt:
1282+
1.05e-07, Au: 2.214e-08, Hg: 9.61e-07, Tl: 1.8e-07, Pb: 2.08e-07, Bi:
1283+
1.29e-06, Po: 4e-07, Ra: 1e-06, Th: 1.54e-07, Pa: 1.91e-07, U: 2.8e-07, Np:
1284+
1.22e-06, Pu: 1.5e-06, Am: 6.89e-07, Cm: 1.25e-06}
12791285
Electron affinity:
12801286
unit: eV
12811287
reference: https://en.wikipedia.org/wiki/Electron_affinity_(data_page)
@@ -1673,6 +1679,8 @@ Electronic structure:
16731679
Lr:
16741680
'0': '[Rn].5f14.7s2.7p1'
16751681
'3': '[Rn].5f14'
1682+
Rf:
1683+
'0': '[Rn].5f14.6d2.7s2'
16761684
Ground level:
16771685
reference:
16781686
https://physics.nist.gov/cgi-bin/ASD/ie.pl?spectra=H-DS+i&units=1&at_num_out=on&el_name_out=on&shells_out=on&level_out=on&e_out=0&unc_out=on&biblio=on

dev_scripts/periodic_table_resources/elemental_properties.yaml

Lines changed: 92 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,8 +1560,6 @@ Coefficient of linear thermal expansion:
15601560
Zn: 30.2
15611561
Zr: 5.7
15621562
Common oxidation states:
1563-
# TODO: the source is very likely from wikipedia but our data need to be updated,
1564-
# for example the data for carbon shouldn't be only -4 or 4
15651563
reference: "https://en.wikipedia.org/wiki/Template:List_of_oxidation_states_of_the_elements"
15661564
data:
15671565
Ac: [3]
@@ -1576,8 +1574,8 @@ Common oxidation states:
15761574
Be: [2]
15771575
Bi: [3]
15781576
Bk: [3]
1579-
Br: [-1, 1, 3, 5, 7]
1580-
C: [-4, 4]
1577+
Br: [-1, 1, 3, 5]
1578+
C: [-4, -3, -2, -1, 0, 1, 2, 3, 4]
15811579
Ca: [2]
15821580
Cd: [2]
15831581
Ce: [3, 4]
@@ -1607,6 +1605,7 @@ Common oxidation states:
16071605
In: [3]
16081606
Ir: [3, 4]
16091607
K: [1]
1608+
Kr: [2]
16101609
La: [3]
16111610
Li: [1]
16121611
Lr: [3]
@@ -1635,7 +1634,8 @@ Common oxidation states:
16351634
Pu: [4]
16361635
Ra: [2]
16371636
Rb: [1]
1638-
Re: [4]
1637+
Re: [4, 7]
1638+
Rf: [4]
16391639
Rh: [3]
16401640
Ru: [3, 4]
16411641
S: [-2, 2, 4, 6]
@@ -1657,40 +1657,40 @@ Common oxidation states:
16571657
U: [6]
16581658
V: [5]
16591659
W: [4, 6]
1660+
Xe: [2, 4, 6]
16601661
Y: [3]
16611662
Yb: [3]
16621663
Zn: [2]
16631664
Zr: [4]
16641665
D: [-1, 1]
16651666
T: [-1, 1]
16661667
Critical temperature:
1667-
# TODO: need to update with wikipedia
16681668
reference: "https://en.wikipedia.org/wiki/Critical_points_of_the_elements_(data_page)"
16691669
unit: K
16701670
data:
1671-
Ar: 150.8
1672-
As: 1700
1673-
Br: 586
1674-
Cl: 417
1671+
Ar: 150.87
1672+
As: 1673
1673+
Br: 588
1674+
Cl: 416.9
16751675
Cs: 1938
1676-
F: 144
1677-
H: 33
1676+
F: 144.13
1677+
H: 32.97
16781678
He: 5.19
16791679
Hg: 1750
16801680
I: 819
16811681
K: 2223
1682-
Kr: 209.4
1682+
Kr: 209.41
16831683
Li: 3223
1684-
N: 126.2
1684+
N: 126.21
16851685
Na: 2573
16861686
Ne: 44.4
1687-
O: 154.6
1687+
O: 154.59
16881688
P: 994
16891689
Rb: 2093
16901690
Rn: 377
16911691
S: 1314
16921692
Se: 1766
1693-
Xe: 289.7
1693+
Xe: 289.77
16941694
Density of solid:
16951695
reference: "https://en.wikipedia.org/wiki/Densities_of_the_elements_(data_page)" # WEL
16961696
unit: kg m^-3
@@ -1777,91 +1777,94 @@ Density of solid:
17771777
Yb: 6570
17781778
Zn: 7140
17791779
Zr: 6511
1780-
Electrical resistivity: # TODO: need validate/update
1780+
Electrical resistivity:
17811781
reference: "https://en.wikipedia.org/wiki/Electrical_resistivities_of_the_elements_(data_page)"
17821782
unit: ohm m
17831783
factor: 1e-8
17841784
data: # 293 K (20 °C)
1785-
Ag: 1.63
1786-
Al: 2.7
1787-
As: 33
1788-
Au: 2.2
1785+
Ag: 1.587
1786+
Al: 2.65
1787+
Am: 68.9 # room temperature
1788+
As: 33.3
1789+
Au: 2.214
17891790
B: 1.5e12
1790-
Ba: 34
1791-
Be: 3.8
1792-
Bi: 130
1791+
Ba: 33.2
1792+
Be: 3.56
1793+
Bi: 129
17931794
Br: 7.8e18
1794-
C: 1000 # direction dependent
1795-
Ca: 3.4
1796-
Cd: 7
1797-
Ce: 74
1798-
Cl: 1e9
1799-
Co: 6
1800-
Cr: 12.7
1801-
Cs: 21
1802-
Cu: 1.72
1803-
Dy: 92.6
1804-
Er: 86.0
1805-
Eu: 90
1806-
Fe: 10
1795+
C: 1000 # graphite (direction dependent)
1796+
Ca: 3.36
1797+
Cd: 7.27 # 22 °C
1798+
Ce: 74.4 # gamma, polycrystalline
1799+
Cl: 1e9 # > 1e9
1800+
Cm: 125 # room temperature
1801+
Co: 6.24
1802+
Cr: 12.5
1803+
Cs: 20.5
1804+
Cu: 1.678
1805+
Dy: 92.6 # alpha, polycrystalline
1806+
Er: 86.0 # polycrystalline
1807+
Eu: 90 # polycrystalline
1808+
Fe: 9.61
18071809
Ga: 14
1808-
Gd: 131
1809-
Ge: 50000
1810-
Hf: 34
1811-
Hg: 96
1812-
Ho: 81.4
1813-
I: 1.3e15
1814-
In: 8
1815-
Ir: 4.7
1816-
K: 7.5
1817-
La: 61.5
1818-
Li: 9.5
1819-
Lu: 58
1820-
Mg: 4.4
1810+
Gd: 131 # alpha, polycrystalline
1811+
Ge: 50000 # about
1812+
Hf: 33.1
1813+
Hg: 96.1 # 25 °C
1814+
Ho: 81.4 # polycrystalline
1815+
I: 1.3e15 # 0 °C
1816+
In: 8.37
1817+
Ir: 4.71
1818+
K: 7.2
1819+
La: 61.5 # alpha, polycrystalline
1820+
Li: 9.28
1821+
Lu: 58.2 # polycrystalline
1822+
Mg: 4.39
18211823
Mn: 144
1822-
Mo: 5.5
1823-
Na: 4.9
1824+
Mo: 5.34
1825+
Na: 4.77
18241826
Nb: 15.2
1825-
Nd: 64.3
1826-
Ni: 7.2
1827-
Np: 120
1828-
Os: 8.1
1827+
Nd: 64.3 # alpha, polycrystalline
1828+
Ni: 6.93
1829+
Np: 122 # 22 °C
1830+
Os: 8.12 # 0 °C
18291831
P: 10
1830-
Pa: 18
1831-
Pb: 21
1832-
Pd: 10.8
1833-
Pm: 75
1834-
Po: 40
1835-
Pr: 70
1836-
Pt: 10.6
1832+
Pa: 19.1 # 22 °C
1833+
Pb: 20.8
1834+
Pd: 10.54
1835+
Pm: 75 # alpha, polycrystalline (estimated)
1836+
Po: 40 # 0 °C
1837+
Pr: 70 # alpha, polycrystalline
1838+
Pt: 10.5
18371839
Pu: 150
18381840
Ra: 100
1839-
Rb: 13.3
1840-
Re: 18
1841-
Rh: 4.3
1841+
Rb: 12.8
1842+
Re: 19.3
1843+
Rh: 4.33
18421844
Ru: 7.1
1843-
S: 2e23
1844-
Sb: 40
1845-
Sc: 55
1846-
Si: 100000
1847-
Sm: 94
1848-
Sn: 11.5
1849-
Sr: 13.5
1850-
Ta: 13.5
1851-
Tb: 115
1852-
Tc: 22
1853-
Te: 10000
1854-
Th: 15
1855-
Ti: 40
1856-
Tl: 15
1857-
Tm: 67.6
1845+
S: 2e23 # amorphous
1846+
Sb: 41.7
1847+
Sc: 56.2
1848+
# Se: "high"
1849+
Si: 100000 # about
1850+
Sm: 94 # alpha, polycrystalline
1851+
Sn: 11
1852+
Sr: 13.2
1853+
Ta: 13.1
1854+
Tb: 115 # alpha, polycrystalline
1855+
Tc: 20
1856+
Te: 10000 # about
1857+
Th: 15.4 # 22 °C
1858+
Ti: 42
1859+
Tl: 18
1860+
Tm: 67.6 # polycrystalline
18581861
U: 28
1859-
V: 20
1860-
W: 5.4
1861-
Y: 60
1862-
Yb: 25.0
1863-
Zn: 6.0
1864-
Zr: 43.3
1862+
V: 19.7
1863+
W: 5.28
1864+
Y: 59.6
1865+
Yb: 25.0 # beta, polycrystalline
1866+
Zn: 5.9
1867+
Zr: 42.1
18651868
Electronic structure:
18661869
reference: "Kramida, A., Ralchenko, Yu., Reader, J., and NIST ASD Team (2023). NIST Atomic Spectra Database (ver. 5.11). https://physics.nist.gov/asd [2024, June 3]. National Institute of Standards and Technology, Gaithersburg, MD. DOI: https://doi.org/10.18434/T4W30F"
18671870
data:
@@ -2133,6 +2136,8 @@ Electronic structure:
21332136
Re:
21342137
"0": "[Xe].4f14.5d5.6s2"
21352138
"4": "[Xe].4f14.5d3"
2139+
Rf:
2140+
"0": "[Rn].5f14.6d2.7s2"
21362141
Rh:
21372142
"0": "[Kr].4d8.5s1"
21382143
"3": "[Kr].4d6"

src/pymatgen/analysis/bond_valence.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ def add_oxidation_state_by_site_fraction(structure: Structure, oxidation_states:
478478
for j, (el, occu) in enumerate(get_z_ordered_elmap(site.species)):
479479
specie = Species(el.symbol, oxidation_states[idx][j])
480480
new_sp[specie] += occu
481-
structure[idx] = new_sp
481+
structure[idx] = new_sp # type:ignore[assignment]
482482
return structure
483483
except IndexError:
484484
raise ValueError("Oxidation state of all sites must be specified in the list.")

src/pymatgen/analysis/local_env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ def get_local_order_parameters(self, structure: Structure, n: int):
682682
params.append(tmp)
683683
lsops = LocalStructOrderParams(types, parameters=params)
684684
sites = [structure[n], *self.get_nn(structure, n)]
685-
lostop_vals = lsops.get_order_parameters(sites, 0, indices_neighs=list(range(1, cn + 1)))
685+
lostop_vals = lsops.get_order_parameters(sites, 0, indices_neighs=list(range(1, cn + 1))) # type:ignore[arg-type]
686686
dct = {}
687687
for idx, lsop in enumerate(lostop_vals):
688688
dct[names[idx]] = lsop

src/pymatgen/analysis/magnetism/analyzer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,8 @@ def _add_structures(ordered_structures, ordered_structures_origins, structures_t
983983

984984
for origin, trans in self.transformations.items():
985985
structures_to_add = trans.apply_transformation(
986-
self.sanitized_structure, return_ranked_list=self.num_orderings
986+
self.sanitized_structure,
987+
return_ranked_list=self.num_orderings, # type:ignore[arg-type]
987988
)
988989
ordered_structures, ordered_structures_origins = _add_structures(
989990
ordered_structures,

0 commit comments

Comments
 (0)