Merge branch 'refs/heads/mdeval_dev'

This commit is contained in:
Sebastian Kloth 2024-05-02 16:18:18 +02:00
commit b7bb8cb379
2 changed files with 2 additions and 17 deletions

View File

@ -80,10 +80,7 @@ def occupation_matrix(
bins = [x_bins, y_bins, z_bins]
# Trajectory is split for parallel computing
size = math.ceil(len(frame_indices) / nodes)
indices = [
np.arange(len(frame_indices))[i : i + size]
for i in range(0, len(frame_indices), size)
]
indices = [frame_indices[i : i + size] for i in range(0, len(frame_indices), size)]
pool = mp.Pool(nodes)
results = pool.map(
partial(_calc_histogram, trajectory=trajectory, bins=bins), indices

View File

@ -13,19 +13,7 @@ def trajectory(request):
def test_get_fel(trajectory):
test_array = np.array(
[
184.4909136,
233.79320471,
223.12003988,
228.49746397,
200.5626769,
212.82484221,
165.10818396,
170.74123681,
175.86672931,
]
)
test_array = np.array([210., 214., 209., 192., 200., 193., 230., 218., 266.])
OW = trajectory.subset(atom_name="OW")
box = trajectory[0].box