Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MALA for multiple elements #606

Draft
wants to merge 17 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d145d55
Some small changes for the twoelement case
RandomDefaultUser Nov 15, 2024
ffe13c5
Bispectrum descriptor calculation for two elements in principle works
RandomDefaultUser Nov 15, 2024
a0ff258
Parallel processing works in principle
RandomDefaultUser Nov 19, 2024
7e4fb74
Merge remote-tracking branch 'refs/remotes/fork_lenz/develop' into mu…
RandomDefaultUser Nov 29, 2024
6b81953
Adapted bispectrum file to new internal nomenclature
RandomDefaultUser Nov 29, 2024
64956b8
Started implementing elemental weights
RandomDefaultUser Nov 29, 2024
62f3304
Added test for atoms to LAMMPS data
RandomDefaultUser Dec 2, 2024
240ca44
Made adjustable weights available
RandomDefaultUser Dec 2, 2024
a6ff4c3
Added runfiles for multielement Gaussian grid
RandomDefaultUser Dec 2, 2024
ace21a9
Atomic density formula working for two elements
RandomDefaultUser Dec 2, 2024
907e254
Three elements in principle work, but atomic density formula not for …
RandomDefaultUser Dec 2, 2024
8823bda
Testing some things
RandomDefaultUser Dec 5, 2024
27aa15d
Fixed parser to allow for sampling LDOS with over 1000 cube files
RandomDefaultUser Dec 9, 2024
5c08437
More testing
RandomDefaultUser Dec 10, 2024
c34a926
Merge branch 'refs/heads/large_ldos_sampling' into multielement_multidos
RandomDefaultUser Dec 10, 2024
f84dd75
Everything after second component was missing from structure factor c…
RandomDefaultUser Dec 13, 2024
9dd9a34
Atomic density formula for multiple elements works now
RandomDefaultUser Dec 16, 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
Prev Previous commit
Next Next commit
Adapted bispectrum file to new internal nomenclature
  • Loading branch information
RandomDefaultUser committed Nov 29, 2024
commit 6b81953ca215cec9a4d87d8808851d4d4e7936e7
8 changes: 4 additions & 4 deletions mala/descriptors/bispectrum.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def __calculate_lammps(self, outdir, **kwargs):
# general LAMMPS import.
from lammps import constants as lammps_constants

if len(set(self.atoms.numbers)) > 2:
if len(set(self._atoms.numbers)) > 2:
raise ValueError(
"MALA can only compute bispectrum descriptors for 1- or "
"2-element systems currently."
Expand Down Expand Up @@ -168,21 +168,21 @@ def __calculate_lammps(self, outdir, **kwargs):
self.parameters.lammps_compute_file = os.path.join(
filepath,
"in.bgridlocal_n{0}.python".format(
len(set(self.atoms.numbers))
len(set(self._atoms.numbers))
),
)
else:
self.parameters.lammps_compute_file = os.path.join(
filepath,
"in.bgridlocal_defaultproc_n{0}.python".format(
len(set(self.atoms.numbers))
len(set(self._atoms.numbers))
),
)
else:
self.parameters.lammps_compute_file = os.path.join(
filepath,
"in.bgrid_n{0}.python".format(
len(set(self.atoms.numbers))
len(set(self._atoms.numbers))
),
)
# Do the LAMMPS calculation and clean up.
Expand Down