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

Interactive simulation #129

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0a1e163
integrating LAMMPS into MDT
dane1122 Jan 31, 2017
d3c20d6
hello
dane1122 Feb 1, 2017
f47049a
Created Dockerfile for LAMMPS
dane1122 Feb 1, 2017
a4beceb
added exmaples folder to test LAMMPS integration
dane1122 Feb 1, 2017
7ef8548
Modified models file in accordance with the code review
dane1122 Feb 1, 2017
c53274e
example for lammps usage
dane1122 Feb 2, 2017
26c0bdf
LAMMPS integration into model integrator
dane1122 Feb 2, 2017
b694311
Added docstring for describing functions inside LAMMPS integrator
dane1122 Feb 2, 2017
1941f51
Modified model and integrator
dane1122 Feb 2, 2017
80f74e4
Merge branch 'workflow_fixes' into interactive_simulation
dane1122 Feb 2, 2017
b680740
example
dane1122 Feb 2, 2017
4f7ad81
Remove it
dane1122 Feb 2, 2017
b7d66bf
Merged with lammps branch to get yml file in this repository
dane1122 Feb 2, 2017
902f015
Modified LAMMPS model
dane1122 Feb 2, 2017
0d1ebb6
Cleanup
dane1122 Feb 2, 2017
526d24f
Specified units
dane1122 Feb 3, 2017
8507817
Modified model and integrator. TODO: Trajectory for integrator. It se…
dane1122 Feb 3, 2017
6ade6dd
Modified example files
dane1122 Feb 3, 2017
38fdc70
example
dane1122 Feb 3, 2017
0345f16
Merge branch 'master' into interactive_simulation
dane1122 Feb 3, 2017
85fb4cf
Modified integrator and model
dane1122 Feb 4, 2017
aa2ddbe
Modified. TODO: Fix LAMMPS simulation error
dane1122 Feb 4, 2017
0487c04
Modified docker makefile for lammps
dane1122 Feb 6, 2017
a5082a0
Modified example
dane1122 Feb 6, 2017
0fc2b0d
Modified xlo, xhi, ylo, yhi, zlo, zhi since the molecule wrapped arou…
dane1122 Feb 6, 2017
7e309f9
Modified shake
dane1122 Feb 7, 2017
55242fa
Merge remote-tracking branch 'origin/master' into interactive_simulation
dane1122 Feb 7, 2017
992dfb8
Modified integrator and model
dane1122 Feb 7, 2017
15ddfcf
Created model for interactive simulation
dane1122 Feb 9, 2017
8952f7c
Modified lammps model so the user can apply force
dane1122 Feb 9, 2017
c6f8f26
Modified force equation
dane1122 Feb 10, 2017
5b850ee
Modified model
dane1122 Feb 13, 2017
06707ab
Interactive slide bar
dane1122 Feb 13, 2017
2a7fe6f
Trajectory way
dane1122 Feb 14, 2017
a408c99
Stretch factor for nearby atoms
dane1122 Feb 14, 2017
7566047
Removed print that was used for debugging
dane1122 Feb 14, 2017
c994e54
Modified model for better visual effects
dane1122 Feb 14, 2017
9b1118d
Fixed model
dane1122 Feb 17, 2017
0f5e422
Modified for web assembly usage
dane1122 Feb 18, 2017
23a22b5
Removed export since not required anymore
dane1122 Feb 22, 2017
4e8813e
fixed simulation boz
dane1122 Mar 3, 2017
51cd6df
Create a function to possibly use for LAMMPS-related workflows
Apr 3, 2017
4454121
Lammps model and integrator
Apr 7, 2017
bc562c3
Set simulation box larger than atom xlo, xhi, ylo, yhi, zlo, zhi coor…
Apr 7, 2017
ae97b6b
Revert "Set simulation box larger than atom xlo, xhi, ylo, yhi, zlo, …
Apr 10, 2017
418f022
Fixed bug: can still run dynamics with potential model
Apr 11, 2017
674d66f
Removed moldesign-examples directory since examples should be in mold…
Apr 11, 2017
0e4f1f4
Updated test
Apr 11, 2017
842c637
Merge branch 'master' into interactive_simulation
Apr 11, 2017
7210046
Fixed error caused by merging master.
Apr 11, 2017
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: 2 additions & 2 deletions DockerMakefiles/DockerMake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ _SOURCES_:
- PySCF.yml
- PythonTools.yml
- SymMol.yml

- LAMMPS.yml

_ALL_:
- ambertools
Expand All @@ -24,7 +24,7 @@ _ALL_:
- moldesign_complete
- moldesign_notebook
- moldesign_minimal

- lammps

##################################################
# Base image definitions
Expand Down
52 changes: 52 additions & 0 deletions DockerMakefiles/LAMMPS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
lammps_requirements:
description: Base libraries for BOTH running and building LAMMPS
build: |
RUN apt-get -y update
RUN apt-get -y install \
bc \
ssh \
mpich2 \
python-dev \
libz-dev \
fftw3-dev

ENV PATH=${PATH}:/usr/lib
ENV PYTHONPATH=${PYTHONPATH}:/opt/lammps/python
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/lammps/src

lammps_build:
requires:
- buildbase
- lammps_requirements
description: Build image for LAMMPS. Based on https://github.com/malramsay64/lammps-docker/blob/master/Dockerfile
build: |

RUN git clone https://github.com/lammps/lammps.git /opt/lammps && \
cd /opt/lammps && \
git fetch && \
git checkout stable

RUN cd /opt/lammps/src && \
make yes-ASPHERE yes-BODY yes-CLASS2 yes-COLLOID yes-COMPRESS yes-CORESHELL yes-DIPOLE yes-GRANULAR yes-KSPACE yes-MANYBODY && \
make yes-MC yes-MOLECULE yes-OPT yes-PERI yes-PERI yes-PYTHON yes-REPLICA yes-RIGID yes-SHOCK yes-SNAP yes-SRD

# RUN cd /opt/lammps/src && \
# make serial mode=shlib -j4

RUN cd /opt/lammps/src && \
make mpi mode=shlib -j4 MPI_INC="-DMPICH_SKIP_MPICXX -I/usr/include/mpich" MPI_LIB="-Wl,-rpath,/usr/lib/mpich/lib -L/usr/lib/mpich/lib -lmpl -lmpich"

RUN cd /opt/lammps/python && \
python install.py

lammps:
description: Deployable LAMMPS image
build_directory: buildfiles/lammps/
requires:
- python_deploy_base
- lammps_requirements
copy_from:
lammps_build:
/usr/local/lib/python2.7/dist-packages: /usr/local/lib/python2.7/
/usr/lib: /usr
/opt/lammps: /opt
Loading