Skip to content

[WIP] Lammps support #319

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.

Sign up for GitHub

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

Open
jhprinz wants to merge 24 commits into
base: master
Choose a base branch
from
Open

[WIP] Lammps support #319

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d53d16d
first lammps engine running
jhprinz Oct 6, 2015
27c09b7
Merge branch 'openmmtools' into lammps
jhprinz Oct 7, 2015
94d7efe
notebook updates
jhprinz Oct 7, 2015
2148637
Merge branch 'master' of github.com:choderalab/msm-tis into lammps
jhprinz Oct 7, 2015
768197d
Merge branch 'openmmtools' into lammps
jhprinz Oct 7, 2015
8f44e76
Merge remote-tracking branch 'upstream/master' into lammps
jhprinz Nov 9, 2015
e8b7e28
Merge remote-tracking branch 'upstream/master' into lammps
jhprinz Nov 15, 2015
80f9d68
Merge remote-tracking branch 'upstream/master' into lammps
jhprinz Nov 18, 2015
f50a261
install ubuntu lammps binary
jhprinz Nov 18, 2015
af3cba7
install ubuntu lammps binary
jhprinz Nov 18, 2015
3c6bc37
lammps python not installed in binary?
jhprinz Nov 18, 2015
25c0cd6
list installed packages
jhprinz Nov 18, 2015
b1b0f55
list installed packages
jhprinz Nov 18, 2015
3f98c37
remove lammps from __init__
jhprinz Nov 18, 2015
4115628
Merge branch 'master' of github.com:choderalab/openpathsampling into …
jhprinz Jan 22, 2016
e6e897f
Merge remote-tracking branch 'upstream/master' into lammps
jhprinz Jun 23, 2016
166bed8
Merge branch 'master' of github.com:choderalab/openpathsampling into …
jhprinz Jun 26, 2016
6f898f2
Merge branch 'master' of github.com:choderalab/openpathsampling into …
jhprinz Jul 13, 2016
854d8ef
merge
jhprinz Jul 13, 2016
10f02ed
Merge branch 'master' of github.com:choderalab/openpathsampling into …
jhprinz Aug 4, 2016
f60e37b
Merge branch 'master' of github.com:choderalab/openpathsampling into …
jhprinz Nov 7, 2016
263ee71
update
jhprinz Nov 7, 2016
484f97d
nb
jhprinz Nov 7, 2016
9894799
nb
jhprinz Nov 7, 2016
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
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:choderalab/openpathsampling into … 
…lammps
  • Loading branch information
@jhprinz
jhprinz committed Jan 22, 2016
commit 41156286c5ba73dd40a36fe3fc424e97cec2b9d0
21 changes: 1 addition & 20 deletions devtools/ci/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,9 @@ if [[ $MINICONDA_MD5 != $(md5sum $MINICONDA | cut -d ' ' -f 1) ]]; then
fi
bash $MINICONDA -b

echo travis_fold:end:install.conda

## Install conda packages

# This might make the --yes obsolete
# conda config --set always_yes yes --set changeps1 no

export PATH=$HOME/miniconda2/bin:$PATH

hash -r

echo travis_fold:start:install.lammps
sudo add-apt-repository ppa:gladky-anton/lammps -y
sudo apt-get update
sudo apt-get install lammps-daily
echo travis_fold:end:install.lammps

conda list

echo travis_fold:start:install.conda.packages
echo Install conda packages

# add omnia and update
conda config --add channels http://conda.anaconda.org/omnia
conda update --yes conda

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.