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

NonConvergingErrorHandler document AMIX maybe ineffective in helping SCF convergence #358

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 9 additions & 22 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ exclude: ^(docs|tests/files|tasks.py)

ci:
autoupdate_schedule: monthly
skip: [ mypy, pyright ]
skip: [mypy, pyright]
autofix_commit_msg: pre-commit auto-fixes
autoupdate_commit_msg: pre-commit autoupdate

repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.2
rev: v0.8.3
hooks:
- id: ruff
args: [ --fix, --unsafe-fixes ]
args: [--fix, --unsafe-fixes]
- id: ruff-format

- repo: https://github.com/pre-commit/pre-commit-hooks
Expand All @@ -30,40 +30,27 @@ repos:
rev: v2.3.0
hooks:
- id: codespell
stages: [ commit-msg ]
exclude_types: [ html ]
additional_dependencies: [ tomli ] # needed to read pyproject.toml below py3.11

- repo: https://github.com/MarcoGorelli/cython-lint
rev: v0.16.2
hooks:
- id: cython-lint
args: [ --no-pycodestyle ]
- id: double-quote-cython-strings
stages: [commit-msg]
exclude_types: [html]
additional_dependencies: [tomli] # needed to read pyproject.toml below py3.11

- repo: https://github.com/adamchainz/blacken-docs
rev: 1.19.1
hooks:
- id: blacken-docs

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.42.0
rev: v0.43.0
hooks:
- id: markdownlint
# MD013: line too long
# MD024: Multiple headings with the same content
# MD033: no inline HTML
# MD041: first line in a file should be a top-level heading
# MD025: single title
args: [ --disable, MD013, MD024, MD025, MD033, MD041, "--" ]

- repo: https://github.com/kynan/nbstripout
rev: 0.8.0
hooks:
- id: nbstripout
args: [ --drop-empty-cells, --keep-output ]
args: [--disable, MD013, MD024, MD025, MD033, MD041, "--"]

- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.387
rev: v1.1.390
hooks:
- id: pyright
3 changes: 3 additions & 0 deletions src/custodian/vasp/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1560,6 +1560,9 @@ class NonConvergingErrorHandler(ErrorHandler):
Check if a run is hitting the maximum number of electronic steps at the
last nionic_steps ionic steps (default=10). If so, change ALGO using a
multi-step ladder scheme or kill the job.

In some cases (ALGO=All or ALGO=Normal and ISMEAR < 0), this handler also changes AMIX
and BMIX but unsure if this helps much. Some anecdotal evidence suggests it doesn't.
"""

is_monitor = True
Expand Down
2 changes: 1 addition & 1 deletion src/custodian/vasp/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ def terminate(self, directory="./") -> None:
proc.kill()
return
except (psutil.NoSuchProcess, psutil.AccessDenied) as exc:
logger.warning(f"Exception {exc} encountered while killing VASP.")
logger.exception(f"Exception {exc} encountered while killing VASP.")
continue

logger.warning(
Expand Down
1 change: 1 addition & 0 deletions src/custodian/vasp/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def _estimate_num_k_points_from_kspacing(structure: Structure, kspacing: float)
Inputs:
structure (Structure): structure used in the calculation
kspacing (float): KSPACING used in the calculation

Returns:
tuple[int,int,int] : the number of estimated k-points on each axis.

Expand Down
Loading