Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
60973ba
Inditial addition of code to calculate time-averaged msd for non-line…
gitsirsha Jun 13, 2025
0dc3db1
updated_documentation_v1_plots_removed
gitsirsha Jun 13, 2025
f6f55a1
Added_name_in_the_package/AUTHORS
gitsirsha Jun 15, 2025
e363635
addressed_review_comments_mainly_removed_linearity_check
gitsirsha Jun 30, 2025
5aa09ca
added results delta t values
gitsirsha Jul 14, 2025
871faa2
initial test added changed changelog and docs
gitsirsha Jul 22, 2025
00fc309
added LAMMPSDUMP_non_linear to __all__
gitsirsha Jul 22, 2025
c90f52e
ran black 24.10.0
gitsirsha Jul 22, 2025
7ad3e09
Revert "ran black 24.10.0"
gitsirsha Jul 22, 2025
b1ee485
added test for all msd types - added test with start stop step
gitsirsha Jul 28, 2025
2bbdffb
ran black 24.4.2
gitsirsha Jul 28, 2025
ee764b7
ran black on datafiles.py
gitsirsha Jul 28, 2025
0f50810
cleanup - removed docs and edited formatting
gitsirsha Jul 28, 2025
7b16b9f
added results.msds_by_particle for non_linear method
gitsirsha Jul 29, 2025
72b3dd3
minor chancge - versionadded to versionchanged
gitsirsha Jul 29, 2025
e367984
dtype removal and cleanup misplaced strings
gitsirsha Jul 30, 2025
069bec5
Added entry to project.toml
gitsirsha Jul 31, 2025
ac4b4b2
Attribute definition edit for cases non_linear : bool
gitsirsha Aug 1, 2025
3ceca5c
Indentation edit
gitsirsha Aug 1, 2025
1a24e36
update warning in msd docs
orbeckst Aug 1, 2025
daad519
Testing doc formatting, WIP
gitsirsha Aug 14, 2025
29df80e
Merge branch 'develop' into feature-Non-linear-time-averaged-msd
gitsirsha Aug 15, 2025
b578a67
Update self.results.delta_t_values #1
gitsirsha Aug 16, 2025
e26f53a
Update self.results.delta_t_values #2
gitsirsha Aug 16, 2025
125e710
Update self.results.delta_t_values #3
gitsirsha Aug 16, 2025
498a061
weird formatting edits
gitsirsha Aug 16, 2025
788758d
removed dump_times
gitsirsha Aug 16, 2025
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
4 changes: 3 additions & 1 deletion benchmarks/benchmarks/analysis/rms.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ def setup(self, num_atoms, use_weights, center, superposition):
self.u.trajectory[-1]
self.B = self.u.atoms.positions.copy()[:num_atoms]
self.atoms = self.u.atoms[:num_atoms]
self.weights = self.atoms.masses/np.sum(self.atoms.masses) if use_weights else None
self.weights = (
self.atoms.masses / np.sum(self.atoms.masses) if use_weights else None
)

def time_rmsd(self, num_atoms, weights, center, superposition):
"""Benchmark rmsd function using a setup similar to
Expand Down
2 changes: 1 addition & 1 deletion package/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ Chronological list of authors
- Tulga-Erdene Sodjargal
- Gareth Elliott
- Marc Schuh

- Sirsha Ganguly

External code
-------------
Expand Down
5 changes: 5 additions & 0 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ Enhancements
(PR #5038)
* Moved distopia checking function to common import location in
MDAnalysisTest.util (PR #5038)
* Added new method '_conclude_non_linear` to calculate time-averaged
mean square displacement in `package/MDAnalysis/analysis/msd.py`,
new bool keyword argument `non_linear=True` under `EinsteinMSD`
enables execution of this method.
(Issue #5028, PR #5066)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Focus on the user-visible changes and keep it short

Suggested change
* Added new method '_conclude_non_linear` to calculate time-averaged
mean square displacement in `package/MDAnalysis/analysis/msd.py`,
new bool keyword argument `non_linear=True` under `EinsteinMSD`
enables execution of this method.
(Issue #5028, PR #5066)
* Added capability to calculate MSD from frames with irregular (non-linear)
time spacing in analysis.msd.EinsteinMSD with keyword argument
`non_linear=True` (Issue #5028, PR #5066)

Also, traditionally we add the newest changes under the heading, i.e., move it to directly under "Enhancements"


Changes
* Refactored the RDKit converter code to move the inferring code in a separate
Expand Down
8 changes: 2 additions & 6 deletions package/MDAnalysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,7 @@
_CONVERTERS: Dict = {}
# Registry of TopologyAttributes
_TOPOLOGY_ATTRS: Dict = {} # {attrname: cls}
_TOPOLOGY_TRANSPLANTS: Dict = (
{}
) # {name: [attrname, method, transplant class]}
_TOPOLOGY_TRANSPLANTS: Dict = {} # {name: [attrname, method, transplant class]}
_TOPOLOGY_ATTRNAMES: Dict = {} # {lower case name w/o _ : name}
_GUESSERS: Dict = {}

Expand All @@ -204,9 +202,7 @@
del logging

# only MDAnalysis DeprecationWarnings are loud by default
warnings.filterwarnings(
action="once", category=DeprecationWarning, module="MDAnalysis"
)
warnings.filterwarnings(action="once", category=DeprecationWarning, module="MDAnalysis")


from . import units
Expand Down
Loading
Loading