|
|
a05fa107d8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.defaults
lib/cuda/Makefile.lammps
lib/cuda/pair_cg_cmm_coul_cut_cuda.cu
lib/cuda/pair_cg_cmm_coul_debye_cuda.cu
lib/cuda/pair_cg_cmm_coul_long_cuda.cu
lib/cuda/pair_cg_cmm_cuda.cu
lib/cuda/pair_cg_cmm_cuda_kernel_nc.cu
src/USER-FEP/fix_adapt_fep.cpp
src/molecule.cpp
|
2014-10-09 13:03:12 -04:00 |
|
|
|
bd26134155
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12605 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 17:30:37 +00:00 |
|
|
|
5be413fc73
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12602 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 16:58:16 +00:00 |
|
|
|
6b7d937194
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12601 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 16:52:39 +00:00 |
|
|
|
6bea73f245
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12600 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 15:34:26 +00:00 |
|
|
|
6ba871c80f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12599 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 15:34:03 +00:00 |
|
|
|
c5ad12114d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12598 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 15:33:32 +00:00 |
|
|
|
69f2390b06
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12596 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 15:24:30 +00:00 |
|
|
|
9dd1fd29b2
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/MAKE/MORE/Makefile.debug
src/MAKE/MORE/Makefile.openmpi
src/MAKE/MORE/Makefile.serial
src/MAKE/MORE/Makefile.ubuntu_simple
src/MAKE/Makefile.g++
src/MAKE/Makefile.serial-opt
|
2014-09-27 06:34:33 -04:00 |
|
|
|
bf8b5e4d63
|
Fixing broken basal example
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12562 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-26 17:00:51 +00:00 |
|
|
|
62c95d86a8
|
Fixing broken USER-EFF example
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12560 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-26 14:57:08 +00:00 |
|
|
|
190974a167
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/MAKE/MORE/Makefile.jaguar
src/MAKE/Makefile.jaguar
src/MAKE/Makefile.serial-clang
|
2014-09-25 11:23:12 -04:00 |
|
|
|
fb705efa84
|
Change fix box/relax example to be more efficient
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12532 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-24 00:46:11 +00:00 |
|
|
|
5ae8de8f47
|
Fixing broken USER-INTEL examples
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12524 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-22 15:39:09 +00:00 |
|
|
|
3091e09e61
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-09-20 13:20:27 -04:00 |
|
|
|
dbb4fd7e75
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12520 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-18 14:39:58 +00:00 |
|
|
|
e162a292b6
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.defaults
|
2014-09-12 13:07:05 +02:00 |
|
|
|
5910f51031
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12497 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-11 20:24:23 +00:00 |
|
|
|
4a95b00477
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12496 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-11 16:58:10 +00:00 |
|
|
|
bbc60e3aef
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12494 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-11 16:54:18 +00:00 |
|
|
|
3564238044
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12493 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-11 16:54:14 +00:00 |
|
|
|
978269a4ce
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12492 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-11 16:47:30 +00:00 |
|
|
|
010542ff05
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12491 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-11 16:39:58 +00:00 |
|
|
|
052a84f81d
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resovled Conflicts:
src/lammps.cpp
|
2014-09-11 13:44:35 +02:00 |
|
|
|
b73b7a8253
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12476 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-10 21:05:43 +00:00 |
|
|
|
f977c2663f
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/SNAP/sna.cpp
|
2014-09-09 13:21:28 +02:00 |
|
|
|
1b19868c97
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12439 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-08 16:10:03 +00:00 |
|
|
|
7551af229e
|
Add line describing snap
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12436 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-08 15:46:32 +00:00 |
|
|
|
d12eca24b8
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/lmptype.h
|
2014-09-06 15:25:49 +02:00 |
|
|
|
3e4d6f2096
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12426 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-05 23:24:15 +00:00 |
|
|
|
77dedf1063
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12419 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-05 23:02:17 +00:00 |
|
|
|
8dce3d380c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12408 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-05 14:49:19 +00:00 |
|
|
|
b3f5ea4d83
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12363 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-27 16:15:20 +00:00 |
|
|
|
cf8ad23066
|
refactor ray's elastic too for portability
|
2014-08-26 15:00:53 -04:00 |
|
|
|
1172085ecd
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/package.txt
src/Depend.sh
|
2014-08-16 19:31:57 -04:00 |
|
|
|
6e622a54af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-15 15:29:18 +00:00 |
|
|
|
d6c42ed94b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12312 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-14 16:30:29 +00:00 |
|
|
|
dbc55a403f
|
overhaul of fix ipi to be more consistent with LAMMPS programming conventions
|
2014-08-12 11:33:59 -04:00 |
|
|
|
f78d0004f3
|
include example for i-PI use with fix ipi
|
2014-08-11 18:00:14 -04:00 |
|
|
|
4c79bce7f1
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-OMP/msm_cg_omp.cpp
src/USER-OMP/pppm_disp_tip4p_omp.cpp
src/USER-OMP/pppm_tip4p_omp.cpp
|
2014-08-09 20:10:12 -04:00 |
|
|
|
f75219da70
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12292 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-08 22:00:47 +00:00 |
|
|
|
4a197537c0
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-08-07 08:24:10 -04:00 |
|
|
|
1177fd9af3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12266 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-06 23:30:16 +00:00 |
|
|
|
d1148fd1ee
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12265 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-06 23:29:57 +00:00 |
|
|
|
57b8a339eb
|
clean up reading of C matrix and fix missing scaling bug
|
2014-08-05 01:51:31 -04:00 |
|
|
|
8821eb0518
|
cleaned up code some. doesn't seem to fully work yet.
|
2014-08-05 01:14:23 -04:00 |
|
|
|
c46236d706
|
update input examples to be more similar to other LAMMPS examples
|
2014-08-04 23:09:34 -04:00 |
|
|
|
ff39614926
|
import updated GLE fix from michele ceriotti
|
2014-08-04 22:17:04 -04:00 |
|
|
|
3d8a65e85b
|
Merge branch 'lammps-icms' into cle-orig
|
2014-07-25 07:08:58 -04:00 |
|
|
|
512038de6f
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-07-24 13:11:31 -04:00 |
|
