Skip to content

Commit 28e20b1

Browse files
authored
Merge branch 'master' into core-surface
2 parents b72ab44 + bb68c78 commit 28e20b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+629
-684
lines changed

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.md

Lines changed: 14 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/pymatgen.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
All examples are housed at [matgenb]. Please consult this resource first.
2+
3+
If there are questions that cannot be found in the examples, you may use the [pymatgen MatSci forum] or [GitHub discussion].
4+
5+
[matgenb]: https://matgenb.materialsvirtuallab.org/
6+
[pymatgen MatSci forum]: https://matsci.org/pymatgen
7+
[github discussion]: https://github.com/materialsproject/pymatgen/discussions

examples/aims_io/FHI-aims-example.ipynb

Lines changed: 0 additions & 151 deletions
This file was deleted.

pymatgen/alchemy/materials.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030

3131

3232
class TransformedStructure(MSONable):
33-
"""Container object for new structures that include history of
34-
transformations.
33+
"""Container for new structures that include history of transformations.
3534
3635
Each transformed structure is made up of a sequence of structures with
3736
associated transformation history.

pymatgen/analysis/chemenv/coordination_environments/chemenv_strategies.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ def from_dict(cls, dct: dict) -> Self:
12651265

12661266

12671267
class NbSetWeight(MSONable, abc.ABC):
1268-
"""Abstract object for neighbors sets weights estimations."""
1268+
"""Abstract base class for neighbor set weight estimations."""
12691269

12701270
@abc.abstractmethod
12711271
def as_dict(self):
@@ -1282,7 +1282,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
12821282
additional_info: Additional information.
12831283
12841284
Returns:
1285-
Weight of the neighbors set.
1285+
float: Weight of the neighbors set.
12861286
"""
12871287

12881288

@@ -1313,7 +1313,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
13131313
additional_info: Additional information.
13141314
13151315
Returns:
1316-
Weight of the neighbors set.
1316+
float: Weight of the neighbors set.
13171317
"""
13181318
return self.aw(nb_set=nb_set)
13191319

@@ -1534,7 +1534,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
15341534
additional_info: Additional information.
15351535
15361536
Returns:
1537-
Weight of the neighbors set.
1537+
float: Weight of the neighbors set.
15381538
"""
15391539
fda_list = self.fda(nb_set=nb_set)
15401540
return self.eval(fda_list=fda_list)
@@ -1680,7 +1680,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
16801680
additional_info: Additional information.
16811681
16821682
Returns:
1683-
Weight of the neighbors set.
1683+
float: Weight of the neighbors set.
16841684
"""
16851685
effective_csm = get_effective_csm(
16861686
nb_set=nb_set,
@@ -1791,7 +1791,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
17911791
additional_info: Additional information.
17921792
17931793
Returns:
1794-
Weight of the neighbors set.
1794+
float: Weight of the neighbors set.
17951795
"""
17961796
effcsm = get_effective_csm(
17971797
nb_set=nb_set,
@@ -2006,7 +2006,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
20062006
additional_info: Additional information.
20072007
20082008
Returns:
2009-
Weight of the neighbors set.
2009+
float: Weight of the neighbors set.
20102010
"""
20112011
return self.cn_weights[len(nb_set)]
20122012

@@ -2186,7 +2186,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
21862186
additional_info: Additional information.
21872187
21882188
Returns:
2189-
Weight of the neighbors set.
2189+
float: Weight of the neighbors set.
21902190
"""
21912191
return self.area_weight(
21922192
nb_set=nb_set,
@@ -2379,7 +2379,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
23792379
additional_info: Additional information.
23802380
23812381
Returns:
2382-
Weight of the neighbors set.
2382+
float: Weight of the neighbors set.
23832383
"""
23842384
return self.weight_rf.eval(nb_set.distance_plateau())
23852385

@@ -2446,7 +2446,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
24462446
additional_info: Additional information.
24472447
24482448
Returns:
2449-
Weight of the neighbors set.
2449+
float: Weight of the neighbors set.
24502450
"""
24512451
return self.weight_rf.eval(nb_set.angle_plateau())
24522452

@@ -2509,7 +2509,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
25092509
additional_info: Additional information.
25102510
25112511
Returns:
2512-
Weight of the neighbors set.
2512+
float: Weight of the neighbors set.
25132513
"""
25142514
cn = cn_map[0]
25152515
isite = nb_set.isite
@@ -2590,7 +2590,7 @@ def weight(self, nb_set, structure_environments, cn_map=None, additional_info=No
25902590
additional_info: Additional information.
25912591
25922592
Returns:
2593-
Weight of the neighbors set.
2593+
float: Weight of the neighbors set.
25942594
"""
25952595
cn = cn_map[0]
25962596
isite = nb_set.isite

pymatgen/analysis/cost.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def get_entries(self, chemsys):
112112

113113
@singleton
114114
class CostDBElements(CostDBCSV):
115-
"""Singleton object that provides the cost data for elements."""
115+
"""Singleton that provides the cost data for elements."""
116116

117117
def __init__(self):
118118
CostDBCSV.__init__(self, f"{module_dir}/costdb_elements.csv")

pymatgen/analysis/ewald.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ def _recurse(self, matrix, m_list, indices, output_m_list=None):
638638
indices: Set of indices which haven't had a permutation
639639
performed on them.
640640
"""
641-
# check to see if we've found all the solutions that we need
641+
# Check if we've found all the solutions that we need
642642
if self._finished:
643643
return
644644

pymatgen/analysis/fragmenter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def _fragment_one_level(self, old_frag_dict: dict) -> dict:
166166
"""
167167
Perform one step of iterative fragmentation on a list of molecule graphs. Loop through the graphs,
168168
then loop through each graph's edges and attempt to remove that edge in order to obtain two
169-
disconnected subgraphs, aka two new fragments. If successful, check to see if the new fragments
169+
disconnected subgraphs, aka two new fragments. If successful, check if the new fragments
170170
are already present in self.unique_fragments, and append them if not. If unsuccessful, we know
171171
that edge belongs to a ring. If we are opening rings, do so with that bond, and then again
172172
check if the resulting fragment is present in self.unique_fragments and add it if it is not.

pymatgen/analysis/magnetism/analyzer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def __init__(
161161
except ValueError:
162162
warnings.warn(f"Could not assign valences for {structure.reduced_formula}")
163163

164-
# check to see if structure has magnetic moments
164+
# Check if structure has magnetic moments
165165
# on site properties or species spin properties,
166166
# prioritize site properties
167167

pymatgen/analysis/reaction_calculator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737

3838
class BalancedReaction(MSONable):
39-
"""An object representing a complete chemical reaction."""
39+
"""Represent a complete chemical reaction."""
4040

4141
# Tolerance for determining if a particular component fraction is > 0.
4242
TOLERANCE = 1e-6

0 commit comments

Comments
 (0)