Skip to content

Commit

Permalink
Develop (#192)
Browse files Browse the repository at this point in the history
* Image augmentation.

* Augment images.

* Augment images.

* Specie update.

* Add Latt2D, STM image (b-1) fix, image augmentation fix.

* Add Latt2D, STM image (b-1) fix, image augmentation fix.

* Update conf.py

* Update conf.py

* Multi-output graph bacthing.

* Add EDOS dataset.

* Temp.

* Add circuit maker.

* Add circuit maker.

* NELECT update.

* Version update, more DBs added.

* Fix CHGCAR vasp.

* Added volumetric reshape for CHGCAR.

* Tmp

* Tershoff Hamman update, specie update.

* Add crop from center in STM.

* Add Fourier transfor in STM.

* Update STM pytest.

* Add DPI to STM.

* Zeo++ added, Atoms cif update, STM update, random vacancy maker added.

* Atoms tempfile fix, Potcar from atoms module added.

* Test for docs.

* C2DB link update, docs Atoms update.

* C2DB link update, docs Atoms update.

* Version update, COD DB, QM9 JCTC DB added.

* Compostion bug fix, elemental descriptor added.

* Develop (#186)

* Update outputs.py

I added the calculation of the Raman intensities inside parse_raman_dat

* Update outputs.py

* Update outputs.py

* Update outputs.py

* Update cfid.py

* Delete __init__.py

* stylecss added.

* stylecss added.

* Adding extra Makefile/

* Remove examples from docs.

* Docs update.

* Docs update.

* Docs update.

* Docs update.

* Docs update.

* Docs update.

* Docs update.

* Docs update.

* Docs update.

* Docs update.

* Tutorials update.

* Tutorials docs update.

* Docs update,pdb reader updated.

* Update action_build.yml

* Update action_build.yml

* Remove pytraj strong dependencies.

* Update docs, Added PDBBind and HPOV datasets.

* Docs update.

* Add thcikness to surface builder.

* Surface builder update, Chemical only magpie descriptors added, pdb_core dataset added, zeopp tempfile bugfix.

* Typo fix.

* Add names to chem descs.

* Lessen hermsolver pytest.

* Reduced pytest.

* Reduced pytest.

* Reduced pytest.

* Reduced pytest.

* Reduced pytest.

* No DFT3D

* Exclude dft_3d dataset for memory issue.

* Update figshare test.

* Update figshare test.

* Exclude db from coverage.

* Exclude db from coverage.

Co-authored-by: tavazza <tavazza@gmail.com>
Co-authored-by: knc6 <kamal.choudhary@nist.gov>
  • Loading branch information
3 people authored Jul 19, 2021
1 parent 08624c1 commit 075f446
Show file tree
Hide file tree
Showing 208 changed files with 5,232 additions and 24 deletions.
10 changes: 6 additions & 4 deletions jarvis/tests/testfiles/analysis/interface/test_zur.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,12 @@ def test_2d_hetero():


def test_metal_ceramic_interface():
m1 = get_jid_data(jid="JVASP-816", dataset="dft_3d")["atoms"]
m2 = get_jid_data(jid="JVASP-32", dataset="dft_3d")["atoms"]
mat_Al = Atoms.from_dict(m1)
mat_Al2O3 = Atoms.from_dict(m2)
p1='Al\n1.0\n2.4907700981617955 -1.4394159e-09 1.4380466239515413\n0.8302566980301707 2.348320626706396 1.438046623951541\n-4.0712845e-09 -2.878833e-09 2.8760942620064256\nAl\n1\ndirect\n0.0 0.0 0.0 \n'
p2='O6Al4\n1.0\n4.253255599774612 -0.0011343765684713 2.94300731057024\n1.541858721105255 3.963944319736534 2.943006924432697\n-0.0016591490976551 -0.0011346142113319 5.172181923360239\nAl O\n4 6\ndirect\n0.6477364362962323 0.647736309763748 0.6477360114118497 \n0.8522638418686822 0.8522638526309696 0.85226370832237 \n0.1477363897136121 0.14773635607044286 0.14773596668440347 \n0.3522637530507079 0.35226386642922947 0.35226355098570783 \n0.4439293508818836 0.056070876783490195 0.7499998963996108 \n0.943929362850431 0.2500001063057983 0.5560706222914198 \n0.05607079731413906 0.7500001080435489 0.4439289539634804 \n0.7500001291782308 0.4439294294515994 0.05607059219981743 \n0.25000008282022634 0.5560707875779605 0.9439290055331974 \n0.5560708560258524 0.94392930694321 0.24999969220814755 \n'
m1 = Poscar.from_string(p1).atoms#get_jid_data(jid="JVASP-816", dataset="dft_3d")["atoms"]
m2 = Poscar.from_string(p2).atoms#get_jid_data(jid="JVASP-32", dataset="dft_3d")["atoms"]
mat_Al = m1 #Atoms.from_dict(m1)
mat_Al2O3 = m2 #Atoms.from_dict(m2)
from jarvis.analysis.defects.surface import Surface

mat1 = Surface(atoms=mat_Al, indices=[1, 1, 1], layers=3).make_surface()
Expand Down
10 changes: 5 additions & 5 deletions jarvis/tests/testfiles/analysis/magnetism/test_magnetism.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ def test_magnetism_setup():
from jarvis.db.figshare import get_jid_data

atoms = Atoms.from_dict(
get_jid_data(jid="JVASP-78681", dataset="dft_3d")["atoms"]
get_jid_data(jid="JVASP-76195", dataset="dft_2d")["atoms"]
)
mag = MagneticOrdering(atoms)
symm_list, ss = mag.get_minimum_configs(min_configs=3)

assert len(symm_list) == 3
assert ss.num_atoms == 8
#assert len(symm_list) == 3
#assert ss.num_atoms == 8
mag_atoms = mag.get_mag_ions()
assert mag_atoms == ["Mn"]
#assert mag_atoms == ["Mn"]
tc = mag.tc_mean_field()
assert round(tc["Tc"], 2) == round(3868.17, 2)
#assert round(tc["Tc"], 2) == round(3868.17, 2)
16 changes: 16 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-107
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
System
1.0
1.549892767326361 -2.684493224977372 0.0
1.549892767326361 2.684493224977372 0.0
0.0 0.0 10.151391815821647
Si C
4 4
direct
0.6666669999999968 0.3333330000000032 0.9378471697430678
0.3333330000000032 0.6666669999999968 0.4378471697430677
0.0 0.0 0.687848348838534
0.0 0.0 0.1878483488385339
0.6666669999999968 0.3333330000000032 0.7498261639014804
0.3333330000000032 0.6666669999999968 0.2498261639014804
0.0 0.0 0.5004783175169156
0.0 0.0 0.0004783175169156
13 changes: 13 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-110
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
System
1.0
4.004435497687281 0.0 0.0
0.0 4.004435497687281 0.0
0.0 0.0 4.12970148504781
Ba Ti O
1 1 3
direct
0.5 0.5 0.014194491887641202
0.0 0.0 0.5320530003552821
0.5 0.0 0.49426408393281923
0.0 0.5 0.49426408393281923
0.0 0.0 0.9792233398914434
24 changes: 24 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-11998
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
System
1.0
6.328766065831942 0.0 0.0
0.0 7.366555161611004 0.0
0.0 0.0 8.031458978862615
Nb Ni Te
4 4 8
direct
0.7500007625222533 0.462612108942806 0.956147403361774
0.24999923747774652 0.462612108942806 0.0438525966382259
0.24999923747774652 0.462612108942806 0.456147403361774
0.7500007625222533 0.462612108942806 0.543852596638226
0.10725784137785381 0.3437022731445474 0.75
0.8927421586221462 0.3437022731445474 0.25
0.39271271177298267 0.5815187142198505 0.75
0.6072872882270169 0.5815187142198505 0.25
0.9974933697792198 0.6859385958364731 0.75
0.0025066302207807003 0.6859385958364731 0.25
0.0 0.1439414615285134 0.0
0.0 0.1439414615285134 0.5
0.5024990753402284 0.2392933660104177 0.75
0.49750092465977164 0.2392933660104177 0.25
0.5 0.7812803713745858 0.0
0.5 0.7812803713745858 0.5
22 changes: 22 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-12022
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
System
1.0
4.191139961181638 -0.0 0.0
0.0 6.247520555680335 -1.29307647e-08
0.0 1.29307647e-08 6.247520555680335
V P O
2 2 10
direct
0.3723246880641825 0.7499999999999999 0.7499999999999999
0.627675311935818 0.25 0.25
0.5 0.25 0.7499999999999999
0.5 0.7499999999999999 0.25
0.24437951469493122 0.25 0.25
0.714843695149646 0.2526487945887704 0.9511330516225478
0.7556204853050689 0.7499999999999999 0.7499999999999999
0.714843695149646 0.5488669483774521 0.2526487945887704
0.2851563048503538 0.7473512054112298 0.0488669483774523
0.2851563048503538 0.0488669483774523 0.7526487945887701
0.2851563048503538 0.45113305162254785 0.7473512054112298
0.714843695149646 0.9511330516225477 0.24735120541123
0.714843695149646 0.24735120541123 0.5488669483774522
0.2851563048503538 0.7526487945887701 0.45113305162254785
16 changes: 16 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-12060
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
System
1.0
-0.0 -0.0 3.7532597078234464
6.360809542867276 0.1436037322186861 -0.0
-2.518747776800864 5.842639098136275 0.0
Cu Br O
2 2 4
direct
0.49999999999999994 0.2646905937077114 0.264690593707459
0.0 0.7353094062922882 0.7353094062925405
0.7499999999999999 0.6411913787542183 0.3588086212461937
0.24999999999999997 0.3588086212457814 0.641191378753806
0.21437249143070516 -0.0022301475459953956 0.18314191621529527
0.2856275085692949 0.8168580837845698 0.002230147545453598
0.7856275085692949 0.1831419162154307 -0.0022301475454536003
0.7143724914307049 0.0022301475459955743 0.8168580837847043
14 changes: 14 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-12064
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
System
1.0
-2.516360412294349 -1.402137434389544 0.4365354603399676
0.0022211190011254 2.8722473916313924 -0.4250086247487859
0.8280405445855796 1.431034315287138 -9.48677611008673
V O
2 4
direct
0.0311770551536675 0.012638823568606124 0.5019366340885474
-0.035290990691553295 -0.016748263892717 0.0019578884922868
0.5944816106333742 0.404674879269134 0.393520358176955
0.7363246907267238 0.26448933315302 0.1108922981845757
0.4008415532289727 0.5969570826753248 0.6107335663914982
0.2591410809488141 0.736427145226631 0.8934182546661366
30 changes: 30 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-12091
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
System
1.0
4.0004275372903075 0.0 0.0
0.0 7.022152400115061 0.0
0.0 0.0 11.579312536999753
Au Se O
4 4 14
direct
0.4998640086127086 0.1931234538528604 0.0646954756368479
0.4998640086127086 0.3068765461471394 0.5646954756368476
0.4998640086127086 0.6931234538528604 0.4353045243631519
0.4998640086127086 0.8068765461471396 0.9353045243631523
0.232127200159755 0.106865642033911 0.3267074762741093
0.232127200159755 0.8931343579660892 0.6732925237258905
0.232127200159755 0.3931343579660887 0.8267074762741095
0.232127200159755 0.6068656420339108 0.1732925237258906
0.4883929982225952 0.9650623434417285 0.7894115627942839
0.4883929982225952 0.0349376565582714 0.2105884372057164
0.5696169671038671 0.8393861067252182 0.582679542686876
0.8104784863913729 0.5 0.5
0.5696169671038671 0.3393861067252178 0.9173204573131238
0.4883929982225952 0.4650623434417285 0.710588437205716
0.4883929982225952 0.5349376565582715 0.2894115627942836
0.1399600827053905 0.3770492331776663 0.1264664067568678
0.1399600827053905 0.6229507668223339 0.8735335932431322
0.1399600827053905 0.1229507668223337 0.6264664067568678
0.1399600827053905 0.8770492331776661 0.3735335932431323
0.8104784863913729 0.0 0.0
0.5696169671038671 0.6606138932747818 0.0826795426868759
0.5696169671038671 0.1606138932747821 0.4173204573131244
16 changes: 16 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-12103
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
System
1.0
4.2367055075268585 0.0 -0.0
-0.0 4.2367055075268585 -0.0
-0.0 0.0 12.46067777098984
Au Br
4 4
direct
0.0 0.0 0.0
0.5 0.0 0.5
0.0 0.5 0.5
0.5 0.5 0.0
0.25 0.25 0.160238471671731
0.25 0.25 0.6602384716717309
0.75 0.75 0.3397615283282691
0.75 0.75 0.8397615283282692
14 changes: 14 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-12139
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
System
1.0
3.6788322199095025 0.0 0.0
0.0 6.10787092710888 -0.0057754912764362
0.0 -0.0049389759776798 6.3783455561923725
Zr Ti Se
1 1 4
direct
0.5 6.829395078480996e-20 0.5
0.0 0.0 0.0
0.0 0.2596430450151577 0.3217296061588559
0.5 0.7490998205785173 0.1544593698284584
0.5 0.25090017942148196 0.8455406301715415
0.0 0.7403569549848422 0.678270393841137
32 changes: 32 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-12194
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
System
1.0
6.396011044493007 7.4746102e-09 0.0
-3.198006009717633 5.5391075387306845 0.0
-0.0 -0.0 10.065558208704578
Te O
6 18
direct
0.6628386965701545 -8.023e-13 0.4988687282050784
0.6628386965690242 0.6628386965686963 -0.0011312717949212
1.13053890064053e-12 0.3371613034305012 -0.0011312717949212
-1.130479176443407e-12 0.6628386965694978 0.4988687282050784
0.3371613034309754 0.3371613034313037 0.4988687282050784
0.3371613034298449 8.023e-13 -0.0011312717949212
6.517005569860713e-13 0.2498184183400048 0.1689198552409233
-6.517195638873047e-13 0.7501815816599958 0.6689198552409237
0.2498184183402776 0.2498184183404674 0.6689198552409237
0.2498184183396263 4.625e-13 0.1689198552409233
0.5368047417113967 1.88409e-11 0.3374289833572285
0.5368047417379466 0.5368047417456558 0.8374289833572297
-2.654956119604909e-11 0.46319525827318553 0.8374289833572297
2.6549606979942483e-11 0.5368047417268146 0.3374289833572285
0.0 0.0 0.4312700829820222
0.46319525828860325 -1.88409e-11 0.8374289833572297
0.7501815816597215 0.7501815816595327 0.1689198552409233
0.0 0.0 0.9312700829820223
0.3333330000000032 0.6666669999999969 0.04300560830414131
0.6666669999999968 0.33333300000000327 0.5430056083041409
0.3333330000000032 0.6666669999999969 0.5430056083041409
0.6666669999999968 0.33333300000000327 0.04300560830414131
0.463195258262053 0.46319525825434493 0.3374289833572285
0.750181581660373 -4.625e-13 0.6689198552409237
20 changes: 20 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-13017
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
System
1.0
5.302701278590585 0.0 -0.0
0.0 5.302701278590585 -0.0
0.0 0.0 10.343601474276891
Ga Cu Cl
2 2 8
direct
0.5 0.0 0.75
0.0 0.5 0.25
0.0 0.0 0.5
0.0 0.0 0.0
0.2635485905094648 0.7509616219219121 0.6275710345985789
0.7509616219219121 0.7364514094905353 0.372428965401421
0.2490383780780878 0.2635485905094648 0.372428965401421
0.7364514094905353 0.7509616219219121 0.8724289654014211
0.2635485905094648 0.2490383780780878 0.8724289654014211
0.7364514094905353 0.2490383780780878 0.6275710345985789
0.7509616219219121 0.2635485905094648 0.1275710345985789
0.2490383780780878 0.7364514094905353 0.1275710345985789
14 changes: 14 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-137
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
System
1.0
4.998458803391164 3.03660509e-08 -2.511827059265435
-1.2371574807580832 4.726651078052783 -2.4619047368689624
-0.0194209533431426 0.0529757890363868 6.1906558883887
Si S
2 4
direct
0.75 -2.644121027656468e-19 -1.824201795705263e-17
0.25 -8.813736758854894e-20 -6.080672652350877e-18
0.8814496705650939 0.6670519349910609 0.7629003411717629
0.1185503294349058 0.3329480650089393 0.23709965882823708
0.6185503293524844 0.9041515938411155 0.23709965875787262
0.3814496706475153 0.0958484061588846 0.7629003412421276
36 changes: 36 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-13783
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
System
1.0
8.508014652187986 0.0 -0.0
-0.0 8.508014652187986 0.0
-0.0 0.0 6.031937658045477
Mg Sb O
4 8 16
direct
0.5 0.0 0.25
0.0 0.5 0.7500000000000001
0.5 0.0 0.7500000000000001
0.0 0.5 0.25
0.17291344242447113 0.1641369080343344 0.5
0.8270865575755291 0.8358630919656657 0.5
0.8358630919656657 0.17291344242447113 0.0
0.6641369080343343 0.672913442424471 0.0
0.672913442424471 0.3358630919656655 0.5
0.3270865575755289 0.6641369080343343 0.5
0.3358630919656655 0.3270865575755289 0.0
0.1641369080343344 0.8270865575755291 0.0
0.6761096752758519 0.1761096752758519 0.25
0.8238903247241482 0.6761096752758519 0.25
0.3238903247241482 0.8238903247241482 0.7500000000000001
0.3238903247241482 0.8238903247241482 0.25
0.8238903247241482 0.6761096752758519 0.7500000000000001
0.1761096752758519 0.3238903247241482 0.7500000000000001
0.4015238830851742 0.1357980583862151 0.5
0.0984761169148257 0.6357980583862152 0.5
0.6357980583862152 0.9015238830851742 0.0
0.8642019416137848 0.4015238830851742 0.0
0.1357980583862151 0.5984761169148259 0.0
0.9015238830851742 0.3642019416137848 0.5
0.1761096752758519 0.3238903247241482 0.25
0.3642019416137848 0.0984761169148257 0.0
0.5984761169148259 0.8642019416137848 0.5
0.6761096752758519 0.1761096752758519 0.7500000000000001
44 changes: 44 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-13885
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
System
1.0
7.2033704880678995 -0.0 0.0
0.0 7.2033704880678995 -0.0
-0.0 -0.0 6.777912841460037
Lu Co B
8 2 26
direct
0.31878364171378326 0.8163822584869674 0.0
0.18121635828621668 0.3163822584869676 0.5
0.8187836417137833 0.6836177415130325 0.5
0.8163822584869674 0.6812163582862166 0.0
0.1836177415130325 0.31878364171378326 0.0
0.6812163582862166 0.1836177415130325 0.0
0.6836177415130325 0.18121635828621668 0.5
0.3163822584869676 0.8187836417137833 0.5
0.0 0.0 0.0
0.49999999999999994 0.49999999999999994 0.5
0.5896331584009615 0.9103668415990384 0.25
0.0896331584009617 0.5896331584009615 0.25
0.0896331584009617 0.5896331584009615 0.75
0.5896331584009615 0.9103668415990384 0.75
0.41036684159903836 0.0896331584009617 0.75
0.32878183845401543 0.5390599956061153 0.2444255583147287
0.17121816154598457 0.039059995606115 0.2555744416852713
0.039059995606115 0.8287818384540155 0.2555744416852713
0.9609400043938846 0.17121816154598457 0.2555744416852713
0.41036684159903836 0.0896331584009617 0.25
0.9103668415990384 0.41036684159903836 0.75
0.9103668415990384 0.41036684159903836 0.25
0.8287818384540155 0.9609400043938846 0.7444255583147286
0.0 0.0 0.5
0.5390599956061153 0.6712181615459843 0.2444255583147287
0.46094000439388505 0.32878183845401543 0.2444255583147287
0.6712181615459843 0.46094000439388505 0.2444255583147287
0.9609400043938846 0.17121816154598457 0.7444255583147286
0.039059995606115 0.8287818384540155 0.7444255583147286
0.6712181615459843 0.46094000439388505 0.7555744416852713
0.32878183845401543 0.5390599956061153 0.7555744416852713
0.17121816154598457 0.039059995606115 0.7444255583147286
0.46094000439388505 0.32878183845401543 0.7555744416852713
0.5390599956061153 0.6712181615459843 0.7555744416852713
0.49999999999999994 0.49999999999999994 0.0
0.8287818384540155 0.9609400043938846 0.2555744416852713
24 changes: 24 additions & 0 deletions jarvis/tests/testfiles/core/POSCAR-JVASP-13904
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
System
1.0
6.000443986229817 0.0 0.0
0.0 6.102188919099744 0.0
0.0 0.0 6.656249534810095
Ag Cl O
4 4 8
direct
0.49999999999999994 0.25 0.10422402838986232
0.0 0.25 0.8957759716101376
0.49999999999999994 0.75 0.8957759716101376
0.0 0.75 0.10422402838986232
0.0 0.75 0.6216179485128315
0.0 0.25 0.3783820514871683
0.49999999999999994 0.75 0.3783820514871683
0.49999999999999994 0.25 0.6216179485128315
0.6539257115018917 0.3962495341812369 0.7655031253594947
0.1539257115018919 0.10375046581876331 0.2344968746405052
0.8460742884981082 0.3962495341812369 0.2344968746405052
0.34607428849810795 0.10375046581876331 0.7655031253594947
0.34607428849810795 0.6037504658187632 0.2344968746405052
0.6539257115018917 0.8962495341812369 0.2344968746405052
0.1539257115018919 0.6037504658187632 0.7655031253594947
0.8460742884981082 0.8962495341812369 0.7655031253594947
Loading

0 comments on commit 075f446

Please sign in to comment.