Skip to content

Commit 1b0fcb8

Browse files
committed
remove rigid from conversion.py, update tests
1 parent 1379b3e commit 1b0fcb8

File tree

3 files changed

+3
-452
lines changed

3 files changed

+3
-452
lines changed

mbuild/conversion.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ def load(
3636
relative_to_module=None,
3737
compound=None,
3838
coords_only=False,
39-
rigid=False,
4039
smiles=False,
4140
infer_hierarchy=True,
4241
backend=None,
@@ -68,8 +67,6 @@ def load(
6867
will be added to the existing compound as a sub compound.
6968
coords_only : bool, optional, default=False
7069
Only load the coordinates into an existing compound.
71-
rigid : bool, optional, default=False
72-
Treat the compound as a rigid body
7370
backend : str, optional, default=None
7471
Backend used to load structure from file or string. If not specified, a
7572
default backend (extension specific) will be used.
@@ -103,7 +100,6 @@ def load(
103100
obj=filename_or_object,
104101
compound=compound,
105102
coords_only=coords_only,
106-
rigid=rigid,
107103
infer_hierarchy=infer_hierarchy,
108104
**kwargs,
109105
)
@@ -126,7 +122,6 @@ def load(
126122
relative_to_module=relative_to_module,
127123
compound=compound,
128124
coords_only=coords_only,
129-
rigid=rigid,
130125
backend=backend,
131126
infer_hierarchy=infer_hierarchy,
132127
**kwargs,
@@ -137,7 +132,6 @@ def load_object(
137132
obj,
138133
compound=None,
139134
coords_only=False,
140-
rigid=False,
141135
infer_hierarchy=True,
142136
**kwargs,
143137
):
@@ -156,8 +150,6 @@ def load_object(
156150
The host mbuild Compound
157151
coords_only : bool, optional, default=False
158152
Only load the coordinates into existing compound.
159-
rigid : bool, optional, default=False
160-
Treat the compound as a rigid body
161153
infer_hierarchy : bool, optional, default=True
162154
If True, infer hiereachy from chains and residues
163155
**kwargs : keyword arguments
@@ -200,8 +192,6 @@ def load_object(
200192
infer_hierarchy=infer_hierarchy,
201193
**kwargs,
202194
)
203-
if rigid:
204-
compound.label_rigid_bodies()
205195
return compound
206196

207197
# If nothing is return raise an error
@@ -323,7 +313,6 @@ def load_file(
323313
relative_to_module=None,
324314
compound=None,
325315
coords_only=False,
326-
rigid=False,
327316
backend=None,
328317
infer_hierarchy=True,
329318
**kwargs,
@@ -348,8 +337,6 @@ def load_file(
348337
will be added to the existing compound as a sub compound.
349338
coords_only : bool, optional, default=False
350339
Only load the coordinates into an existing compound.
351-
rigid : bool, optional, default=False
352-
Treat the compound as a rigid body
353340
backend : str, optional, default=None
354341
Backend used to load structure from file. If not specified, a default
355342
backend (extension specific) will be used.
@@ -462,8 +449,6 @@ def load_file(
462449
)
463450
# Note: 'Input not supported' error will be handled
464451
# by the corresponding backend
465-
if rigid:
466-
compound.label_rigid_bodies()
467452
return compound
468453

469454

@@ -1199,7 +1184,6 @@ def to_hoomdsnapshot(
11991184
identify_connections=True,
12001185
ref_distance=1.0,
12011186
ref_mass=1.0,
1202-
rigid_bodies=None,
12031187
shift_coords=True,
12041188
write_special_pairs=True,
12051189
**kwargs,
@@ -1216,11 +1200,6 @@ def to_hoomdsnapshot(
12161200
Reference distance for conversion to reduced units
12171201
ref_mass : float, optional, default=1.0
12181202
Reference mass for conversion to reduced units
1219-
rigid_bodies : list of int, optional, default=None
1220-
List of rigid body information. An integer value is required for each
1221-
atom corresponding to the index of the rigid body the particle is to be
1222-
associated with. A value of None indicates the atom is not part of a
1223-
rigid body.
12241203
shift_coords : bool, optional, default=True
12251204
Shift coordinates from (0, L) to (-L/2, L/2) if necessary.
12261205
write_special_pairs : bool, optional, default=True
@@ -1249,7 +1228,6 @@ def to_hoomdsnapshot(
12491228
snapshot, refs = to_gsd_snapshot(
12501229
top=gmso_top,
12511230
base_units=base_units,
1252-
rigid_bodies=rigid_bodies,
12531231
shift_coords=shift_coords,
12541232
parse_special_pairs=write_special_pairs,
12551233
auto_scale=False,

mbuild/tests/test_compound.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,9 +2560,9 @@ def test_elements_from_smiles(self, backend):
25602560
for particle in mol.particles():
25612561
assert particle.element is not None
25622562

2563-
def test_mins_maxs(self, rigid_benzene):
2564-
assert np.allclose(rigid_benzene.mins, [-0.2267, -0.15422, 0.0])
2565-
assert np.allclose(rigid_benzene.maxs, [0.20318, 0.34207, 0.0])
2563+
def test_mins_maxs(self, ethane):
2564+
assert np.allclose(ethane.mins, [-0.10699999, -0.21690001, -0.0993])
2565+
assert np.allclose(ethane.maxs, [0.10699999, 0.07690001, 0.0653])
25662566

25672567
def test_periodicity_raises(self):
25682568
with pytest.raises(ValueError):

0 commit comments

Comments
 (0)