Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into delay_mendeleev
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-janssen committed Feb 5, 2024
2 parents 5655bf9 + d007097 commit 584781d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- phonopy =2.21.0
- pint =0.23
- pyiron_base =0.7.3
- pylammpsmpi =0.2.11
- pylammpsmpi =0.2.12
- pyscal =2.10.18
- scikit-learn =1.4.0
- scipy =1.12.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from typing import Union, List
from mp_api.client import MPRester
from pyiron_atomistics.atomistics.structure.has_structure import HasStructure
from pyiron_atomistics.atomistics.structure.structurestorage import StructureStorage
from pyiron_atomistics.atomistics.structure.atoms import pymatgen_to_pyiron, Atoms
Expand Down Expand Up @@ -107,6 +106,8 @@ def search(
Returns:
:class:`~.MPQueryResults`: resulting structures from the query
"""
from mp_api.client import MPRester

rest_kwargs = {
"use_document_model": False, # returns results as dictionaries
"include_user_agent": True, # send some additional software version info to MP
Expand Down
4 changes: 3 additions & 1 deletion pyiron_atomistics/vasp/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,9 @@ def __init__(self):
self.kpoints = Kpoints(table_name="kpoints")
self.potcar = Potcar(table_name="potcar")

self._eddrmm = "warn"
# "official" recommendation of VASP devs is to just ignore this warning
# https://www.vasp.at/forum/viewtopic.php?f=3&t=17822
self._eddrmm = "ignore"

def write(self, structure, modified_elements, directory=None):
"""
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies = [
"phonopy==2.21.0",
"pint==0.23",
"pyiron_base==0.7.3",
"pylammpsmpi==0.2.11",
"pylammpsmpi==0.2.12",
"scipy==1.12.0",
"scikit-learn==1.4.0",
"seekpath==2.1.0",
Expand Down

0 comments on commit 584781d

Please sign in to comment.