Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d201661
Add calculation of SNAP descriptors
jan-janssen Sep 11, 2023
4014f0c
renaming
jan-janssen Sep 11, 2023
0619bdd
add lammps as optional dependency - only unix
jan-janssen Sep 11, 2023
a2aec83
black formatting
jan-janssen Sep 11, 2023
8ab9a86
Add LAMMPS dependency only for unix
jan-janssen Sep 11, 2023
1f93d78
Add shell
jan-janssen Sep 11, 2023
204779e
Add yaml
jan-janssen Sep 11, 2023
8fc6b2c
add pyyaml
jan-janssen Sep 11, 2023
f1130ed
fix order
jan-janssen Sep 11, 2023
da7df81
install pyyaml
jan-janssen Sep 11, 2023
71b214d
Merge remote-tracking branch 'origin/main' into snap
jan-janssen Jan 14, 2024
b26a795
simplify the API
jan-janssen Jan 14, 2024
4f99419
Add more docstrings, refactor the order of the functions and separate…
jan-janssen Mar 8, 2024
d9dcd91
Merge remote-tracking branch 'origin/main' into snap
jan-janssen Mar 8, 2024
416a9cc
black formatting
jan-janssen Mar 8, 2024
2c9f631
remove print functions
jan-janssen Mar 8, 2024
0f881a4
fix tests
jan-janssen Mar 8, 2024
37b253e
Move LAMMPS import to _get_default_parameters() function
jan-janssen Mar 8, 2024
61c15bd
add quadratic tests
jan-janssen Mar 8, 2024
b4f0038
add more tests
jan-janssen Mar 8, 2024
acb4e28
Format black
pyiron-runner Mar 8, 2024
6d47420
execute lammps commands with for loop
jan-janssen Mar 8, 2024
01c71b6
Merge remote-tracking branch 'origin/snap' into snap
jan-janssen Mar 8, 2024
ad4da41
remove outdated conda_merge.py script
jan-janssen Mar 8, 2024
2368240
update lammps version
jan-janssen Mar 8, 2024
6290750
fix windows tests
jan-janssen Mar 8, 2024
3f1a05b
Add links to LAMMPS documentation
jan-janssen Mar 8, 2024
5d3f804
rename get_apre()
jan-janssen Mar 8, 2024
7ad13a8
rename variables
jan-janssen Mar 8, 2024
6934cc2
fix imports in test
jan-janssen Mar 8, 2024
a5cde35
add sorting on the set
jan-janssen Mar 8, 2024
4bb4e4a
compare with reference
jan-janssen Mar 10, 2024
f6d6cd5
Add comment about ignoring LAMMPS crashes
jan-janssen Mar 14, 2024
21dc2a3
rename calc_*() to get_*() for consistency with other descriptors
jan-janssen Mar 14, 2024
054c53f
remove if statement
jan-janssen Mar 14, 2024
f5f191b
Add more docstrings and type hints
jan-janssen Mar 14, 2024
65ece1a
Format black
pyiron-runner Mar 14, 2024
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
4 changes: 4 additions & 0 deletions .ci_support/environment-lammps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
channels:
- conda-forge
dependencies:
- lammps =2023.11.21
3 changes: 3 additions & 0 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Merge conda environment
if: matrix.operating-system != 'windows-latest'
run: tail --lines=+4 .ci_support/environment-lammps.yml >> .ci_support/environment.yml
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
with:
Expand Down
5 changes: 5 additions & 0 deletions structuretoolkit/analyse/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
get_voronoi_vertices,
)
from structuretoolkit.analyse.strain import get_strain
from structuretoolkit.analyse.snap import (
get_snap_descriptor_names,
get_snap_descriptors_per_atom,
get_snap_descriptor_derivatives,
)


def get_symmetry(
Expand Down
Loading