Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CodeEntropy/entropy.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,10 @@ def _calculate_water_entropy(self, universe, start, end, step):
end (int): End frame.
step (int): Step size.
"""
Sorient_dict, _, vibrations, _ = (
GetSolvent.get_interfacial_water_orient_entropy(universe, start, end, step)
Sorient_dict, _, vibrations, _, _ = (
GetSolvent.get_interfacial_water_orient_entropy(
universe, start, end, step, self._args.temperature, parallel=True
)
)

# Log per-residue entropy using helper functions
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies = [
"PyYAML==6.0.2",
"python-json-logger==3.3.0",
"tabulate==0.9.0",
"waterEntropy==1.1.0"
"waterEntropy==1.2.0"
]

[project.urls]
Expand Down
2 changes: 2 additions & 0 deletions tests/test_CodeEntropy/test_entropy.py
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,7 @@ def test_calculate_water_entropy(self, mock_get_entropy):
None,
mock_vibrations,
None,
None,
)

mock_universe = MagicMock()
Expand Down Expand Up @@ -1018,6 +1019,7 @@ def test_calculate_water_entropy_minimal(self, mock_get_entropy):
rotational_S={("ACE_1", "WAT"): 2.0},
),
None,
None,
)

# Simulate residue-level results already collected
Expand Down