ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,697 Commits 12 Branches 209 Tags
4fef3cd9f018b7570f69c937d770ad67ea5380d3
Commit Graph

183 Commits

Author SHA1 Message Date
Axel Kohlmeyer
bfe96b8a90 initialize cached result data fields for variables to "(undefined)" 2015-06-15 17:54:13 -04:00
Axel Kohlmeyer
54233c58b1 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2015-03-18 07:26:15 -04:00
sjplimp
46fd9013a5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13235 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-17 16:01:48 +00:00
Axel Kohlmeyer
2f9dcc5ff8 avoid overflow with -DLAMMPS_SMALLSMALL 2015-03-13 12:04:50 -04:00
Axel Kohlmeyer
dec6612258 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/PDF/colvars-refman-lammps.pdf
	src/Depend.sh
	src/USER-ATC/Install.sh
 2015-03-10 14:20:31 -04:00
sjplimp
0b06df4d4c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13215 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-09 21:41:51 +00:00
Axel Kohlmeyer
c3cb0e9124 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
	src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
	src/USER-FEP/pair_lj_cut_soft.cpp
 2015-02-02 15:23:42 -05:00
sjplimp
e1cd500a21 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13008 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-01-30 18:51:56 +00:00
Axel Kohlmeyer
eb94b9a4ab Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-01-29 07:23:11 -05:00
sjplimp
0e4e48d142 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12999 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-01-28 17:20:01 +00:00
sjplimp
fdd6a493e1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12997 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-01-28 15:57:38 +00:00
sjplimp
86daf16069 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12996 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-01-28 15:55:56 +00:00
sjplimp
e59417b0f7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12979 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-01-20 23:25:40 +00:00
Axel Kohlmeyer
b270116a19 use force->bnumeric() where it makes sense 2015-01-20 14:27:52 -05:00
Axel Kohlmeyer
30ff5e89ff Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-12-23 08:21:23 -05:00
athomps
f6b81b0881 Added logfreq2 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12852 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2014-12-22 22:42:09 +00:00
Axel Kohlmeyer
50583f19d9 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-12-18 11:30:26 -05:00
sjplimp
3337a367c0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12833 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-12-17 16:07:34 +00:00
Axel Kohlmeyer
4216949d5e adapt code to recent changes in variable.cpp 2014-11-20 11:44:45 -05:00
Axel Kohlmeyer
00a18085eb Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-11-20 10:51:29 -05:00
sjplimp
fcaaf75764 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12727 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-19 15:00:31 +00:00
Axel Kohlmeyer
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
sjplimp
2b9a3e8437 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12215 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-28 23:10:39 +00:00
sjplimp
0198cc71a9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12211 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-28 23:00:22 +00:00
sjplimp
33d9ff4bf4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12201 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-28 18:46:56 +00:00
Axel Kohlmeyer
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
sjplimp
7c995e30f2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12093 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-06 20:52:25 +00:00
Axel Kohlmeyer
cbdad2a2b3 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	src/group.cpp
 2014-06-04 14:16:34 +02:00
sjplimp
6a4a7506cf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12056 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-02 16:04:35 +00:00
Axel Kohlmeyer
21c6f77ac1 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-05-16 10:38:35 -04:00
sjplimp
db0cac35a2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11996 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-15 15:51:22 +00:00
Axel Kohlmeyer
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
sjplimp
45f7542271 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11892 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 16:36:53 +00:00
sjplimp
eddd7b148f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11879 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 14:55:27 +00:00
sjplimp
9130641820 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11878 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 14:47:47 +00:00
Axel Kohlmeyer
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
sjplimp
039af550a0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11626 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-10 22:16:34 +00:00
sjplimp
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
sjplimp
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
Axel Kohlmeyer
53fef3f3a3 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/molecule.cpp
	src/variable.cpp
 2014-02-27 06:58:12 -05:00
sjplimp
1c892de665 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11575 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-26 14:50:31 +00:00
Axel Kohlmeyer
2fcb0a3e92 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_start.txt
	doc/Section_tools.txt
	src/Makefile
 2014-02-06 07:50:47 -05:00
sjplimp
69fe36d48d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11489 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-05 21:31:14 +00:00
Axel Kohlmeyer
a82962baef Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/variable.cpp
 2014-02-05 08:59:35 -05:00
sjplimp
df6708567a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11473 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 18:56:44 +00:00
sjplimp
a67e46d7be git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11472 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 16:10:16 +00:00
Axel Kohlmeyer
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
sjplimp
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
Axel Kohlmeyer
4cb3d5130b correct issues with LAMMPS_BIGBIG compilation due to recent changes 2014-01-23 12:59:26 -05:00
Axel Kohlmeyer
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