Skip to content

Commit

Permalink
Merge pull request #2523 from lilyminium/hole
Browse files Browse the repository at this point in the history
Created hole2 module
  • Loading branch information
orbeckst authored Mar 4, 2020
2 parents eb18a33 + fc938b6 commit 9d602ec
Show file tree
Hide file tree
Showing 9 changed files with 3,058 additions and 41 deletions.
4 changes: 4 additions & 0 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ Fixes
* Added parmed to setup.py

Enhancements
* New analysis.hole2 module for HOLE interfacing. Contains a function (hole)
for running HOLE on singular PDB files and class (HoleAnalysis) for
trajectories (PR #2523)
* Changed selection wildcards to support multiple wildcards (#2436)
* Added coordinate reader and writer for NAMD binary coordinate format (PR #2485)
* Improved ClusterCollection and Cluster string representations (Issue #2464)
Expand Down Expand Up @@ -134,6 +137,7 @@ Changes
function calls. (Issue #782)

Deprecations
* analysis.hole is deprecated in 1.0 (remove in 2.0)
* analysis.hbonds.HydrogenBondAnalysis is deprecated in 1.0 (remove in 2.0)


Expand Down
120 changes: 79 additions & 41 deletions package/MDAnalysis/analysis/hole.py

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions package/MDAnalysis/analysis/hole2/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# -*- Mode: python; tab-width: 4; indent-tabs-mode:nil; coding:utf-8 -*-
# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
#
# MDAnalysis --- https://www.mdanalysis.org
# Copyright (c) 2006-2020 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
# R. J. Gowers, M. Linke, J. Barnoud, T. J. E. Reddy, M. N. Melo, S. L. Seyler,
# D. L. Dotson, J. Domanski, S. Buchoux, I. M. Kenney, and O. Beckstein.
# MDAnalysis: A Python package for the rapid analysis of molecular dynamics
# simulations. In S. Benthall and S. Rostrup editors, Proceedings of the 15th
# Python in Science Conference, pages 102-109, Austin, TX, 2016. SciPy.
# doi: 10.25080/majora-629e541a-00e
#
# N. Michaud-Agrawal, E. J. Denning, T. B. Woolf, and O. Beckstein.
# MDAnalysis: A Toolkit for the Analysis of Molecular Dynamics Simulations.
# J. Comput. Chem. 32 (2011), 2319--2327, doi:10.1002/jcc.21787
#

from __future__ import absolute_import
from ...due import due, Doi
from .hole import hole, HoleAnalysis
from .utils import create_vmd_surface

due.cite(Doi("10.1016/S0006-3495(93)81293-1"),
description="HOLE program",
path="MDAnalysis.analysis.hole",
cite_module=True)
due.cite(Doi("10.1016/S0263-7855(97)00009-X"),
description="HOLE program",
path="MDAnalysis.analysis.hole",
cite_module=True)
due.cite(Doi("10.1016/j.jmb.2013.10.024"),
description="HOLE trajectory analysis with orderparameters",
path="MDAnalysis.analysis.hole",
cite_module=True)
del Doi
Loading

0 comments on commit 9d602ec

Please sign in to comment.