Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor wrapper and add Gromacs support #140

Merged
merged 32 commits into from
Oct 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e8676d5
add convert_to_gromacs to tleap
jeff231li Sep 24, 2020
9262267
refactor Amber simulation wrapper
jeff231li Sep 24, 2020
12fdf34
initial commit for gromacs simulation wrapper
jeff231li Sep 25, 2020
a8d8d0d
fix string
jeff231li Sep 25, 2020
516899b
lint
jeff231li Sep 25, 2020
13de2b1
update tutorials for Amber wrapper refactoring
jeff231li Sep 25, 2020
9b408d4
fix add_dummy_to_plumed function
Sep 26, 2020
4bd9dda
add missing format in tleap when converting to Gromacs files
jeff231li Sep 26, 2020
8d54a87
update simulate.py
jeff231li Sep 26, 2020
c0435fe
Add tutorial for APR/Gromacs
jeff231li Sep 26, 2020
2097111
lint
jeff231li Sep 26, 2020
576b66f
code cleanup
jeff231li Sep 26, 2020
4dabe79
fix error handling for gromacs wrapper
jeff231li Sep 26, 2020
497ea41
fix bug in simulate.py
jeff231li Sep 26, 2020
a1759e8
fix file naming in glob
jeff231li Sep 26, 2020
883e321
update convert_to_gromacs to include *.inpcrd coordinates file
jeff231li Sep 27, 2020
e5041b4
moved tutorial to docs and upgrade doco
jeff231li Sep 28, 2020
429b95c
change function name in plumed.py
jeff231li Sep 28, 2020
6e10c36
update read_yaml.py
jeff231li Sep 28, 2020
6542c47
added images to document
jeff231li Sep 29, 2020
a36edd9
Merge branch 'gromacs_support' of https://github.com/slochower/pAPRik…
jeff231li Sep 29, 2020
c19a0a7
fix references
jeff231li Sep 29, 2020
4383916
modularize simulate
jeff231li Sep 30, 2020
f11d070
add functions to __init__
jeff231li Sep 30, 2020
0df19f2
refactors API docs
jeff231li Sep 30, 2020
fc05d9a
update doco
jeff231li Oct 1, 2020
d4eef70
fix bug in tleap
jeff231li Oct 3, 2020
036906c
change default settings in gromacs wrapper
jeff231li Oct 3, 2020
52dc3e7
update tleap.convert_to_gromacs
jeff231li Oct 5, 2020
03ab04b
fix tutorials
jeff231li Oct 5, 2020
a756606
update
jeff231li Oct 7, 2020
a095459
remove complex folder
jeff231li Oct 7, 2020
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
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ To compile the docs, first ensure that Sphinx and the ReadTheDocs theme are inst


```bash
conda install sphinx sphinx_rtd_theme
conda install sphinx nbsphinx sphinx_rtd_theme
```


Expand Down
76 changes: 76 additions & 0 deletions docs/_static/css/theme_overrides.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/* override table width restrictions */
@media screen and (min-width: 1000px) {

.wy-table-responsive table td {
/* !important prevents the common CSS stylesheets from overriding
this as on RTD they are loaded after this stylesheet */
white-space: normal !important;
}

.wy-table-responsive {
overflow: visible !important;
}
}

table.docutils.clean-table {
border: 0 solid #e1e4e5;
}
table.docutils.clean-table thead {
border-top: 2px solid #e1e4e5;
border-bottom: 2px solid #e1e4e5;
}
table.docutils.clean-table thead th {
border: 0 solid #e1e4e5;
}

table.clean-table div.line-block {
margin-bottom: 0;
line-height: normal;
}
table.clean-table.docutils td {
border-bottom: 0 solid #e1e4e5;
border-left: 0 solid #e1e4e5;
}
table.clean-table.docutils:not(.field-list) tr:nth-child(2n-1) td {
background-color: initial
}

table.clean-table.property-table th:not(:first-child) {
text-align: center;
}
table.clean-table.property-table td:not(:first-child) {
text-align: center;
}

ul.spaced-list li {
margin-bottom: 10px;
}

.green-font {
color: mediumseagreen;
}
.red-font {
color: red;
}

.ignore-width {
display: inline-block;
width: 0;
}

.rst-content div.figure p.caption {
margin-top: 14px;
}

.rst-content code.xref {
font-weight: normal;
color: #9B59B6;
}

/* override math equation align */
.math {
text-align: left;
}
.eqno {
float: right;
}
Binary file added docs/_static/images/flowchart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/paprika.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/pmf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/restraints.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions docs/align.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/amber.rst

This file was deleted.

25 changes: 25 additions & 0 deletions docs/api.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
API
===
This page provides links to the documentation for classes and modules available in `paprika`.

* :doc:`source/align`
* :doc:`source/analysis`
* :doc:`source/dummy`
* :doc:`source/evaluator`
* :doc:`source/restraints`
* :doc:`source/simulation`
* :doc:`source/tleap`
* :doc:`source/utils`

.. toctree::
:maxdepth: 10
:hidden:

source/align
source/analysis
source/dummy
source/evaluator
source/restraints
source/simulation
source/tleap
source/utils
15 changes: 15 additions & 0 deletions docs/build_docs.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
******************
Compiling the Docs
******************

The docs for this project are built with [Sphinx](http://www.sphinx-doc.org/en/master/).
To compile the docs, first ensure that Sphinx, and the ReadTheDocs theme are installed.::

conda install sphinx nbsphinx sphinx_rtd_theme

Once installed, you can use the ``Makefile`` in this directory to compile static HTML pages by::

make html

The compiled docs will be in the ``_build`` directory and can be viewed by opening ``index.html`` (which may itself
be inside a directory called ``html/`` depending on what version of Sphinx is installed).
18 changes: 15 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

project = "pAPRika"
copyright = (
"2020, Niel M. Henriksen, David R. Slochower, Simon Boothroyd, Jeff Setiadi, and Willa Wang. "
"2020, Niel M. Henriksen, David R. Slochower, Simon Boothroyd, Jeffry Setiadi, and Willa Wang. "
"Project structure based on the Computational Molecular Science Python Cookiecutter version 1.0"
)
author = "Niel M. Henriksen, David R. Slochower, Simon Boothroyd, Jeff Setiadi, and Willa Wang"
author = "Niel M. Henriksen, David R. Slochower, Simon Boothroyd, Jeffry Setiadi, and Willa Wang"

# The short X.Y version
version = ""
Expand Down Expand Up @@ -53,6 +53,7 @@
"sphinx.ext.mathjax",
"sphinx.ext.viewcode",
"sphinx.ext.intersphinx",
"sphinxcontrib.bibtex",
"nbsphinx",
]

Expand All @@ -61,7 +62,12 @@
autodoc_default_flags = ["members", "inherited-members"]
autodoc_member_order = "bysource" # preserve ordering in source

autodoc_mock_imports = ["pytraj"]
autodoc_mock_imports = [
"pydantic",
"pytraj",
"scipy",
"typing_extensions",
]

# Autolabel settings
autosectionlabel_maxdepth = 3
Expand Down Expand Up @@ -119,6 +125,12 @@
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ["_static"]

html_context = {
"css_files": [
"_static/css/theme_overrides.css", # override wide tables in RTD theme
],
}

# Custom sidebar templates, must be a dictionary that maps document names
# to template names.
#
Expand Down
2 changes: 2 additions & 0 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ dependencies:

# Sphinx specific
- numpydoc
- pandoc
- sphinx
- nbsphinx
- sphinx_rtd_theme
- sphinxcontrib-bibtex

# Standard dependencies
- pip
Expand Down
Loading