This commit is contained in:
gmatteo 2023-08-18 16:10:56 +02:00
parent 2c74572121
commit 8febda84cc
4 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,6 @@
Release 0.9.4:
* Require pymatgen == 2023.7.17
Release 0.9.3:

View File

@ -13,7 +13,7 @@ name = 'abipy'
# release. 'dev' as a _version_extra string means this is a development version
_version_major = 0
_version_minor = 9
_version_micro = 3 # use '' for first of series, number for 1 and above
_version_micro = 4 # use '' for first of series, number for 1 and above
#_version_extra = 'dev'
_version_extra = '' # Uncomment this for full releases

View File

@ -173,14 +173,14 @@ class ScannerData:
emin=None, emax=None, verbose=1):
"""
Find configurations that differ in energy by less than ene_diff in eV
an relaxed sites that are less than dist_tol Angstrom apart.
with relaxed sites that are less than dist_tol Angstrom apart.
Args:
ene_diff:
dist_tol:
ene_diff: Energy difference in eV.
dist_tol: Tolerance on site distancs in Ang (minimum-image convention is applied).
verbose: Verbosity level.
Return named tuple three arrays: pair_indices with the index of the pair in the df
Return named tuple three arrays: pair_indices with the index of the row in the df
dist_list with distance between the sites and ediff_list with the energy difference.
"""
def difference_matrix(a):
@ -199,7 +199,8 @@ class ScannerData:
_, d2 = pbc_shortest_vectors(self.lattice, xreds[i], xreds[j], return_d2=True)
dist = np.sqrt(float(d2))
if dist > dist_tol: continue
print(f"{i=}, {j=}, ediff:", ediff_mat[i, j], f"{dist=}", "x_i:", xreds[i], "x_j:", xreds[j])
if verbose:
print(f"{i=}, {j=}, ediff:", ediff_mat[i, j], f", {dist=}", ", xred_i:", xreds[i], ", xred_j:", xreds[j])
pair_indices.append((i, j))
dist_list.append(dist)
ediff_list.append(energy[j] - energy[i])

View File

@ -1,6 +1,5 @@
monty
tabulate
#apscheduler<=3.9.1
apscheduler
pydispatcher>=2.0.5
tqdm