|
|
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 |
|
|
|
e9a0ca6dca
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12193 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-07-22 18:31:33 +00:00 |
|
|
|
934347e565
|
Merge branch 'lammps-icms' into cle-orig
|
2014-07-02 11:59:17 -04:00 |
|
|
|
29ae4bd8dc
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.lammps
lib/gpu/lal_coul_long.cu
src/VORONOI/compute_voronoi_atom.cpp
src/version.h
|
2014-07-01 12:08:09 -04:00 |
|
|
|
ae2d215b8c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12149 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-27 17:35:07 +00:00 |
|
|
|
86d4432ff8
|
import colored langevin thermostat package from michele ceriotti
this is the unmodified patch without testing its functionality.
|
2014-06-23 18:15:03 -04:00 |
|
|
|
063fae8961
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-06-11 06:15:59 -04:00 |
|
|
|
7e1c6ccfac
|
Fixing more broken USER-EFF examples
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12113 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-10 18:17:25 +00:00 |
|
|
|
fcb81d2b48
|
Fixing broken USER-EFF examples
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12110 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-10 17:00:33 +00:00 |
|
|
|
00db690e64
|
Updating USER-EFF examples to use compute property/atom
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12109 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-10 16:07:24 +00:00 |
|
|
|
28b9fa3754
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12107 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-10 15:03:41 +00:00 |
|
|
|
1ee7cb100d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/atom_vec_hybrid.cpp
src/verlet.cpp
|
2014-06-07 19:29:51 -04:00 |
|
|
|
6123f24200
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12096 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-06 23:41:04 +00:00 |
|
|
|
a466230f4a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12095 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-06 21:52:31 +00:00 |
|
|
|
0078b0956b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12090 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-05 12:52:27 +00:00 |
|
|
|
8dad71810c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12089 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-05 12:52:13 +00:00 |
|
|
|
c4c6bae7dc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12066 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-04 15:51:32 +00:00 |
|
|
|
895ca766ee
|
Merge remote branch 'lammps-ro/master' into lammps-kokkos
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/package.txt
|
2014-06-02 10:45:39 +02:00 |
|
|
|
30361f0dfa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12042 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-29 22:52:10 +00:00 |
|
|
|
f9f7283fa5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/accelerator_cuda.h
|
2014-05-14 07:18:26 -04:00 |
|
|
|
8a9ba2d050
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11985 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-13 16:52:04 +00:00 |
|
|
|
f9864c81e0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11983 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-13 16:17:32 +00:00 |
|
|
|
8d4a991b75
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-05-13 06:21:50 -04:00 |
|
|
|
2c60c00b31
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11972 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-12 15:26:23 +00:00 |
|
|
|
6773e3be00
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11971 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-12 15:24:50 +00:00 |
|
|
|
24fb679e55
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
CResolved onflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_commands.txt
doc/Section_packages.txt
doc/compute_fep.html
doc/compute_fep.txt
doc/fix_adapt_fep.html
doc/fix_adapt_fep.txt
doc/pair_lj_soft.html
doc/pair_lj_soft.txt
src/USER-FEP/Install.sh
src/USER-FEP/README
src/USER-FEP/compute_fep.cpp
src/USER-OMP/pair_coul_cut_soft_omp.cpp
src/USER-OMP/pair_coul_long_soft_omp.cpp
src/USER-OMP/pair_lj_cut_coul_cut_soft_omp.cpp
src/USER-OMP/pair_lj_cut_coul_long_soft_omp.cpp
src/USER-OMP/pair_lj_cut_soft_omp.cpp
src/USER-OMP/pair_lj_cut_tip4p_long_soft_omp.cpp
src/USER-OMP/pair_tip4p_long_soft_omp.cpp
|
2014-05-10 17:15:55 -04:00 |
|
|
|
944b898d71
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11956 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-09 15:35:51 +00:00 |
|
|
|
4acacd8e3b
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MISC/fix_efield.cpp
src/fix_addforce.cpp
src/fix_move.cpp
src/fix_setforce.cpp
|
2014-05-08 08:49:17 -04:00 |
|
|
|
4ab16d5388
|
Added viscosity estimate from diagonal shear stress
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11936 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-07 16:05:35 +00:00 |
|
|
|
d906ce46d6
|
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms
|
2014-05-03 09:17:34 -04:00 |
|
|
|
4fbf7105d6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MAKE/Makefile.ubuntu
src/USER-REAXC/pair_reax_c.cpp
src/USER-REAXC/reaxc_allocate.cpp
src/USER-REAXC/reaxc_init_md.cpp
src/USER-REAXC/reaxc_list.cpp
src/USER-REAXC/reaxc_multi_body.cpp
src/USER-REAXC/reaxc_reset_tools.cpp
src/USER-REAXC/reaxc_tool_box.cpp
src/USER-REAXC/reaxc_traj.cpp
src/USER-REAXC/reaxc_types.h
src/USER-REAXC/reaxc_vector.cpp
src/write_data.cpp
|
2014-05-03 08:13:28 -04:00 |
|
|
|
ec54a12815
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11902 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-02 20:47:44 +00:00 |
|
|
|
fbe7484573
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11901 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-02 20:47:23 +00:00 |
|
|
|
86843200fd
|
remove redundant files
|
2014-05-02 16:24:37 -04:00 |
|
|
|
99f9652c49
|
update examples for USER-FEP
|
2014-04-24 17:46:11 -04:00 |
|
