|
|
9550535392
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
lib/cuda/Makefile.lammps
src/GPU/fix_gpu.cpp
|
2013-07-27 12:34:08 +02:00 |
|
|
|
b12b9fced9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10409 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 15:38:06 +00:00 |
|
|
|
2e722ce5df
|
improvements to serialization/deserialization feature
|
2013-05-24 15:14:38 +02:00 |
|
|
|
8a912603a5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-03-12 18:44:52 +01:00 |
|
|
|
a920f23204
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9632 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-11 20:47:14 +00:00 |
|
|
|
e1709a4489
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-OMP/msm_omp.cpp
src/USER-OMP/msm_omp.h
src/USER-OMP/pair_born_coul_msm_omp.cpp
src/USER-OMP/pair_born_coul_msm_omp.h
src/USER-OMP/pair_buck_coul_msm_omp.cpp
src/USER-OMP/pair_buck_coul_msm_omp.h
src/USER-OMP/pair_coul_msm_omp.cpp
src/USER-OMP/pair_coul_msm_omp.h
src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_msm_omp.h
src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
src/USER-OMP/pair_lj_cut_coul_msm_omp.h
|
2013-01-18 07:50:51 -05:00 |
|
|
|
87f2415519
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9278 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-17 15:52:46 +00:00 |
|
|
|
f51ad982f6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9277 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-17 15:51:57 +00:00 |
|
|
|
427161ef56
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/MAKE/Makefile.openmpi
src/min_linesearch.cpp
|
2013-01-09 07:09:35 -05:00 |
|
|
|
772e83406d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9204 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-03 16:22:36 +00:00 |
|
|
|
a69bbed0b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9184 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-02 16:48:13 +00:00 |
|
|
|
399871b63a
|
Merge branch 'master' into lammps-icms
|
2012-10-27 15:30:19 -04:00 |
|
|
|
fbc3f58a05
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9027 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-26 23:31:09 +00:00 |
|
|
|
95f350087c
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Section_packages.html
doc/Section_packages.txt
doc/dump_modify.txt
doc/fix_colvars.html
doc/fix_colvars.txt
src/Make.sh
src/Makefile
src/USER-COLVARS/colvarproxy_lammps.cpp
src/dump_xyz.cpp
|
2012-05-24 09:03:58 -04:00 |
|
|
|
44904c5bf3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8163 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-05-23 16:20:25 +00:00 |
|
|
|
e0d696f14d
|
update colvars test examples
|
2012-05-22 20:00:13 -04:00 |
|
|
|
9976610faa
|
expand test
|
2012-04-23 13:54:40 -04:00 |
|
|
|
8a744d26dc
|
update examples. no need for "auto" in fix spring.
|
2012-03-17 13:08:28 -04:00 |
|
|
|
f727b47017
|
update simple colvars example and compare to spring
|
2012-03-16 22:23:20 -04:00 |
|
|
|
0e33af4f94
|
delete test input
|
2012-03-12 23:19:41 -04:00 |
|
|
|
6456a5cb2d
|
colvars now working correctly in parallel
atom->map() didn't quite behave as expected.
need to restrict the result to local atoms.
|
2012-03-12 22:52:59 -04:00 |
|
|
|
82a43ae078
|
first fully working version of the colvars module
|
2012-03-07 21:06:27 -05:00 |
|
|
|
3a98d5829e
|
added colvars test example
|
2012-03-05 21:52:52 -05:00 |
|
|
|
4f1bc1a2da
|
documentation updates
|
2012-01-07 12:01:15 -05:00 |
|
|
|
0af770b923
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7432 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-01-06 17:34:26 +00:00 |
|
|
|
479db22978
|
update and remove crud.
|
2012-01-05 14:41:52 -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 |
|
|
|
70a85bddfd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7256 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 14:58:11 +00:00 |
|
|
|
91f4940250
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6836 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-27 20:08:16 +00:00 |
|
|
|
a2ea5509ff
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6616 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-08 19:01:31 +00:00 |
|
|
|
c7e91e5418
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6379 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-13 22:31:50 +00:00 |
|
|
|
63953173fd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6272 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-01 00:01:29 +00:00 |
|
|
|
eac710420d
|
Merge branch 'master' into lammps-icms
|
2011-02-23 10:58:07 -05:00 |
|
|
|
1d4a6440d1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5715 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-22 22:35:22 +00:00 |
|
|
|
f50885fd46
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5714 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-22 22:34:43 +00:00 |
|
|
|
ef3307c369
|
Merge branch 'master' into lammps-icms
|
2010-09-02 09:36:21 -04:00 |
|
|
|
6ce7d46695
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4648 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-01 18:55:48 +00:00 |
|
|
|
7d832b4db1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4647 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-01 18:54:39 +00:00 |
|
|
|
9f3153d089
|
add SWCNT plus buckyball demo for fix imd.
|
2010-08-31 21:36:56 -04:00 |
|
|
|
de6f8589f4
|
update imd examples for new coordinate filtering
|
2010-08-31 21:33:22 -04:00 |
|
|
|
ae926d0ade
|
Merge branch 'master' into lammps-icms
|
2010-08-21 15:13:01 -04:00 |
|
|
|
7c200a5fde
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4550 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-20 20:48:36 +00:00 |
|
|
|
a5e119a167
|
fix final glitch in tip4p specific ev_tally call
|
2010-07-22 10:28:05 -04:00 |
|
|
|
d3e8436b54
|
add test input for tip4p water.
|
2010-07-22 10:12:38 -04:00 |
|
|
|
dfb10b9311
|
adapt pair style soft/omp to mainline changes.
the growth of potential the potential prefactor
is now handled by fix adapt. adjust example inputs
and reference log files to this change.
|
2010-06-20 17:52:37 -04:00 |
|
|
|
805af30844
|
add example/test input for granular pair styles.
|
2010-06-06 16:45:10 -04:00 |
|
|
|
a4171a07fe
|
added example input for colloid pair style.
OpenMP seems to be broken
|
2010-06-05 21:53:57 -04:00 |
|
|
|
f0bb0f783d
|
demo/test examples for OpenMP variants of asphere
|
2010-06-05 19:32:29 -04:00 |
|
|
|
c35ea32df3
|
add a bunch more examples for tests and benchmarks.
|
2010-06-05 18:48:21 -04:00 |
|
|
|
2d69156a85
|
adjust inputs for new fix wall/reflect syntax
|
2010-06-04 10:52:16 -04:00 |
|
