Skip to content

Commit ac9fa46

Browse files
committed
Changing to elec-n-bands from IntTag to TagContainer with new 'multipilier' optional FloatTag subtag
1 parent 83b3563 commit ac9fa46

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/pymatgen/io/jdftx/jdftxinfile_master_format.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,13 @@
497497
"smearingWidth": FloatTag(write_tagname=False, optional=False),
498498
},
499499
),
500-
"elec-n-bands": IntTag(),
500+
# "elec-n-bands": IntTag(),
501+
"elec-n-bands": TagContainer(
502+
subtags={
503+
"n": IntTag(write_tagname=False, optional=False, lb=0, lb_incl=False),
504+
"multiplier": FloatTag(write_tagname=True, optional=True, lb=1.0, lb_incl=True),
505+
}
506+
),
501507
"spintype": StrTag(options=["no-spin", "spin-orbit", "vector-spin", "z-spin"]),
502508
"initial-magnetic-moments": InitMagMomTag(),
503509
"elec-initial-magnetization": TagContainer(

src/pymatgen/io/jdftx/outputs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ def _find_jdftx_out_file(calc_dir: Path) -> Path:
907907
"""
908908
out_files = _find_jdftx_dump_file(calc_dir, "out")
909909
if len(out_files) > 1:
910-
raise FileNotFoundError("Multiple JDFTx out files found in directory.")
910+
raise FileNotFoundError(f"Multiple JDFTx out files found in directory {calc_dir}.")
911911
return out_files[0]
912912

913913

@@ -924,7 +924,7 @@ def _find_jdftx_dump_file(calc_dir: Path, dump_fname: str) -> list[Path]:
924924
dump_files = list(calc_dir.glob(f"*.{dump_fname}")) + list(calc_dir.glob(f"{dump_fname}"))
925925
dump_files = [f for f in dump_files if f.is_file()]
926926
if len(dump_files) == 0:
927-
raise FileNotFoundError(f"No JDFTx {dump_fname} file found in directory.")
927+
raise FileNotFoundError(f"No JDFTx {dump_fname} file found in directory {calc_dir}.")
928928
return dump_files
929929

930930

0 commit comments

Comments
 (0)