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

Update VASP input sets for atomate2 compatibility #3835

Merged
merged 22 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
63728ff
updates for consistency with atomate2 updates
esoteric-ephemera May 13, 2024
a1295b9
Merge remote-tracking branch 'upstream/master'
esoteric-ephemera May 13, 2024
d97ce17
lint
esoteric-ephemera May 13, 2024
04eb1ad
further patch for atomate2 support, make sure tests are respected or …
esoteric-ephemera May 16, 2024
ed0e8ec
linting
esoteric-ephemera May 16, 2024
a31f08b
Merge branch 'materialsproject:master' into master
esoteric-ephemera May 16, 2024
6646b98
merge DictSet into VaspInputSet, deprecate DictSet as an alias of Vas…
janosh May 17, 2024
c50db64
test_dict_set_alias subclass and deprecation message
janosh May 17, 2024
cf8cedc
Change deprecation warning to be on init of DictSet
esoteric-ephemera May 17, 2024
51b25f5
remove deprecated decorator, only works for functions, error msg less…
esoteric-ephemera May 17, 2024
590831f
Merge branch 'materialsproject:master' into master
esoteric-ephemera May 17, 2024
e873ac3
move remaining VaspInputGenerator features to PMG
esoteric-ephemera May 17, 2024
d035806
pre-commit auto-fixes
pre-commit-ci[bot] May 17, 2024
d599611
added tests
esoteric-ephemera May 17, 2024
e1e1a70
add incar, kpoints, poscar, potcar attr to io.vasp.inputs.VaspInput +…
esoteric-ephemera May 17, 2024
ddf74e1
linted
esoteric-ephemera May 17, 2024
c335ce7
Bump rexml from 3.2.5 to 3.2.8 in /docs (#3836)
dependabot[bot] May 17, 2024
9740bba
Bump nokogiri from 1.16.2 to 1.16.5 in /docs (#3828)
dependabot[bot] May 17, 2024
24ad8e9
shift features of VaspInputSet.write_input to VaspInput.write_input
esoteric-ephemera May 20, 2024
c9117f2
pre-commit /linting
esoteric-ephemera May 20, 2024
45c51ec
move file transfer from write_input method of VaspInputSet to VaspInput
esoteric-ephemera May 20, 2024
576db8e
add missing `output_dir` kwarg to vaspinputset.write_input
esoteric-ephemera May 20, 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
44 changes: 20 additions & 24 deletions docs/pymatgen.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions pymatgen/io/vasp/inputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2412,7 +2412,7 @@ def identify_potcar_hash_based(
potcar_functionals (list): List of potcar functionals associated with
the PotcarSingle
"""
# Dict to translate the sets in the .json file to the keys used in DictSet
# Dict to translate the sets in the .json file to the keys used in VaspInputSet
mapping_dict = {
"potUSPP_GGA": {
"pymatgen_key": "PW91_US",
Expand Down Expand Up @@ -2737,7 +2737,8 @@ def __init__(
incar: dict | Incar,
kpoints: Kpoints | None,
poscar: Poscar,
potcar: Potcar | None,
potcar: Potcar | str | None,
potcar_spec: bool = False,
optional_files: dict[PathLike, object] | None = None,
**kwargs,
) -> None:
Expand All @@ -2748,14 +2749,18 @@ def __init__(
incar (Incar): The Incar object.
kpoints (Kpoints): The Kpoints object.
poscar (Poscar): The Poscar object.
potcar (Potcar): The Potcar object.
potcar (Potcar or str): The Potcar object.
potcar_spec (bool = False) : used to share POTCAR info without license issues.
True --> POTCAR is a list of symbols, write POTCAR.spec
False --> POTCAR is a VASP POTCAR, write POTCAR
optional_files (dict): Other input files supplied as a dict of {filename: object}.
The object should follow standard pymatgen conventions in implementing a
as_dict() and from_dict method.
**kwargs: Additional keyword arguments to be stored in the VaspInput object.
"""
super().__init__(**kwargs)
self.update({"INCAR": incar, "KPOINTS": kpoints, "POSCAR": poscar, "POTCAR": potcar})
potcar_filename = "POTCAR" + (".spec" if potcar_spec else "")
self.update({"INCAR": incar, "KPOINTS": kpoints, "POSCAR": poscar, potcar_filename: potcar})
if optional_files is not None:
self.update(optional_files)

Expand Down
Loading