|
|
2e265787a1
|
Merge branch 'master' into lammps-icms
|
2012-01-13 09:24:31 -05:00 |
|
|
|
04d322652f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7549 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-12 19:14:07 +00:00 |
|
|
|
88489dc982
|
regenerate
|
2012-01-11 11:09:14 -05:00 |
|
|
|
795e7647de
|
update documentation
|
2012-01-11 11:00:03 -05:00 |
|
|
|
2d5d569486
|
Merge branch 'master' into lammps-icms
|
2012-01-11 10:45:56 -05:00 |
|
|
|
efc68ec048
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7538 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 22:39:38 +00:00 |
|
|
|
397ac7f1e7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7526 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 20:58:04 +00:00 |
|
|
|
d9815fd977
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7521 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 20:20:17 +00:00 |
|
|
|
20386aee55
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7518 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 20:13:38 +00:00 |
|
|
|
a23925846a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7516 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 20:07:20 +00:00 |
|
|
|
fb1509f2e7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7515 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 20:05:45 +00:00 |
|
|
|
9a9ed90766
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7501 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 15:51:36 +00:00 |
|
|
|
6859978567
|
add documentation for lj/smooth/linear/omp
|
2012-01-10 09:29:21 -05:00 |
|
|
|
5026f4b788
|
Merge branch 'master' into lammps-icms
|
2012-01-10 09:05:38 -05:00 |
|
|
|
36ae86996e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7496 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 01:42:14 +00:00 |
|
|
|
c414186e35
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7493 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-10 01:22:45 +00:00 |
|
|
|
f9d24c4012
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7487 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-09 23:18:10 +00:00 |
|
|
|
411a21d6b0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7477 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-09 17:49:36 +00:00 |
|
|
|
0fba6fd658
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7476 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-09 17:49:15 +00:00 |
|
|
|
9b0b21299b
|
regenerate
|
2012-01-07 12:05:23 -05:00 |
|
|
|
4ae1ca521c
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
lib/linalg/Makefile.gfortran
lib/linalg/Makefile.mingw_cross
src/GPU/pppm_gpu.cpp
src/USER-REAXC/pair_reax_c.h
tools/restart2data.cpp
|
2012-01-07 12:04:28 -05:00 |
|
|
|
4f1bc1a2da
|
documentation updates
|
2012-01-07 12:01:15 -05:00 |
|
|
|
aee60101d1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7453 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-06 20:39:16 +00:00 |
|
|
|
1081c8062b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7449 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-06 18:33:30 +00:00 |
|
|
|
63de8e3612
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7443 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-06 18:05:37 +00:00 |
|
|
|
033d0e6546
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7434 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-06 17:38:57 +00:00 |
|
|
|
2a3b7a8305
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7420 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-06 16:58:21 +00:00 |
|
|
|
74d8a849bb
|
update documentation
|
2012-01-06 10:38:23 -05:00 |
|
|
|
479db22978
|
update and remove crud.
|
2012-01-05 14:41:52 -05:00 |
|
|
|
21cbcb03ed
|
Merge branch 'openmp-master' into lammps-icms
|
2012-01-04 09:46:09 -05:00 |
|
|
|
269f3950e8
|
Merge branch 'master' into openmp-master
|
2012-01-04 09:43:27 -05:00 |
|
|
|
415f494bcc
|
Merge branch 'openmp-master' into lammps-icms
|
2012-01-01 18:54:32 -05:00 |
|
|
|
a0359289b4
|
more compatibility changes. improved regtest.
|
2012-01-01 16:14:40 -05:00 |
|
|
|
b5c1d4b6bb
|
remove more spurious leftovers from merge
|
2012-01-01 16:08:55 -05:00 |
|
|
|
8eb36be092
|
documentation update after merge to new upstream
|
2011-12-31 20:50:03 -05:00 |
|
|
|
2214992035
|
Merge branch 'openmp-master' into lammps-icms
Resolved Conflicts:
.gitignore
doc/fix_spring_self.txt
lib/atc/Array.h
lib/gpu/.gitignore
src/.gitignore
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.openmpi-omp
src/STUBS/Makefile
src/STUBS/mpi.c
src/STUBS/mpi.h
src/USER-CG-CMM/cg_cmm_parms.h
src/dump.h
src/fix_spring_self.cpp
tools/restart2data.cpp
|
2011-12-31 19:59:13 -05:00 |
|
|
|
006d63d78a
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_coul_diel.jpg
doc/Eqs/pair_gauss.jpg
doc/Eqs/pair_tersoff_1.jpg
src/KSPACE/fft3d.h
src/comm.cpp
src/comm.h
|
2011-12-31 19:37:59 -05:00 |
|
|
|
9259ae8699
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_coul_diel.jpg
doc/Section_commands.html
doc/Section_commands.txt
doc/pair_coul_diel.html
doc/pair_coul_diel.txt
doc/processors.html
doc/processors.txt
examples/USER/imd/bucky_cnt_imd.vmd
examples/USER/imd/in.bucky-plus-cnt
examples/USER/imd/in.deca-ala-solv_imd
examples/USER/imd/in.deca-ala_imd
lib/gpu/Makefile.fermi
lib/gpu/Makefile.lincoln
lib/gpu/Makefile.longhorn
lib/gpu/Makefile.serial
lib/gpu/geryon/VERSION.txt
lib/gpu/pair_gpu_device.cpp
src/ASPHERE/atom_vec_ellipsoid.cpp
src/CLASS2/Install.sh
src/COLLOID/atom_vec_colloid.cpp
src/DIPOLE/atom_vec_dipole.cpp
src/GPU/fix_gpu.cpp
src/GRANULAR/atom_vec_granular.cpp
src/GRANULAR/fix_pour.h
src/KSPACE/Install.sh
src/KSPACE/fft3d.cpp
src/KSPACE/fft3d.h
src/KSPACE/kissfft.h
src/KSPACE/pppm.cpp
src/KSPACE/pppm.h
src/KSPACE/pppm_tip4p.cpp
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.serial
src/MANYBODY/pair_airebo.cpp
src/MANYBODY/pair_comb.cpp
src/MANYBODY/pair_eam.cpp
src/MANYBODY/pair_eim.cpp
src/MANYBODY/pair_sw.cpp
src/MANYBODY/pair_tersoff.cpp
src/MANYBODY/pair_tersoff_zbl.cpp
src/MOLECULE/atom_vec_angle.cpp
src/MOLECULE/atom_vec_bond.cpp
src/MOLECULE/atom_vec_full.cpp
src/MOLECULE/atom_vec_molecular.cpp
src/Makefile
src/Makefile.lib
src/PERI/atom_vec_peri.cpp
src/USER-CG-CMM/Install.sh
src/USER-IMD/README
src/USER-IMD/fix_imd.cpp
src/USER-IMD/fix_imd.h
src/USER-SMD/Install.sh
src/atom_vec_atomic.cpp
src/atom_vec_charge.cpp
src/comm.cpp
src/finish.cpp
src/fix_box_relax.cpp
src/fix_deposit.cpp
src/fix_spring_self.cpp
src/fix_store_state.cpp
src/fix_wall.cpp
src/fix_wall_reflect.cpp
src/input.cpp
src/input.h
src/memory.cpp
src/memory.h
src/pair_lj_cut.cpp
tools/restart2data.cpp
|
2011-12-31 19:07:46 -05:00 |
|
|
|
0d475be499
|
documentation updates
|
2011-12-31 18:11:23 -05:00 |
|
|
|
d55f708fea
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7390 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-22 22:24:12 +00:00 |
|
|
|
5516886635
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7388 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-22 15:33:47 +00:00 |
|
|
|
5acd732f06
|
Merge branch 'master' into openmp-master
|
2011-12-17 18:40:20 -05:00 |
|
|
|
06f040f25d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7376 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-16 19:03:07 +00:00 |
|
|
|
c26f383996
|
Merge branch 'master' into openmp-master
|
2011-12-15 09:15:12 -05:00 |
|
|
|
59165f7114
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7369 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-15 00:27:35 +00:00 |
|
|
|
93686ca6ab
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
doc/processors.txt
|
2011-12-14 12:30:11 -05:00 |
|
|
|
6376eeec92
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7367 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-14 17:08:56 +00:00 |
|
|
|
f5c26abaa6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7366 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-14 16:33:36 +00:00 |
|
|
|
e79e5b975c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7365 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-14 16:32:06 +00:00 |
|
|
|
8068e88f0c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7360 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-13 21:40:57 +00:00 |
|
