Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
4a10bb3
temp mods commit
naik-aakash Mar 4, 2024
0ea96a5
Delete debug file src/atomate2/forcefields/flows/test.py
naik-aakash May 6, 2025
c7d9091
Merge branch 'main' of github.com:materialsproject/atomate2 into phon…
JaGeo May 6, 2025
8fca55e
add a batch option to the AseMaker
JaGeo May 6, 2025
5fd612f
fix first test and adapt aseoutput documents
JaGeo May 7, 2025
39b8485
fix some more
JaGeo May 7, 2025
383a2c3
fix documentation
JaGeo May 7, 2025
29da6e4
fix a few linter problems
JaGeo May 7, 2025
7d5a196
fix code
JaGeo May 7, 2025
3be6b52
fix ase jobs tests
JaGeo May 7, 2025
fa03cf2
fi nearly all mypy errors
JaGeo May 7, 2025
e380566
fix some more style problems and linting errors
JaGeo May 8, 2025
b3de466
avoid overwriting of a for loop variable
JaGeo May 8, 2025
5a814b2
fix hopefully last linting error
JaGeo May 8, 2025
8399a66
add another test for the forcefields
JaGeo May 8, 2025
86b7d1b
add uncommented update back and add another test
JaGeo May 8, 2025
3e896ef
new linting fixes
JaGeo May 8, 2025
eea7efa
fix n_steps error
JaGeo May 8, 2025
0f2586a
move OutputDoc into datastore
JaGeo May 8, 2025
697a07b
Update pyproject.toml
JaGeo May 8, 2025
3ecb448
Update pyproject.toml
JaGeo May 8, 2025
a158db7
move InputDoc to Datastore
JaGeo May 8, 2025
9e87cbf
Merge branch 'phonon_workflow_ff_mod' of github.com:naik-aakash/atoma…
JaGeo May 9, 2025
9965ba3
fix order issue that does not show up locally
JaGeo May 9, 2025
fe38493
fix data storage
JaGeo May 9, 2025
b2061f3
update data
JaGeo May 12, 2025
452f747
fix output doc
JaGeo May 15, 2025
73adc85
change data store
JaGeo May 16, 2025
2af321b
test out more with regard to the datastore
JaGeo May 21, 2025
bc66653
fix merge conflicts
JaGeo May 21, 2025
86b4c7e
fix some other points
JaGeo May 22, 2025
38f94ec
fix some other points
JaGeo May 22, 2025
d672fe7
fix some other points
JaGeo May 22, 2025
600857f
fix mix up between datastore and other ase objects
JaGeo May 22, 2025
3d5d2d2
add more to datastore
JaGeo May 23, 2025
d0f7e04
try to fix conflicts
JaGeo Jun 9, 2025
b10fb0a
more fixes
JaGeo Jun 9, 2025
38ad652
fix conflicts
JaGeo Jun 9, 2025
2ee7067
simplify
JaGeo Jun 9, 2025
e3c8130
simplify
JaGeo Jun 9, 2025
db4449b
fix linting
JaGeo Jun 9, 2025
c657a0d
remove print
JaGeo Jun 9, 2025
bfde3b6
remove print
JaGeo Jun 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/atomate2/ase/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
from dataclasses import dataclass, field
from typing import TYPE_CHECKING

from ase.io import Trajectory as AseTrajectory
from emmet.core.vasp.calculation import StoreTrajectoryOption
from jobflow import Maker, job
from pymatgen.core import Molecule, Structure
from pymatgen.core.trajectory import Trajectory as PmgTrajectory
from pymatgen.io.ase import AseAtomsAdaptor

from atomate2.ase.schemas import AseResult, AseTaskDoc
Expand All @@ -27,7 +25,9 @@

from atomate2.ase.schemas import AseMoleculeTaskDoc, AseStructureTaskDoc

_ASE_DATA_OBJECTS = [PmgTrajectory, AseTrajectory]
_ASE_DATA_OBJECTS = [
"output", # will put everything in data store
]


@dataclass
Expand Down Expand Up @@ -119,7 +119,7 @@ def run_ase(
self,
mol_or_struct: Structure | Molecule,
prev_dir: str | Path | None = None,
) -> AseResult:
) -> AseResult | list[AseResult]:
"""
Run ASE, can be re-implemented in subclasses.

Expand Down Expand Up @@ -237,16 +237,16 @@ def make(

def run_ase(
self,
mol_or_struct: Structure | Molecule,
mol_or_struct: Structure | Molecule | list[Molecule] | list[Structure],
prev_dir: str | Path | None = None,
) -> AseResult:
) -> AseResult | list[AseResult]:
"""
Relax a structure or molecule using ASE, not as a job.
Relax a structure, molecule or a batch of those using ASE, not as a job.

Parameters
----------
mol_or_struct: .Molecule or .Structure
pymatgen molecule or structure
mol_or_struct: .Molecule or .Structure or list[.Molecule] or list[.Structure]
pymatgen molecule or structure or lists of those
prev_dir : str or Path or None
A previous calculation directory to copy output files from. Unused, just
added to match the method signature of other makers.
Expand Down
Loading
Loading