|
|
4a197537c0
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-08-07 08:24:10 -04:00 |
|
|
|
231e0f2383
|
use LAMMPS internal number parsing with error handling
|
2014-08-06 13:17:49 -04:00 |
|
|
|
2cca373515
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12253 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-08-06 16:07:54 +00:00 |
|
|
|
909a9ff697
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-07-29 15:13:15 -04:00 |
|
|
|
65a76deb45
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12208 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-07-28 20:13:44 +00:00 |
|
|
|
a30a91c46e
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-05-24 15:36:20 -04:00 |
|
|
|
702714f341
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12021 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-23 18:16:31 +00:00 |
|
|
|
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 |
|
|
|
fc62bdc5cb
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-05-07 06:50:32 -04:00 |
|
|
|
ee16e52c9c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11928 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-06 22:48:49 +00:00 |
|
|
|
650f5ef4f8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11921 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-06 21:16:26 +00:00 |
|
|
|
aa6458d35c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11920 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-06 21:10:30 +00:00 |
|
|
|
7785c98703
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11918 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-06 17:37:44 +00:00 |
|
|
|
4fbf7105d6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MAKE/Makefile.ubuntu
src/USER-REAXC/pair_reax_c.cpp
src/USER-REAXC/reaxc_allocate.cpp
src/USER-REAXC/reaxc_init_md.cpp
src/USER-REAXC/reaxc_list.cpp
src/USER-REAXC/reaxc_multi_body.cpp
src/USER-REAXC/reaxc_reset_tools.cpp
src/USER-REAXC/reaxc_tool_box.cpp
src/USER-REAXC/reaxc_traj.cpp
src/USER-REAXC/reaxc_types.h
src/USER-REAXC/reaxc_vector.cpp
src/write_data.cpp
|
2014-05-03 08:13:28 -04:00 |
|
|
|
9db54ceb98
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11889 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-02 15:57:10 +00:00 |
|
|
|
a1c6c99ccc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11876 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-02 14:29:05 +00:00 |
|
|
|
873c710401
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-REAXC/reaxc_types.h
src/fix_ave_histo.cpp
|
2014-05-02 06:17:25 -04:00 |
|
|
|
c8fce1f525
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11874 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-01 21:10:56 +00:00 |
|
|
|
104376fcba
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/gpu/lal_sw.cu
src/GRANULAR/fix_pour.cpp
|
2014-04-30 06:43:53 -04:00 |
|
|
|
08ff12cc49
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11836 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-29 21:30:31 +00:00 |
|
|
|
517a48da9a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MAKE/Makefile.bgq
src/MAKE/Makefile.bgq.details
src/MC/fix_gcmc.cpp
|
2014-04-19 07:04:43 -04:00 |
|
|
|
01d414a2da
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11831 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-18 20:58:43 +00:00 |
|
|
|
f461504c93
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11829 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-18 15:25:28 +00:00 |
|
|
|
6d774e6d8b
|
more cleanup
|
2014-04-18 06:35:57 -04:00 |
|
|
|
1fac1d41fa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11789 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-15 15:24:27 +00:00 |
|
|
|
d23d9599e0
|
reinstate overly eager deletion of variables. this one had side effects.
|
2014-04-13 15:22:33 -04:00 |
|
|
|
323e3075c4
|
remove even more unused variables and have consistent initialization
|
2014-04-12 18:39:01 +02: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 |
|
|
|
1b6af8196f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11775 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-11 14:41:25 +00:00 |
|
|
|
9655351ef8
|
bugfix and some cleanups
|
2014-04-11 06:15:47 -04:00 |
|
|
|
5fcfc9f575
|
various little cleanups to silence compiler warnings
clarify/simplify some code and initialize variables where needed.
also remove dead code and unused class members
|
2014-04-10 18:21:12 +02:00 |
|
|
|
f8daecd639
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
examples/USER/openmp/parm.pegc12e8
examples/USER/openmp/parm.pegc12e8-omp
|
2014-04-09 13:49:45 +02:00 |
|
|
|
51f4c3b0cc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11744 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-04-08 21:01:52 +00:00 |
|
|
|
430aed042a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Conflicts:
doc/Manual.html
doc/Manual.txt
tools/msi2lmp/src/msi2lmp.c
|
2014-03-20 10:50:23 -04:00 |
|
|
|
e8154be88c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11644 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-19 18:27:22 +00: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 |
|
|
|
481778cb31
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11608 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-10 15:18:54 +00:00 |
|
|
|
a1db9a1aaa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11603 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-07 00:23:36 +00:00 |
|
|
|
99c18a722f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11595 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-03-06 17:24:38 +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 |
|
|
|
958a442beb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11539 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-02-12 01:07:55 +00:00 |
|
|
|
396e7165ae
|
various small cleanups and bugfixes found by checking warnings from clang
|
2014-02-09 17:47:17 -05:00 |
|
|
|
625b3d3bde
|
Merge branch 'merge-stable' into lammps-icms
Resolved Conflicts:
src/REPLICA/tad.cpp
src/USER-CG-CMM/pair_cmm_common.cpp
src/USER-CG-CMM/pair_cmm_common.h
|
2014-01-30 17:24:37 -05:00 |
|
|
|
5136d59713
|
anticipate 1 Feb 2014 patch from upstream
|
2014-01-30 17:21:25 -05:00 |
|
|
|
e8605375c2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11390 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-30 18:01:53 +00:00 |
|
|
|
3f3e996939
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11389 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-30 17:42:09 +00:00 |
|
|
|
677b11428e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11387 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-30 16:09:37 +00:00 |
|
|
|
d181769e88
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/MAKE/Makefile.mingw32-cross
src/MAKE/Makefile.mingw32-cross-mpi
src/MAKE/Makefile.mingw64-cross
src/MAKE/Makefile.mingw64-cross-mpi
|
2014-01-30 07:54:10 -05:00 |
|
|
|
8c9aa159b4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11382 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-29 22:24:34 +00:00 |
|
