|
|
3b72d88e35
|
add fix spring/self enhancement from LAMMPS-ICMS
|
2011-12-11 20:22:08 -05:00 |
|
|
|
d7aab37be4
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
doc/processors.txt
|
2011-12-10 18:45:47 -05:00 |
|
|
|
7cb225f64a
|
add documentation for FLD /omp styles.
|
2011-12-09 19:59:57 -05:00 |
|
|
|
77d1c7cd36
|
add documentation for load balancing
|
2011-12-09 14:47:10 -05:00 |
|
|
|
58c001ef73
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7334 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 16:47:47 +00:00 |
|
|
|
2b97a34844
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
src/REPLICA/neb.cpp
src/REPLICA/prd.cpp
src/REPLICA/tad.cpp
src/REPLICA/temper.cpp
src/min.cpp
src/minimize.cpp
src/run.cpp
|
2011-12-09 09:40:19 -05:00 |
|
|
|
a978a15c64
|
fix link
|
2011-12-09 09:35:21 -05:00 |
|
|
|
e354f74847
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7327 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 00:45:07 +00:00 |
|
|
|
c92047aeb5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7326 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-09 00:44:47 +00:00 |
|
|
|
0c982d0f4a
|
Merge branch 'master' into openmp-master
|
2011-12-08 19:12:31 -05:00 |
|
|
|
1f81fcf5e4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7322 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:17:38 +00:00 |
|
|
|
bca92d41bd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7321 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 23:17:25 +00:00 |
|
|
|
6b4fd6d47c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7315 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 22:50:07 +00:00 |
|
|
|
9692aa6aaf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7309 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 01:13:00 +00:00 |
|
|
|
d17a9d5b0a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7307 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 01:04:43 +00:00 |
|
|
|
65c85ffb99
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7302 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 00:30:31 +00:00 |
|
|
|
4f79dab7b3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7301 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 00:29:41 +00:00 |
|
|
|
4810127eba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7300 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 00:00:59 +00:00 |
|
|
|
b45c5af220
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7299 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-07 23:43:51 +00:00 |
|
|
|
ca4f233802
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
lib/gpu/Makefile.firefly
lib/gpu/Makefile.firefly_opencl
lib/gpu/Nvidia.makefile
lib/gpu/Opencl.makefile
lib/gpu/lal_cg_cmm.cpp
lib/gpu/lal_cg_cmm.cu
lib/gpu/lal_cg_cmm.h
lib/gpu/lal_cg_cmm_ext.cpp
lib/gpu/lal_cg_cmm_long.cpp
lib/gpu/lal_cg_cmm_long.cu
lib/gpu/lal_cg_cmm_long.h
lib/gpu/lal_cg_cmm_long_ext.cpp
lib/gpu/lal_precision.h
lib/gpu/lal_preprocessor.h
src/GPU/Install.sh
src/GPU/pair_lj_cut_coul_long_gpu.cpp
src/GPU/pair_lj_sdk_coul_long_gpu.cpp
src/GPU/pair_lj_sdk_gpu.cpp
|
2011-12-03 09:49:28 -05:00 |
|
|
|
eaf9944f4b
|
update to dec 4 patch ahead of git update.
|
2011-12-02 21:20:05 -05:00 |
|
|
|
d4a1d2a6a1
|
Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp-master
|
2011-12-02 17:59:47 -05:00 |
|
|
|
84c9ab2804
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7293 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-02 18:38:12 +00:00 |
|
|
|
9d162cd555
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
doc/Section_commands.txt
doc/Section_packages.txt
doc/Section_start.txt
doc/angle_sdk.html
doc/package.txt
doc/pair_coul_diel.txt
doc/pair_gauss.txt
doc/pair_sdk.html
doc/suffix.txt
src/GPU/pppm_gpu.cpp
src/PERI/fix_peri_neigh.h
src/USER-CG-CMM/README
src/USER-OMP/fix_peri_neigh_omp.h
src/input.cpp
src/min.cpp
src/verlet.cpp
|
2011-12-02 11:52:06 -05:00 |
|
|
|
143aa917f2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7273 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-02 15:47:30 +00:00 |
|
|
|
42c7eae479
|
fix typo
|
2011-12-01 15:21:06 -05:00 |
|
|
|
2ff6b10ce2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7269 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 17:57:44 +00:00 |
|
|
|
dac5c0354d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7268 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 17:51:50 +00:00 |
|
|
|
21e591dba1
|
Merge branch 'master' into openmp-master
|
2011-12-01 10:48:05 -05:00 |
|
|
|
8f728e4823
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7261 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 15:46:40 +00:00 |
|
|
|
ade9c93d8b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7260 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 15:38:52 +00:00 |
|
|
|
d966083a3f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7259 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 15:36:19 +00:00 |
|
|
|
596bff6b87
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7258 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 15:35:32 +00:00 |
|
|
|
750c4b07bb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7257 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 14:58:26 +00:00 |
|
|
|
1c808e7075
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7248 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 00:19:11 +00:00 |
|
|
|
179b1faaeb
|
update documentation for gauss/cut and coul/diel
|
2011-11-29 19:56:33 -05:00 |
|
|
|
f397ec3832
|
Merge branch 'master' into openmp-master
|
2011-11-29 18:49:33 -05:00 |
|
|
|
28ae26a28f
|
update documentation for renaming of cg/cmm to lj/sdk
|
2011-11-29 18:36:32 -05:00 |
|
|
|
6b3fd8f48f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7240 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-11-28 22:53:39 +00:00 |
|
|
|
33f77e2917
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7235 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-11-28 17:47:37 +00:00 |
|
|
|
f6c92890f1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7234 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-11-28 17:25:54 +00:00 |
|
|
|
0d5f2283b1
|
Merge branch 'master' into openmp-master
|
2011-11-17 12:37:00 -05:00 |
|
|
|
cf631219bc
|
Added doc for fix wall/piston and fix append/atoms
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7231 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-11-16 18:35:55 +00:00 |
|
|
|
c0cface394
|
Added doc for fix wall/piston and fix append/atoms
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7229 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-11-16 18:04:27 +00:00 |
|
|
|
385e4d7aea
|
correct tersoff documentation
|
2011-10-30 17:21:30 -04:00 |
|
|
|
717b85e8f8
|
add docs for new pair styles
|
2011-10-29 00:08:14 -04:00 |
|
|
|
ce2af6e133
|
include tersoff/table potential
|
2011-10-28 20:16:06 -04:00 |
|
|
|
d4e11b033a
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
src/FLD/pair_lubricate_poly.h
src/USER-OMP/pair_line_lj_omp.h
src/USER-OMP/pair_lubricate_omp.h
src/fix_wall.cpp
src/fix_wall_reflect.cpp
|
2011-10-27 06:34:07 -04:00 |
|
|
|
b3018aab48
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
doc/fix_wall_reflect.txt
src/MANYBODY/pair_airebo.cpp
src/MANYBODY/pair_airebo.h
src/MANYBODY/pair_comb.cpp
src/MANYBODY/pair_comb.h
src/neigh_list.cpp
|
2011-10-26 14:23:09 -04:00 |
|
|
|
793b6ddcaa
|
Merge branch 'openmp-step8' into openmp-master
|
2011-10-26 14:19:18 -04:00 |
|
