Skip to content

Commit dd01d9e

Browse files
committed
add back in the option to disable water entropy calculations
1 parent adca1bf commit dd01d9e

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

CodeEntropy/config/arg_config_manager.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
"default": "output_file.json",
6060
},
6161
"force_partitioning": {"type": float, "help": "Force partitioning", "default": 0.5},
62+
"disable_water_entropy": {
63+
"type": bool,
64+
"help": "If set to True, disables the calculation of water entropy",
65+
"default": False,
66+
},
6267
}
6368

6469

CodeEntropy/entropy.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ def execute(self):
4343
start, end, step = self._get_trajectory_bounds()
4444
number_frames = self._get_number_frames(start, end, step)
4545

46-
if self._universe.select_atoms("water").n_atoms > 0:
46+
has_water = self._universe.select_atoms("water").n_atoms > 0
47+
if has_water and not self._args.disable_water_entropy:
4748
self._calculate_water_entropy(self._universe, start, end, step)
4849

4950
if self._args.selection_string != "all":

config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
run1:
44
top_traj_file:
5-
selection_string:
5+
selection_string:
66
start:
7-
end:
7+
end:
88
step:
99
bin_width:
1010
temperature:
1111
verbose:
12-
thread:
13-
output_file:
12+
thread:
13+
output_file:
1414
force_partitioning:
15+
disable_water_entropy:

0 commit comments

Comments
 (0)