8000 Develop by knc6 · Pull Request #325 · usnistgov/jarvis · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Develop #325

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

Merged
merged 49 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
8b922be
improvement: add `Atoms.clone()` and `remove sites by indices`, inclu…
timurbazhirov Mar 28, 2024
f70ea8c
Version update.
knc6 Mar 28, 2024
d7a9f71
QE PSP url updae.
knc6 Mar 31, 2024
610ac3c
Remove mkdocs hard dependency.
knc6 Mar 31, 2024
a8acd70
Update lammps.
knc6 Mar 31, 2024
c83d725
Lint fix.
knc6 Mar 31, 2024
7eb8df9
Merge branch 'master' into develop
knc6 Mar 31, 2024
a067e33
Adding restapi.
knc6 Mar 31, 2024
c3fe660
Update super.py.
knc6 Apr 8, 2024
29cc742
Add describer.
knc6 Apr 14, 2024
6e0864d
Add describer.
knc6 Apr 14, 2024
74d8134
Add describer.
knc6 Apr 14, 2024
7665f91
Update describe.
knc6 Apr 14, 2024
51e8b04
Merge branch 'master' into develop
knc6 Apr 14, 2024
d45593c
Lint fix.
knc6 Apr 14, 2024
b4bf120
Mineral name.
knc6 Apr 16, 2024
042ba03
Add atoms update.
knc6 Apr 16, 2024
3c0cefe
Add atoms update.
knc6 Apr 16, 2024
edf40f4
Update proto pytest.
knc6 Apr 16, 2024
c1a632e
Update atoms, old prototype back.
knc6 Apr 18, 2024
a11d1ec
Update atoms, old prototype back.
knc6 Apr 18, 2024
1381a0e
Describe out.
knc6 Apr 18, 2024
191c6ce
Fix surface layers.
knc6 Apr 25, 2024
105160b
Make c surface an option.
knc6 Apr 25, 2024
24e294b
Merge branch 'master' into surface
knc6 Apr 25, 2024
a0fea81
Lint fix.
knc6 Apr 25, 2024
f652a3f
Verbose false.
knc6 Apr 26, 2024
320805e
Parse outcar.
knc6 May 4, 2024
db2b697
Outputs fix.
knc6 May 4, 2024
0c0be2c
Update OUTCAR parser.
knc6 May 4, 2024
be4e687
Merge branch 'master' into develop
knc6 May 4, 2024
364b0c5
Update OUTCAR parser.
knc6 May 4, 2024
45e983c
Update OUTCAR parser.
knc6 May 4, 2024
a3f64ff
Update atoms describer.
knc6 May 20, 2024
6747884
Update atoms describer.
knc6 May 20, 2024
cc1644a
Fix motif and composition.
knc6 May 28, 2024
3426a7a
Rotate.
knc6 Jun 13, 2024
6cd1674
Add additionals DBs.
knc6 Jun 27, 2024
44b2404
PyTest fix.
knc6 Jun 27, 2024
75bb0cd
DB update.
knc6 Jun 27, 2024
88c4495
Merge branch 'master' into develop
knc6 Jun 28, 2024
e722ab2
Lint fix.
knc6 Jun 28, 2024
278cc95
Update tutorials.md
knc6 Jul 19, 2024
4c7aeb7
Update surface.py
knc6 Jul 19, 2024
60ecaf1
Update figshare.py
knc6 Aug 4, 2024
5f7c55e
Update setup.py
knc6 Aug 4, 2024
40d7389
Make Spglib optional dependency.
knc6 Aug 26, 2024
25c6bbf
Merge branch 'master' into develop
knc6 Aug 26, 2024
2a76a3c
Lint fix.
knc6 Aug 26, 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 docs/tutorials.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Tutorials

## Quickstart with Jupyter/Google-colab notebooks: https://github.com/usnistgov/aims2024_workshop

More detailed tutorials below:

## How to analyze an atomic structure

