Skip to content

Commit d82aeb4

Browse files
committed
Now seems that the feature has been fixed
1 parent 277fd44 commit d82aeb4

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

Modules/Ensemble.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,8 @@ def update_weights(self, new_dynamical_matrix, newT, update_q = False):
12181218

12191219
# Check if the dynamical matrix has changed
12201220
changed_dyn = np.max([np.max(np.abs(self.current_dyn.dynmats[i] - new_dynamical_matrix.dynmats[i])) for i in range(len(self.current_dyn.q_tot))])
1221-
changed_dyn = changed_dyn > 1e-8
1221+
print("DYN CHANGED BY:", changed_dyn)
1222+
changed_dyn = changed_dyn > 1e-30
12221223

12231224
# Prepare the new displacements
12241225
super_struct0 = self.dyn_0.structure.generate_supercell(self.supercell)
@@ -1234,9 +1235,11 @@ def update_weights(self, new_dynamical_matrix, newT, update_q = False):
12341235
self.current_w = w_new.copy()
12351236
self.current_pols = pols.copy()
12361237
else:
1237-
w_new = self.w_0.copy()
1238-
pols = self.pols_0.copy()
1239-
1238+
w_new = self.current_w.copy()
1239+
pols = self.current_pols.copy()
1240+
#w_new, pols = new_dynamical_matrix.DiagonalizeSupercell()#new_super_dyn.DyagDinQ(0)
1241+
#self.current_w = w_new.copy()
1242+
#self.current_pols = pols.copy()
12401243
# Update sscha energies and forces
12411244
self.sscha_energies[:], self.sscha_forces[:,:,:] = new_dynamical_matrix.get_energy_forces(None, displacement = self.u_disps, w_pols = (w_new, pols))
12421245

tests/test_gradient_evolution/test_relax.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ def test_gradient_comparison(verbose = False):
2929
ens.load(DATA_PATH, 2, 1000)
3030

3131
minim = sscha.SchaMinimizer.SSCHA_Minimizer(ens)
32-
minim.minim_struct = True
32+
minim.minim_struct = False
3333
minim.min_step_dyn = 0.5
3434
minim.min_step_struc = 0.5
3535
minim.meaningful_factor = 1e-10
36+
minim.neglect_symmetries = True
3637
minim.max_ka = 5
3738

3839
class CG:

0 commit comments

Comments
 (0)