From de34eda5e3a838cde93c446999f4f9fc2c49c858 Mon Sep 17 00:00:00 2001 From: "Haoyu (Daniel)" Date: Mon, 22 Apr 2024 16:27:00 +0800 Subject: [PATCH] revert changes that break tests --- pymatgen/analysis/magnetism/heisenberg.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pymatgen/analysis/magnetism/heisenberg.py b/pymatgen/analysis/magnetism/heisenberg.py index 497d672a00a..8d5922aa4db 100644 --- a/pymatgen/analysis/magnetism/heisenberg.py +++ b/pymatgen/analysis/magnetism/heisenberg.py @@ -211,7 +211,6 @@ def _get_nn_dict(self): dist = round(cs[-1], 2) # i_j distance j = cs[2] # j index - j_key = None for key, value in unique_site_ids.items(): if j in key: j_key = value @@ -282,7 +281,6 @@ def _get_exchange_df(self): # s_i_sign = np.sign(sgraph.structure.site_properties['magmom'][i]) s_i = sgraph.structure.site_properties["magmom"][idx] - i_index = 0 for k, v in unique_site_ids.items(): if idx in k: i_index = v @@ -299,20 +297,17 @@ def _get_exchange_df(self): # s_j_sign = np.sign(sgraph.structure.site_properties['magmom'][j_site]) s_j = sgraph.structure.site_properties["magmom"][j_site] - j_index = 0 for k, v in unique_site_ids.items(): if j_site in k: j_index = v # Determine order of connection - order = "" if abs(dist - dists["nn"]) <= tol: order = "-nn" elif abs(dist - dists["nnn"]) <= tol: order = "-nnn" elif abs(dist - dists["nnnn"]) <= tol: order = "-nnnn" - j_ij = f"{i_index}-{j_index}{order}" j_ji = f"{j_index}-{i_index}{order}" @@ -398,8 +393,6 @@ def get_low_energy_orderings(self): fm_struct, afm_struct = None, None mag_min = np.inf mag_max = 0.001 - fm_e = 0 - afm_e = 0 fm_e_min = 0 afm_e_min = 0 @@ -595,16 +588,15 @@ def _get_j_exc(self, i, j, dist): j_exc (float): Exchange parameter in meV """ # Get unique site identifiers - i_index = 0 - j_index = 0 for k, v in self.unique_site_ids.items(): if i in k: i_index = v if j in k: j_index = v - # Determine order of interaction order = "" + + # Determine order of interaction if abs(dist - self.dists["nn"]) <= self.tol: order = "-nn" elif abs(dist - self.dists["nnn"]) <= self.tol: @@ -966,16 +958,15 @@ def _get_j_exc(self, i, j, dist): j_exc (float): Exchange parameter in meV """ # Get unique site identifiers - i_index = 0 - j_index = 0 for k in self.unique_site_ids: if i in k: i_index = self.unique_site_ids[k] if j in k: j_index = self.unique_site_ids[k] - # Determine order of interaction order = "" + + # Determine order of interaction if abs(dist - self.dists["nn"]) <= self.tol: order = "-nn" elif abs(dist - self.dists["nnn"]) <= self.tol: