|
|
bcec3c56e4
|
Merge branch 'patch_14_06_2014' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.lammps
src/pair.cpp
|
2014-06-15 13:25:09 +02:00 |
|
|
|
598be75009
|
anticipate 14 June 2014 patch
|
2014-06-15 13:19:31 +02: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 |
|
|
|
9ed1090111
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12064 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-04 15:34:48 +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 |
|
|
|
6c06a66ae7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11978 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-13 15:23:13 +00:00 |
|
|
|
712c21028d
|
ifdef out currently unused code
|
2014-04-16 07:06:27 -04:00 |
|
|
|
0916861315
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11777 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-11 14:46:49 +00:00 |
|
|
|
aa3b894dce
|
added code to read and parse .lammpsrc files, but cannot apply them yet.
|
2014-04-01 13:03:40 +02:00 |
|
|
|
0bdf37977a
|
added prototype code for reading default settings from .lammpsrc
|
2014-04-01 02:15:53 -04:00 |
|
|
|
ac8485f332
|
re-instate kokkos related changes that do not trigger the reported bug
|
2014-03-30 17:16:29 -04:00 |
|
|
|
ff766e39cf
|
undo kokkos related changes that cause problems with printing neighbor list statistics
|
2014-03-30 12:23:08 -04:00 |
|
|
|
c6ee3357a4
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/finish.cpp
src/fix.cpp
|
2014-03-13 06:40:26 -04:00 |
|
|
|
5bdd5c3c25
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11627 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-12 16:37:16 +00:00 |
|
|
|
fdcefc5d1b
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/fix.cpp
src/memory.h
|
2014-02-12 08:16:13 -05:00 |
|
|
|
4cb42cb26b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11538 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-02-12 00:59:21 +00:00 |
|
|
|
b28ce4b3bb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11531 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-02-12 00:34:30 +00:00 |
|
|
|
0ad199801d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/lammps.cpp
|
2014-02-11 07:15:35 -05:00 |
|
|
|
0064c5bcce
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11521 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-02-11 00:09:44 +00:00 |
|
|
|
979c5746a0
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
doc/dump.txt
doc/kspace_modify.txt
src/STUBS/mpi.c
src/STUBS/mpi.h
src/USER-OMP/respa_omp.cpp
src/respa.cpp
|
2014-01-23 12:11:26 -05:00 |
|
|
|
127eb167c1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11293 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-22 17:44:32 +00:00 |
|
|
|
46e8e6c120
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/MAKE/Makefile.openmpi
src/MANYBODY/fix_qeq_comb.cpp
src/MANYBODY/pair_nb3b_harmonic.cpp
src/RIGID/fix_rigid_small.cpp
src/RIGID/fix_shake.cpp
src/USER-REAXC/fix_qeq_reax.cpp
src/USER-REAXC/fix_reaxc_bonds.cpp
src/read_data.cpp
src/special.h
|
2014-01-18 11:52:59 -05:00 |
|
|
|
bad19033d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11250 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-17 18:43:09 +00:00 |
|
|
|
a6ca3cab54
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/RIGID/fix_rigid_small.cpp
|
2014-01-16 20:53:36 -05:00 |
|
|
|
a1ef01fc1a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11243 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-14 16:17:20 +00:00 |
|
|
|
5244a31c12
|
more paranoia about closing file descriptors
|
2013-12-16 09:50:05 +01:00 |
|
|
|
63818e4edd
|
print out version number in help message. improve format
|
2013-12-16 07:30:42 +01:00 |
|
|
|
8be1bf43db
|
some adjustments to previous file descriptor leak fix
|
2013-12-16 06:43:18 +01:00 |
|
|
|
a153d3c16c
|
avoid file pointer leak in LAMMPS class
|
2013-12-14 22:48:27 +01:00 |
|
|
|
7a3773ce9d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-12-04 04:59:58 +01:00 |
|
|
|
00700346c6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11079 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-12-02 23:49:46 +00:00 |
|
|
|
5b0c62a2a0
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-MISC/bond_harmonic_shift.cpp
src/USER-MISC/bond_harmonic_shift_cut.cpp
|
2013-11-26 13:39:09 +01:00 |
|
|
|
21d9cd5d01
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11063 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-25 17:17:50 +00:00 |
|
|
|
7d8549d9ca
|
update command line summary
|
2013-11-23 12:51:54 +01:00 |
|
|
|
fb7ecfd4a8
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-CG-CMM/angle_cg_cmm.h
src/USER-CG-CMM/cg_cmm_parms.h
src/USER-CG-CMM/pair_cg_cmm.h
src/USER-CG-CMM/pair_cg_cmm_coul_cut.h
tools/restart2data.cpp
|
2013-11-23 12:49:37 +01:00 |
|
|
|
8ff753d958
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11044 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-22 17:14:39 +00:00 |
|
|
|
2b45c6f5c7
|
skip upper case styles and have a bit more compact output
|
2013-11-21 17:01:22 +01:00 |
|
|
|
c2060ea7ac
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11032 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-21 15:43:36 +00:00 |
|
|
|
517055b6fc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11031 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-21 15:28:53 +00:00 |
|
|
|
cea25bfe9f
|
more explicit example and be more paranoid about input
|
2013-11-21 12:16:26 +01:00 |
|
|
|
c271d9c8ac
|
deluxe version with automatic call to pager and flags summary
|
2013-11-21 11:02:43 +01:00 |
|
|
|
d304db97b8
|
remove training whitespace
|
2013-11-21 09:20:01 +01:00 |
|
|
|
62c4d2d2ce
|
incorporate steve's changes and re-introduce string sorting
|
2013-11-21 09:19:13 +01:00 |
|
|
|
643a6c0c56
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11029 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-20 18:47:02 +00:00 |
|
|
|
bc050692ef
|
cleaner handling of the -h/-help flag.
we now have a 5 column output, all entries are sorted and no logfile is written
|
2013-11-19 17:30:40 +01:00 |
|
|
|
059eb04e39
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10491 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-30 19:52:46 +00:00 |
|
|
|
b8208f582c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10326 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-24 20:10:57 +00:00 |
|
|
|
b49a5519f2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10285 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-23 15:10:07 +00:00 |
|
|
|
91b7613960
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9604 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-07 17:32:03 +00:00 |
|
|
|
20ad5bdda3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9602 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-07 16:16:01 +00:00 |
|