Atomic structure act as an input to multiple simulations such as for
Expand Down
2 changes: 1 addition & 1 deletion jarvis/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Version number."""

__version__ = "2024.5.10"
__version__ = "2024.8.10"

import os

Expand Down
2 changes: 1 addition & 1 deletion jarvis/analysis/defects/surface.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def make_surface(self):

frac_coords = new_atoms.frac_coords

frac_coords[:] = frac_coords[:] % 1
# frac_coords[:] = frac_coords[:] % 1
new_atoms = Atoms(
lattice_mat=latest_lat,
elements=surf_atoms.elements,
Expand Down
12 changes: 8 additions & 4 deletions jarvis/analysis/structure/spacegroup.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
"""Modules for handling crystallographic Spacegroup related operations."""

from functools import reduce
from jarvis.core.lattice import Lattice
from jarvis.core.atoms import Atoms
import spglib
from jarvis.core.specie import Specie
import numpy as np
from numpy import sin, cos
import itertools

# from fractions import gcd
from jarvis.core.utils import gcd
import os

try:
import spglib
except Exception as exp:
print(exp)
pass
# from numpy import gcd
# from math import gcd
import os
# from fractions import gcd


def unique_rows_2(a):
Expand Down
17 changes: 12 additions & 5 deletions jarvis/db/figshare.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
import json
import requests
from jarvis.db.jsonutils import loadjson
from jarvis.io.vasp.outputs import Vasprun
from jarvis.io.vasp.inputs import Poscar
from jarvis.io.wannier.outputs import WannierHam
from tqdm import tqdm
import matplotlib.image as mpimg
from jarvis.analysis.stm.tersoff_hamann import TersoffHamannSTM

# from jarvis.analysis.stm.tersoff_hamann import TersoffHamannSTM
# from jarvis.io.wannier.outputs import WannierHam
# from jarvis.io.vasp.outputs import Vasprun
# from jarvis.io.vasp.inputs import Poscar

# import matplotlib.pyplot as plt
# plt.switch_backend("agg")
Expand Down Expand Up @@ -79,7 +80,7 @@ def get_db_info():
# "https://ndownloader.figshare.com/files/26809760",
"id_prop.json",
"Obtaining ALIGNN-FF training DB 300k ...",
"https://arxiv.org/abs/2209.05554",
"https://doi.org/10.1039/D2DD00096B",
],
"mp_3d_2020": [
"https://ndownloader.figshare.com/files/26791259",
Expand Down Expand Up @@ -598,6 +599,8 @@ def make_stm_from_prev_parchg(
jid="JVASP-667", bias="Negative", filename="stm_image.png", min_size=10
):
"""Make STM images from previously calculated PARVHG files for 2D."""
from jarvis.analysis.stm.tersoff_hamann import TersoffHamannSTM

fls = data("raw_files")
for i in fls["STM"]:
zip_name = jid + "_" + bias + ".zip"
Expand All @@ -619,6 +622,9 @@ def make_stm_from_prev_parchg(

def get_wann_electron(jid="JVASP-816"):
"""Download electron WTBH if available."""
from jarvis.io.wannier.outputs import WannierHam
from jarvis.io.vasp.inputs import Poscar

w = ""
ef = ""
fls = data("raw_files")
Expand Down Expand Up @@ -650,6 +656,7 @@ def get_wann_phonon(jid="JVASP-1002", factor=15.633302):
"""Download phonon WTBH if available."""
# Requires phonopy
from jarvis.io.phonopy.outputs import get_phonon_tb
from jarvis.io.vasp.outputs import Vasprun

fls = data("raw_files")

Expand Down
24 changes: 12 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@

setup(
name="jarvis-tools",
version="2024.5.10",
version="2024.8.10",
long_description=long_d,
install_requires=[
"numpy>=1.20.1",
"scipy>=1.5.0",
"matplotlib>=3.0.0",
"spglib>=1.14.1",
"joblib>=0.14.1",
"requests>=2.23.0",
"toolz>=0.9.0",
"xmltodict>=0.11.0",
"tqdm>=4.41.1",
"scikit-learn",
"inflect",
# "spglib>=1.14.1",
# "inflect",
# "mkdocs-material>=9.0.5",
# "markdown>=3.2.1",
# "absl-py==1.4.0",
Expand Down Expand Up @@ -57,15 +57,15 @@
"jarvis": ["LICENSE.rst"],
},
extras_require={
"ai": [
"torch",
"dgl",
"keras",
"tensorflow",
"flask",
"pandas",
],
"babel": ["openbabel", "pybel"],
# "ai": [
# "torch",
# "dgl",
# "keras",
# "tensorflow",
# "flask",
# "pandas",
# ],
# "babel": ["openbabel", "pybel"],
"doc": ["sphinx>=1.3.1", "sphinx-rtd-theme>=0.1.8"],
},
author="Kamal Choudhary",
Expand Down
Loading
0