Skip to content

Commit

Permalink
Merge branch 'main' into reduce-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
daico007 committed Jul 17, 2024
2 parents a175b2a + 4930f94 commit b1f6399
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

project = "gmso"
copyright = "2024, mosdef-hub, Vanderbilt University"
author = "Matt Thompson, Alex Yang, Ray Matsumoto, Parashara Shamaprasad, Umesh Timalsina, Co D. Quach, Ryan S. DeFever, Justin Gilmer"
author = "Matt Thompson, Alex Yang, Ray Matsumoto, Parashara Shamaprasad, Umesh Timalsina, Co D. Quach, Ryan S. DeFever, Justin Gilmer, Nicholas C. Craven, Christopher R. Iacovella, Brad Crawford, and Chris Jones"

# The full version, including alpha/beta/rc tags
version = "0.12.4"
Expand Down
3 changes: 2 additions & 1 deletion gmso/utils/equation_compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,8 @@ def evaluate_OPLS_torsion_format_with_scaler(new_torsion_form, base_torsion_form
values = sympy.nonlinsolve(
[
eqn_ratio
- sympy.sympify(new_torsion_form) / sympy.sympify(base_torsion_form),
- sympy.nsimplify(new_torsion_form)
/ sympy.nsimplify(base_torsion_form),
],
[eqn_ratio],
)
Expand Down

0 comments on commit b1f6399

Please sign in to comment.