oops wrong branch

materialsproject · Nov 25, 2024 · 644c12d · 644c12d
1 parent 31f1e1f
commit 644c12d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/pymatgen/core/structure.py b/src/pymatgen/core/structure.py
@@ -4746,7 +4746,7 @@ def merge_sites(self, tol: float = 0.01, mode: Literal["sum", "delete", "average
                 offset = self[i].frac_coords - coords
                 coords += ((offset - np.round(offset)) / (n + 2)).astype(coords.dtype)
                 for key in props:
-                    if props[key] is not None and self[i].properties[key] != props[key]:
+                    if props[key] is not None and np.array_equal(self[i].properties[key], props[key]):
                         if mode.lower()[0] == "a" and isinstance(props[key], float):
                             # update a running total
                             props[key] = props[key] * (n + 1) / (n + 2) + self[i].properties[key] / (n + 2)