Skip to content

Commit a27ba28

Browse files
committed
Merge branch 'master' of github.com:materialsproject/pymatgen
2 parents 042bea3 + 32d9beb commit a27ba28

21 files changed

+635
-81
lines changed

src/pymatgen/io/ase.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import numpy as np
1414
from monty.json import MontyDecoder, MSONable, jsanitize
1515

16-
from pymatgen.core.structure import Molecule, Structure
16+
from pymatgen.core.structure import Lattice, Molecule, Structure
1717

1818
try:
1919
from ase.atoms import Atoms
@@ -103,7 +103,7 @@ def get_atoms(structure: SiteCollection, msonable: bool = True, **kwargs) -> MSO
103103
symbols = [str(site.specie.symbol) for site in structure]
104104
positions = [site.coords for site in structure]
105105
if hasattr(structure, "lattice"):
106-
pbc = True
106+
pbc = getattr(structure.lattice, "pbc", True)
107107
cell = structure.lattice.matrix
108108
else: # Molecule without lattice
109109
pbc = False
@@ -284,7 +284,7 @@ def get_structure(atoms: Atoms, cls: type[Structure] = Structure, **cls_kwargs)
284284
structure = cls(symbols, positions, properties=properties, **cls_kwargs)
285285
else:
286286
structure = cls(
287-
lattice,
287+
Lattice(lattice, pbc=atoms.pbc),
288288
symbols,
289289
positions,
290290
coords_are_cartesian=True,

src/pymatgen/io/lobster/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from .inputs import Lobsterin
1111
from .outputs import (
1212
Bandoverlaps,
13+
Bwdf,
1314
Charge,
1415
Cohpcar,
1516
Doscar,
@@ -20,6 +21,7 @@
2021
Lobsterout,
2122
MadelungEnergies,
2223
NciCobiList,
24+
Polarization,
2325
SitePotential,
2426
Wavefunction,
2527
)

src/pymatgen/io/lobster/inputs.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ class Lobsterin(UserDict, MSONable):
7070
"useDecimalPlaces",
7171
"COHPSteps",
7272
"basisRotation",
73+
"gridDensityForPrinting",
74+
"gridBufferForPrinting",
7375
)
7476

7577
# These keywords need an additional string suffix
@@ -87,10 +89,13 @@ class Lobsterin(UserDict, MSONable):
8789
# The keywords themselves (without suffix) can trigger additional functionalities
8890
_BOOLEAN_KEYWORDS: tuple[str, ...] = (
8991
"saveProjectionToFile",
92+
"skipCar",
9093
"skipdos",
9194
"skipcohp",
9295
"skipcoop",
9396
"skipcobi",
97+
"skipMOFE",
98+
"skipMolecularOrbitals",
9499
"skipMadelungEnergy",
95100
"loadProjectionFromFile",
96101
"printTotalSpilling",
@@ -103,6 +108,9 @@ class Lobsterin(UserDict, MSONable):
103108
"userecommendedbasisfunctions",
104109
"skipProjection",
105110
"printLmosOnAtoms",
111+
"printMofeAtomWise",
112+
"printMofeMoleculeWise",
113+
"writeAtomicOrbitals",
106114
"writeBasisFunctions",
107115
"writeMatricesToFile",
108116
"noFFTforVisualization",
@@ -131,6 +139,7 @@ class Lobsterin(UserDict, MSONable):
131139
"createFatband",
132140
"customSTOforAtom",
133141
"cobiBetween",
142+
"printLmosOnAtomswriteAtomicDensities",
134143
)
135144

136145
# Generate {lowered: original} mappings

0 commit comments

Comments
 (0)