Skip to content

Commit 0c1b6a5

Browse files
Small bugfixes (#386)
* change initialization of dict * reinit opt_geom_opt if deepcopied to none * ensure eddrm stops attempting to lower potim when it has reached threshold * non / empty dict
1 parent 1bcf4e0 commit 0c1b6a5

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/custodian/qchem/jobs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def opt_with_frequency_flattener(
272272
freq_rem["job_type"] = "freq"
273273
opt_rem = copy.deepcopy(orig_input.rem)
274274
opt_rem["job_type"] = opt_method
275-
opt_geom_opt = None
275+
opt_geom_opt = {}
276276
if "geom_opt2" in orig_input.rem:
277277
freq_rem.pop("geom_opt2", None)
278278
if linked:
@@ -300,7 +300,7 @@ def opt_with_frequency_flattener(
300300
freq_outdata = QCOutput(output_file + ".freq_pre").data
301301
if freq_outdata["version"] == "6":
302302
opt_set = OptSet(molecule=freq_outdata["initial_molecule"], qchem_version=freq_outdata["version"])
303-
opt_geom_opt = copy.deepcopy(opt_set.geom_opt)
303+
opt_geom_opt = copy.deepcopy(opt_set.geom_opt) or {}
304304

305305
if linked:
306306
opt_rem["geom_opt_hessian"] = "read"
@@ -320,7 +320,7 @@ def opt_with_frequency_flattener(
320320
vdw_mode=orig_input.vdw_mode,
321321
van_der_waals=orig_input.van_der_waals,
322322
nbo=orig_input.nbo,
323-
geom_opt=opt_geom_opt,
323+
geom_opt=opt_geom_opt or None,
324324
)
325325
opt_QCInput.write_file(input_file)
326326
first = False
@@ -345,7 +345,7 @@ def opt_with_frequency_flattener(
345345
opt_outdata = QCOutput(f"{output_file}.{opt_method}_{ii}").data
346346
opt_indata = QCInput.from_file(f"{input_file}.{opt_method}_{ii}")
347347
if opt_outdata["version"] == "6":
348-
opt_geom_opt = copy.deepcopy(opt_indata.geom_opt)
348+
opt_geom_opt = copy.deepcopy(opt_indata.geom_opt) or {}
349349
opt_geom_opt["initial_hessian"] = "read"
350350
for key in opt_indata.rem:
351351
if key not in {"job_type", "geom_opt2", "scf_guess_always"}:
@@ -437,7 +437,7 @@ def opt_with_frequency_flattener(
437437
vdw_mode=orig_input.vdw_mode,
438438
van_der_waals=orig_input.van_der_waals,
439439
nbo=orig_input.nbo,
440-
geom_opt=opt_geom_opt,
440+
geom_opt=opt_geom_opt or None,
441441
)
442442
opt_QCInput.write_file(input_file)
443443
else:

src/custodian/vasp/handlers.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,8 +556,10 @@ def correct(self, directory="./"):
556556
if vi["INCAR"].get("ALGO", "Normal").lower() in {"fast", "veryfast"}:
557557
actions.append({"dict": "INCAR", "action": {"_set": {"ALGO": "Normal"}}})
558558
else:
559-
potim = round(vi["INCAR"].get("POTIM", 0.5) / 2.0, 2)
560-
actions.append({"dict": "INCAR", "action": {"_set": {"POTIM": potim}}})
559+
current_potim = vi["INCAR"].get("POTIM", 0.5)
560+
if (potim := round(current_potim / 2.0, 2)) < current_potim:
561+
actions.append({"dict": "INCAR", "action": {"_set": {"POTIM": potim}}})
562+
561563
if vi["INCAR"].get("ICHARG", 0) < 10:
562564
actions += [
563565
{"file": "CHGCAR", "action": {"_file_delete": {"mode": "actual"}}},

0 commit comments

Comments
 (0)