Skip to content

Commit 2ae34cb

Browse files
committed
modified WriteVaspStaticFromPrev
1 parent 8e58aed commit 2ae34cb

File tree

1 file changed

+35
-18
lines changed

1 file changed

+35
-18
lines changed

atomate/vasp/fireworks/absorption.py

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,42 +153,59 @@ def __init__(
153153

154154
# when mode = "static"
155155
elif mode == "STATIC":
156+
static_incar={"LWAVE": True,
157+
"ENCUT": 500,
158+
"ISMEAR": 0,
159+
"SIGMA": 0.01,
160+
"LREAL": False,
161+
"GGA": "PE",
162+
"LCHARG": False,
163+
"LAECHG": False,
164+
"METAGGA": "None",
165+
"LMIXTAU": False}
166+
156167
if prev_calc_dir:
157168
# Copy only the CONTCAR from previous calc directory (often a relaxation run)
158-
t.append(CopyVaspOutputs(
159-
calc_dir=prev_calc_dir,
160-
contcar_to_poscar=True,
161-
additional_files=wavecars)
162-
)
163-
164-
t.append(WriteVaspStaticFromPrev(other_params = {"user_incar_settings": {"LWAVE": "TRUE"}}))
165-
166-
elif parents:
167-
# Copy only the CONTCAR from previous calc
168169
t.append(
169170
CopyVaspOutputs(
170-
calc_loc=True,
171+
calc_dir=prev_calc_dir,
171172
contcar_to_poscar=True,
172173
additional_files=wavecars
173174
)
174175
)
175176

176177
t.append(
177-
WriteVaspStaticFromPrev(other_params = {"user_incar_settings": {"LWAVE": "TRUE"}}))
178-
179-
elif structure:
180-
vasp_input_set = MPStaticSet(
181-
structure, user_incar_settings={"LWAVE": "TRUE"}
178+
WriteVaspStaticFromPrev(structure=structure,
179+
reciprocal_density=reciprocal_density,
180+
other_params={"user_incar_settings": static_incar})
182181
)
182+
183+
elif parents:
184+
# Copy only the CONTCAR from previous calc
185+
t.append(CopyVaspOutputs(calc_loc=True,
186+
additional_files=wavecars,
187+
contcar_to_poscar=True)
188+
)
189+
183190
t.append(
184-
WriteVaspFromIOSet(structure=structure, vasp_input_set=vasp_input_set)
191+
WriteVaspStaticFromPrev(structure=structure,
192+
reciprocal_density=reciprocal_density,
193+
other_params={"user_incar_settings": static_incar})
185194
)
186195

196+
elif structure:
197+
static_input_set = MPStaticSet(structure=structure,
198+
reciprocal_density=reciprocal_density,
199+
user_incar_settings=static_incar)
200+
201+
t.append(WriteVaspFromIOSet(structure=structure, vasp_input_set=static_input_set)
202+
)
203+
187204
else:
188205
raise ValueError("Must specify structure or previous calculation for static calculation")
189206

190207
else:
191-
raise ValueEroor("Must specify a mode from 'STATIC', 'IPA', or 'RPA'")
208+
raise ValueError("Must specify a mode from 'STATIC', 'IPA', or 'RPA'")
192209

193210
# use the 'default' custodian handler group
194211
handler_group = "default"

0 commit comments

Comments
 (0)