Skip to content

Commit 970d23c

Browse files
Update ASE and use MelchionnaNPT (#665)
1 parent 4eb72dc commit 970d23c

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

janus_core/calculations/md.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from ase.io import read
1919
from ase.md.bussi import Bussi
2020
from ase.md.langevin import Langevin
21-
from ase.md.npt import NPT as ASE_NPT
21+
from ase.md.melchionna import MelchionnaNPT
2222
from ase.md.velocitydistribution import (
2323
MaxwellBoltzmannDistribution,
2424
Stationary,
@@ -531,7 +531,7 @@ def __init__(
531531
self.minimize_kwargs["write_kwargs"] = {"filename": opt_file}
532532
self.minimize_kwargs.setdefault("write_results", False)
533533

534-
self.dyn: Langevin | VelocityVerlet | ASE_NPT
534+
self.dyn: Langevin | VelocityVerlet | MelchionnaNPT
535535
self.n_atoms = len(self.struct)
536536

537537
self.offset = 0
@@ -1572,7 +1572,7 @@ def __init__(
15721572
pfactor *= units.fs**2 * units.GPa
15731573
else:
15741574
pfactor = None
1575-
self.dyn = ASE_NPT(
1575+
self.dyn = MelchionnaNPT(
15761576
self.struct,
15771577
timestep=self.timestep,
15781578
temperature_K=self.temp,
@@ -1861,7 +1861,7 @@ def __init__(
18611861
(ensemble_kwargs,) = none_to_dict(ensemble_kwargs)
18621862
self.ttime = thermostat_time * units.fs
18631863

1864-
self.dyn = ASE_NPT(
1864+
self.dyn = MelchionnaNPT(
18651865
self.struct,
18661866
timestep=self.timestep,
18671867
temperature_K=self.temp,
@@ -2052,7 +2052,7 @@ def __init__(
20522052
# convert the pfactor to ASE internal units
20532053
pfactor *= units.fs**2 * units.GPa
20542054

2055-
self.dyn = ASE_NPT(
2055+
self.dyn = MelchionnaNPT(
20562056
self.struct,
20572057
timestep=self.timestep,
20582058
temperature_K=self.temp,

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ classifiers = [
2626
readme = "README.md"
2727

2828
dependencies = [
29-
"ase<4.0,>=3.25",
29+
"ase<4.0,>=3.27",
3030
"click<9,>=8.2.1",
3131
"codecarbon<4.0.0,>=3.0.7",
3232
"numpy<3.0.0,>=1.26.4",

0 commit comments

Comments
 (0)