Skip to content

Commit 8d3c85d

Browse files
committed
Merge branch 'master' of https://github.com/MaterSim/PyXtal
2 parents e378ea3 + 5d3979a commit 8d3c85d

6 files changed

Lines changed: 10 additions & 12 deletions

File tree

flask/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
click==7.1.2
2-
Flask==2.3.2
2+
Flask==3.1.3
33
Flask-Bootstrap==3.3.7.1
44
Flask-Uploads==0.2.1
55
Flask-WTF==0.15.1
@@ -8,5 +8,5 @@ Jinja2==3.1.6
88
MarkupSafe==2.0.1
99
python-dotenv==0.17.1
1010
visitor==0.1.3
11-
Werkzeug==3.1.5
11+
Werkzeug==3.1.6
1212
WTForms==2.2.1

pyxtal/XRD.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def plotly_pxrd(
536536
title="PXRD of " + self.name,
537537
)
538538

539-
if os.environ["_"].find("jupyter") == -1:
539+
if os.environ.get("_", "").find("jupyter") == -1:
540540
if html is None:
541541
return fig.to_html()
542542
else:

pyxtal/crystal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def __init__(
119119
compat, self.has_freedom = self.group.check_compatible(self.numIons)
120120
if not compat:
121121
self.valid = False
122-
msg = "Compoisition " + str(self.numIons)
122+
msg = "Composition " + str(self.numIons)
123123
msg += " not compatible with symmetry "
124124
msg += str(self.group.number)
125125
raise Comp_CompatibilityError(msg)

pyxtal/molecular_crystal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def __init__(
125125
compat, self.has_freedom = self.group.check_compatible(self.numMols) #self.valid_orientations)
126126

127127
if not compat:
128-
msg = f"Inincompatible compoisition {self.numMols} with symmetry {self.group.number}"
128+
msg = f"Incompatible composition {self.numMols} with symmetry {self.group.number}"
129129
raise Comp_CompatibilityError(msg)
130130

131131
self.set_volume()

pyxtal/representation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def to_pyxtal(self):
4848
4949
Args:
5050
smiles: list of smiles
51-
compoisition: list of composition
51+
composition: list of composition
5252
"""
5353
from pyxtal import pyxtal
5454

@@ -113,7 +113,7 @@ def to_pyxtal(self):
113113

114114
def to_array(self):
115115
"""
116-
Export only varibles to a 1d numpy array
116+
Export only variables to a 1d numpy array
117117
"""
118118
cells, xyzs = self.x[0][1:], self.x[1:]
119119
x = cells
@@ -278,7 +278,7 @@ def to_pyxtal(self, smiles=None, composition=None):
278278
279279
Args:
280280
smiles: list of smiles
281-
compoisition: list of composition
281+
composition: list of composition
282282
"""
283283
from pyxtal import pyxtal
284284

pyxtal/symmetry.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,10 +1232,8 @@ def get_spg_symmetry_object(self):
12321232
elif bravis == "F":
12331233
ops = ops[: int(len(ops) / 4)]
12341234

1235-
return site_symmetry(ops, l_type, bravis, self.number, True)
1236-
# ss.to_beautiful_matrix_representation()
1237-
else:
1238-
raise ValueError("Only supports space group symmetry")
1235+
return site_symmetry(ops, l_type, bravis, self.number, wp_id=0, parse_trans=True)
1236+
raise ValueError("Only supports space group symmetry")
12391237

12401238
def get_wyckoff_position(self, index):
12411239
"""

0 commit comments

Comments
 (0)