Commit Graph

38 Commits

Author SHA1 Message Date
895cb00e98 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	src/fix_temp_csvr.cpp
	src/fix_temp_csvr.h
2015-03-24 14:15:41 -04:00
ac0b1d1ac3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13280 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-23 23:51:04 +00:00
84a5ec39ec git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13278 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-23 23:30:50 +00:00
dbf2e7faf7 Merge remote branch 'lammps-ro/master' into lammps-icms 2015-03-11 12:54:44 +01:00
bdbe7c5246 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13218 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-10 15:33:45 +00:00
5afcc9926e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13217 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-03-10 14:17:16 +00:00
aeb7fec23a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12814 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-12-02 02:15:39 +00:00
b893e39fba add missing C++ emacs cookies to recently added header files 2014-11-26 12:27:08 -05:00
cb0a9998bd use MPI_STATUS_IGNORE where possible 2014-11-25 17:44:03 -05:00
475aa20270 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_intro.txt
	doc/fix_gle.txt
	doc/fix_ipi.txt
	examples/USER/i-pi/README
	src/USER-MISC/README
	src/USER-MISC/fix_gle.cpp
	src/USER-MISC/fix_ipi.cpp
	src/USER-MISC/fix_ipi.h
2014-11-25 15:01:31 -05:00
162e8050ad git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12773 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-24 17:15:05 +00:00
7518fae9bc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12641 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-10-21 17:09:24 +00:00
35d8036e32 update C++ headers with emacs mode cookies 2014-10-21 12:00:34 -04:00
54576e2b35 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	src/KSPACE/msm.cpp
	src/KSPACE/msm_cg.cpp
	src/KSPACE/pppm.cpp
	src/KSPACE/pppm_cg.cpp
	src/KSPACE/pppm_disp.cpp
	src/KSPACE/pppm_disp_tip4p.cpp
	src/KSPACE/pppm_stagger.cpp
	src/KSPACE/pppm_tip4p.cpp
2014-08-26 12:33:31 -04:00
1bef8ec3a4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12340 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-08-25 14:28:49 +00: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
323e3075c4 remove even more unused variables and have consistent initialization 2014-04-12 18:39:01 +02:00
ec6c67ddbb Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/kspace_modify.txt
	src/KSPACE/fft3d.cpp
	src/KSPACE/remap.cpp
	src/kspace.cpp
2014-03-15 07:03:59 -04:00
be64063802 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11631 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-13 17:34:00 +00: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
1ba04dabf6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11393 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-30 18:30:18 +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
9fe494cc6a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11380 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-29 18:59:46 +00:00
fffe7f95b7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11379 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-29 18:40:05 +00: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
7f81b2f2ff git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11371 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-29 01:37:09 +00:00
62b1b84677 bufix for compilation of MPIIO dumps with OpenMP enabled 2014-01-27 19:06:15 -05: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
e126d82aaa Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	doc/dump.txt
	src/.gitignore
2014-01-25 11:19:07 -05:00
8ef19992c2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11323 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 16:11:46 +00:00
a4baae328e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11316 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:45:26 +00:00
662a6bbcd6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11311 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:22:08 +00:00
63c730ea7d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11309 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-24 23:05:34 +00:00
62dfde3648 incompatibility of a package with MPI STUBS should not be flagged in STUBS 2014-01-23 12:37:38 -05:00
7932bcc79b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11289 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-22 15:31:45 +00:00