Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
jrudz committed Sep 13, 2024
1 parent bdfc6d1 commit 5cfef08
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions atomisticparsers/gromacs/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def str_to_step_info(val_in):
),
Quantity(
'input_parameters',
r'Input Parameters:\s*([\s\S]+?)\n\n',
r'Input Parameters:\s*\n([\s\S]+?)\n\n',
str_operation=str_to_input_parameters,
),
Quantity('maximum_force', r'Norm of force\s*([\s\S]+?)\n\n', flatten=False),
Expand Down Expand Up @@ -654,7 +654,7 @@ def get_force_field_parameters(self, gromacs_version: str = None) -> List[Dict]:
tpr_setting.F_VSITE3FD,
tpr_setting.F_VSITE3FAD,
]:
parameters.append(data.unpack_real()) # vsite.a
parameters.append(data.unpack_reafilel()) # vsite.a

elif i in [
tpr_setting.F_VSITE3OUT,
Expand Down Expand Up @@ -1558,10 +1558,18 @@ def parse_workflow(self):
)
sec_fe = self.archive.workflow2.results.free_energy_calculations[0]
sec_fe.method_ref = sec_fe_parameters
sec_fe.value_total_energy_magnitude = columns[:, 0]
sec_fe.value_total_energy_derivative_magnitude = columns[:, 1]
sec_fe.value_total_energy_differences_magnitude = columns[:, 2:-1]
sec_fe.value_PV_energy_magnitude = columns[:, -1]
sec_fe.value_total_energy_magnitude = (
columns[:, 0] * self._gro_energy_units
)
sec_fe.value_total_energy_derivative_magnitude = (
columns[:, 1] * self._gro_energy_units
)
sec_fe.value_total_energy_differences_magnitude = (
columns[:, 2:-1] * self._gro_energy_units
)
sec_fe.value_PV_energy_magnitude = (
columns[:, -1] * self._gro_energy_units
)

def standardize_input_parameters(self, input_dict: dict):
"""_summary_
Expand Down

0 comments on commit 5cfef08

Please sign in to comment.