|
|
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 |
|
|
|
4c9bba90f1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-07 16:15:31 +00:00 |
|
|
|
1ffcc7ff8b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11791 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-15 15:32:19 +00:00 |
|
|
|
c3e8623608
|
better diagnostic output for bonds/atom and alike
|
2014-04-11 18:19:02 -04:00 |
|
|
|
5c0ce72dee
|
support alternate form of extra bond/angle/... per atom
|
2014-04-11 18:00:07 -04:00 |
|
|
|
4b6b42fa27
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11749 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-09 15:54:17 +00:00 |
|
|
|
f6ee2fe711
|
fix bug in reading data file sections through fixes
|
2014-04-09 07:53:04 -04:00 |
|
|
|
1646c124b1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11700 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-04 16:36:51 +00:00 |
|
|
|
a8f2ed839c
|
remove redundant code in read_data for extra properties
the same change was applied a few lines above this location
in the upstream version and thus this is no longer needed.
|
2014-04-01 16:47:01 +02:00 |
|
|
|
573db9e2f7
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_oneway.txt
doc/fix_temp_csvr.txt
src/fix_move.cpp
src/fix_nh.cpp
src/fix_temp_csvr.cpp
src/neigh_stencil.cpp
src/pair.cpp
src/pair_hybrid.cpp
src/read_data.cpp
tools/msi2lmp/src/msi2lmp.c
tools/msi2lmp/src/msi2lmp.h
Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>
|
2014-03-12 17:43:22 -04:00 |
|
|
|
d2b44d8c3b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11624 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 19:24:05 +00:00 |
|
|
|
91360a80a8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11621 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 16:43:25 +00:00 |
|
|
|
5e1d34a23d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11617 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 15:56:49 +00:00 |
|
|
|
3d6ac732ad
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11616 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 15:45:25 +00:00 |
|
|
|
7da8f12d33
|
better checking of missing coeff entries in a data file
|
2014-02-17 08:12:42 -05: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 |
|
|
|
4c297a50a7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11523 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-02-11 16:29:28 +00:00 |
|
|
|
3518e803d5
|
fix the bug in read_data that steve unfixed
|
2014-02-10 19:29:23 -05:00 |
|
|
|
f2cc64ee8b
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MC/fix_bond_create.cpp
src/read_data.cpp
|
2014-02-08 10:31:25 -05:00 |
|
|
|
784d229527
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11507 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-02-07 21:17:22 +00:00 |
|
|
|
67cca89924
|
fix first part of the bug reported by simon gravelle
|
2014-02-05 11:47:48 -05:00 |
|
|
|
78f68cec44
|
correct logic when checking against data files
|
2014-01-30 17:01:14 -05:00 |
|
|
|
8a07871047
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/REPLICA/neb.h
src/USER-REAXC/fix_qeq_reax.cpp
src/read_data.h
|
2014-01-29 07:08:08 -05:00 |
|
|
|
1f0f8c82c7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11352 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-28 21:50:39 +00:00 |
|
|
|
39b1597778
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/RIGID/fix_shake.cpp
src/variable.cpp
src/write_data.cpp
|
2014-01-26 21:35:32 -05:00 |
|
|
|
0ce16af78b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11328 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-25 22:46:08 +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 |
|
|
|
43f8c0516e
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2014-01-09 10:41:34 -05:00 |
|
|
|
21833c99de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11192 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-08 20:38:38 +00:00 |
|
|
|
a6d3d8691b
|
fix pointer arithmetic bug in read_data
|
2014-01-06 17:47:54 -05:00 |
|
|
|
20eb2af2f6
|
Merge remote branch 'lammps-ro/master' into lammps-icms
|
2013-12-18 14:31:43 +01:00 |
|
|
|
16dde18ab2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11124 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-12-17 15:30:08 +00:00 |
|
|
|
5a9727b558
|
disable bogus warning for data files without style markers
|
2013-11-21 14:28:08 +01:00 |
|
|
|
4adec729eb
|
improve windows compatibility for gzip support
|
2013-11-03 02:27:06 +01:00 |
|
|
|
ecf9f1c829
|
we need to also strip off coulomb styles suffixes when comparing styles
|
2013-10-26 23:46:34 +02:00 |
|
|
|
c36dda649a
|
use comments in data file to check for consistencies
|
2013-10-26 17:56:13 +02:00 |
|
|
|
99f67ba8bb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10825 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-09-23 17:30:16 +00:00 |
|
|
|
971b4e98df
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10346 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-25 15:49:50 +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 |
|
|
|
5b0af4dedb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10324 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-24 15:58:48 +00:00 |
|
|
|
0b8e46c7e3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10229 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-08 19:36:22 +00:00 |
|
|
|
8492c4149e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9787 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-04-23 20:35:26 +00:00 |
|
|
|
fa24d1db95
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9473 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-13 18:20:52 +00:00 |
|
|
|
0c6b84987c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9346 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-31 16:31:03 +00:00 |
|
|
|
d8efe2a7d3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9044 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-11-09 18:53:01 +00:00 |
|
|
|
53a1f74ef1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9040 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-11-09 16:08:11 +00:00 |
|
|
|
06d12cd6ec
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8438 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-29 21:10:03 +00:00 |
|
|
|
ef9e700545
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-06 22:47:51 +00:00 |
|
|
|
caabcf6db4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8106 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-05-21 14:37:50 +00:00 |
|
