Homec4science

Merge branch 'master' into kokkos-vashishta

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 28 2016, 16:43.

Description

Merge branch 'master' into kokkos-vashishta

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Oct 28 2016, 16:43
Pushed
jungeOct 19 2017, 09:53
Parents
rLAMMPS21619f6a2f80: Recommitting reverted change
rLAMMPSd9891abdf4d5: new library functions
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS387078089472: Merge branch 'master' into kokkos-vashishta (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 28 2016, 16:43

Merged Changes

CommitAuthorDetailsCommitted
d9891abdf4d5Steve Plimpton
new library functions 
Oct 27 2016
efaa8feab591sjplimp/GitHub
Merge pull request #239 from akohlmey/static-analysis-fixes 
Oct 25 2016
ad5f7c458196sjplimp/GitHub
Merge pull request #238 from giacomofiorin/colvars-2016-10-24 
Oct 25 2016
6b334991352bsjplimp/GitHub
Merge pull request #231 from akohlmey/collected-doc-fixes 
Oct 25 2016
63eada242554Axel Kohlmeyer
fix issue with docs for orientorder/atom compute reported by @andeplane 
Oct 25 2016
1a436bd7a9bbAxel Kohlmeyer
Merge branch 'collected-doc-fixes' of github.com:akohlmey/lammps into collected… 
Oct 25 2016
52dd9aee5fe6Axel Kohlmeyer
Merge branch 'master' into collected-doc-fixes 
Oct 25 2016
f8367e3d0feeAxel Kohlmeyer
update documentation pdf for updated colvars lib 
Oct 24 2016
ba6d1528bb17Axel Kohlmeyer
Merge branch 'colvars-2016-10-24' of https://github.com/giacomofiorin/lammps… 
Oct 24 2016
182141b85005Giacomo Fiorin
Make SMP parallelism for Colvars optional 
Oct 24 2016
512c413b7eadAxel Kohlmeyer
whitespace cleanup 
Oct 24 2016
7b89e47a38d5Axel Kohlmeyer
apply corrections to issues reported by static code analysis 
Oct 24 2016
e02505c8cc33Giacomo Fiorin
Add ensemble-biased metadynamics (Fabrizio Marinelli, NIH) 
Oct 24 2016
be2d155cef25Giacomo Fiorin
Minor changes and fixes not relevant to LAMMPS 
Oct 24 2016
c2430939809eGiacomo Fiorin
Fix wall forces and subtractAppliedForce for extended-Lagrangian ABF 
Oct 24 2016
ad57a17f48c8Giacomo Fiorin
Add C-linkage wrapper for colvarscript (useful with ctypes) 
Oct 24 2016
bc4498800319Axel Kohlmeyer
correct typo in write_dump docs 
Oct 23 2016
6cd6c106efebAxel Kohlmeyer
Merge branch 'collected-small-changes' into collected-doc-fixes 
Oct 21 2016
a9572275eeb0Axel Kohlmeyer
Revert "support generation of manual in ePUB format" 
Oct 20 2016
f022f6d88ad2Axel Kohlmeyer
fix various formatting and broken link issues identified by ebook-convert 
Oct 20 2016
e8359923f1e4Axel Kohlmeyer
update packages section in manual with information about USER-NC-DUMP 
Oct 19 2016