Skip to content

Commit c122b23

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3665c00 + a2cfee5 commit c122b23

File tree

85 files changed

+5435
-953
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+5435
-953
lines changed

atomate/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.8.5"
1+
__version__ = "0.8.7"

atomate/vasp/firetasks/run_calc.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ def run_task(self, fw_spec):
204204
c.run()
205205

206206
if os.path.exists(zpath("custodian.json")):
207-
return FWAction(stored_data=loadfn(zpath("custodian.json")))
207+
stored_custodian_data = {"custodian": loadfn(zpath("custodian.json"))}
208+
return FWAction(stored_data=stored_custodian_data)
208209

209210

210211
@explicit_serialize
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# A typical band structure
2+
# Author: Alex Ganose ([email protected])
3+
fireworks:
4+
- fw: atomate.vasp.fireworks.core.StaticFW
5+
- fw: atomate.vasp.fireworks.core.NonSCFFW
6+
params:
7+
parents: 0
8+
mode: uniform
9+
- fw: atomate.vasp.fireworks.core.NonSCFFW
10+
params:
11+
parents: 0
12+
mode: line

atomate/vasp/workflows/presets/core.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,29 @@ def wf_bandstructure(structure, c=None):
5353

5454
return wf
5555

56+
57+
def wf_bandstructure_no_opt(structure, c=None):
58+
59+
c = c or {}
60+
vasp_cmd = c.get("VASP_CMD", VASP_CMD)
61+
db_file = c.get("DB_FILE", DB_FILE)
62+
63+
wf = get_wf(structure, "bandstructure_no_opt.yaml",
64+
vis=MPStaticSet(structure, force_gamma=True),
65+
common_params={"vasp_cmd": vasp_cmd, "db_file": db_file})
66+
67+
wf = add_common_powerups(wf, c)
68+
69+
if c.get("SMALLGAP_KPOINT_MULTIPLY", SMALLGAP_KPOINT_MULTIPLY):
70+
wf = add_small_gap_multiply(wf, 0.5, 5, "static")
71+
wf = add_small_gap_multiply(wf, 0.5, 5, "nscf")
72+
73+
if c.get("ADD_WF_METADATA", ADD_WF_METADATA):
74+
wf = add_wf_metadata(wf, structure)
75+
76+
return wf
77+
78+
5679
def wf_bandstructure_hse(structure, c=None):
5780

5881
c = c or {}
524 Bytes
Loading
469 Bytes
Loading
308 Bytes
Loading
221 Bytes
Loading
471 Bytes
Loading
467 Bytes
Loading

0 commit comments

Comments
 (0)