Skip to content

Commit

Permalink
Merge pull request #119 from bc118/slim_down_paper
Browse files Browse the repository at this point in the history
Slimed down paper and fixed some doc typos
  • Loading branch information
bc118 authored Aug 25, 2024
2 parents b6b2d41 + b695f07 commit e3e9ad3
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 25 deletions.
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,15 @@ $$\psi = \theta - 180^o$$

<u>Periodic-dihedral</u>:

$$U_{Periodic} = K_0 * (1 + cos(n_0*\theta - 90^o))$$
$$U_{Periodic} = K_0 * (1 + cos(n_0*\theta - d_0))$$

$$+ K_1 * (1 + cos(n_1*\theta - 180^o)) + K_2 * (1 + cos(n_2*\theta))$$
$$+ K_1 * (1 + cos(n_1*\theta - d_1)) + K_2 * (1 + cos(n_2*\theta - d_2))$$

$$+ K_3 * (1 + cos(n_3*\theta - 180^o)) + K_4 * (1 + cos(n_4*\theta))$$
$$+ K_3 * (1 + cos(n_3*\theta - d_3)) + K_4 * (1 + cos(n_4*\theta) - d_4)$$

$$where: n_0 = 0 ; n_1 = 1 ; n_2 = 2 ; n_3 = 3 ; n_4 = 4 $$

$$d_0 = 90^o ; d_1 = 180^o ; d_2 = 0^o ; d_3 = 180^o ; d_4 = 0^o
## Examples
Some basic workflows that use this package and cover several force field (FF) types are [here](https://github.com/GOMC-WSU/GOMC_Examples/tree/main/MoSDeF-dihedral-fit). A summary of the FFs covered in the examples are listed below.
Expand Down
16 changes: 11 additions & 5 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,21 @@ Ryckaert-Bellemans (RB)-torsions:
Periodic-dihedral:

.. math::
U_{Periodic} = K_0 * (1 + cos(n_0*\theta - 90^o))
U_{Periodic} = K_0 * (1 + cos(n_0*\theta - d_0))
.. math::
+ K_1 * (1 + cos(n_1*\theta - d_1))
+ K_2 * (1 + cos(n_2*\theta - d_2))
.. math::
+ K_3 * (1 + cos(n_3*\theta - d_3))
+ K_4 * (1 + cos(n_4*\theta - d_4))
.. math::
+ K_1 * (1 + cos(n_1*\theta - 180^o))
+ K_2 * (1 + cos(n_2*\theta))
where: n_0 = 0 ; n_1 = 1 ; n_2 = 2 ; n_3 = 3 ; n_4 = 4
.. math::
+ K_3 * (1 + cos(n_3*\theta - 180^o))
+ K_4 * (1 + cos(n_4*\theta))
d_0 = 90^o ; d_1 = 180^o ; d_2 = 0^o ; d_3 = 180^o ; d_4 = 0^o
**MoSDeF-dihedral-fit Highlights**:
#. With a **Gaussian 16** log file and a few user inputs, the user can easily fit a dihedral.
Expand Down
16 changes: 11 additions & 5 deletions docs/overview/general_info.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,21 @@ Ryckaert-Bellemans (RB)-torsions:
Periodic-dihedral:

.. math::
U_{Periodic} = K_0 * (1 + cos(n_0*\theta - 90^o))
U_{Periodic} = K_0 * (1 + cos(n_0*\theta - d_0))
.. math::
+ K_1 * (1 + cos(n_1*\theta - 180^o))
+ K_2 * (1 + cos(n_2*\theta))
+ K_1 * (1 + cos(n_1*\theta - d_1))
+ K_2 * (1 + cos(n_2*\theta - d_2))
.. math::
+ K_3 * (1 + cos(n_3*\theta - 180^o))
+ K_4 * (1 + cos(n_4*\theta))
+ K_3 * (1 + cos(n_3*\theta - d_3))
+ K_4 * (1 + cos(n_4*\theta - d_4))
.. math::
where: n_0 = 0 ; n_1 = 1 ; n_2 = 2 ; n_3 = 3 ; n_4 = 4
.. math::
d_0 = 90^o ; d_1 = 180^o ; d_2 = 0^o ; d_3 = 180^o ; d_4 = 0^o
MoSDeF-dihedral-fit is a part of the MoSDeF ecosystem
-----------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ We welcome contributions to our project, whether it's adding a feature, fixing a

1. **Open an Issue on GitHub**: Start by opening an issue on GitHub to describe the change you want to make. This allows for discussion and ensures everyone is aligned before significant work is undertaken. For bug fixes, we will confirm the behavior of the bug and validate the proposed fix. For new features, we will assess the feature's relevance and discuss possible designs. If you can provide code a short code section to show how the bug occurs or an example of the feature that you want, it will assist us in finding the bug or knowing what should be added. For added security measures, we prefer that you provide the short code sections in the text of the GitHub Issue and not by uploaded files or compressed folders/directories.

2. **Create a Pull Request (PR)**: Once there is consensus, [create a pull request](https://help.github.com/en/articles/about-pull-requests) with your code changes. For larger features, you can create a pull request before completing the implementation to receive early feedback. Indicate that it is a work in progress by including "WIP" at the start of the PR title.
2. **Create a Pull Request (PR)**: Once there is consensus, `create a pull request <https://help.github.com/en/articles/about-pull-requests>`_ with your code changes. For larger features, you can create a pull request before completing the implementation to receive early feedback. Indicate that it is a work in progress by including "WIP" at the start of the PR title.

3. **Documentation and Unit Tests**: For new features, please provide sufficient documentation and unit tests:
- **Documentation**: Include a summary of the method, explanations of all input parameters, and the expected output. A minimal example can be found [here](https://github.com/GOMC-WSU/MoSDeF-dihedral-fit/blob/main/mosdef_dihedral_fit/utils/io.py).
- **Unit Tests**: Unit tests for the all possible options that a user can select are mandatory, as this ensures that all the code is covered and checked regularly for errors. We use [pytest](https://docs.pytest.org/en/latest/), which can be run by executing `pytest` from the root directory of the package. These tests are automatically run as part of our CI workflow each time a change is added.
* **Documentation**: Include a summary of the method, explanations of all input parameters, and the expected output.
* **Unit Tests**: Unit tests for the all possible options that a user can select are mandatory, as this ensures that all the code is covered and checked regularly for errors. We use `pytest <https://docs.pytest.org/en/latest/>`_, which can be run by executing `pytest` from the root directory of the package. These tests are automatically run as part of our CI workflow each time a change is added.

4. **Review and Merge**: Once the PR is marked as ready and all checks have passed, core developers/maintainers will review it and may suggest changes. After everyone is satisfied with the code, the pull request will be merged.

Expand Down
Loading

0 comments on commit e3e9ad3

Please sign in to comment.