Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Aug 6 2015, 06:57 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSb1baef035448: manually merged trivial change from lammps github repo from pull request #3
rLAMMPS51072805199b: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
b1baef035448 | Axel Kohlmeyer | manually merged trivial change from lammps github repo from pull request #3 | Aug 3 2015 | |||
0b8605a69684 | Axel Kohlmeyer | integrate USER-H5MD package into package lists. | Aug 3 2015 | |||
c91f33f5b4e5 | Axel Kohlmeyer | small adjustments to make USER-H5MD package integration cleaner | Aug 3 2015 | |||
dc55db069ceb | Axel Kohlmeyer | clarify a few more things for integration of HDF5 support | Aug 3 2015 | |||
0aa79be6a1c5 | Axel Kohlmeyer | adjust build system to be more consistent with LAMMPS conventions | Aug 3 2015 | |||
9d56187805f2 | Axel Kohlmeyer | reduce amount of warnings printed | Aug 3 2015 | |||
c175e7f1805b | Axel Kohlmeyer | Merge branch 'start_dump_h5md' of git://github.com/pdebuyl/lammps into… | Aug 3 2015 | |||
a78ffd7e6185 | Pierre de Buyl | Merge branch 'master' into start_dump_h5md | Aug 3 2015 | |||
7e942ca0dcce | Pierre de Buyl | mention 2015 and later debian hdf5 path | Aug 3 2015 | |||
6873ab71863b | Pierre de Buyl | fix dump_charge data name | Aug 3 2015 | |||
366ae00d2e8b | athomps/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13815 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
51b75f9b859e | athomps/Pierre de Buyl | Added fix gcmc check to init() | Aug 3 2015 | |||
6d9b1d85fbd5 | athomps/Pierre de Buyl | Tweaked description of insertion rotation | Aug 3 2015 | |||
772078e5c1a0 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
fdaedbb5dfd3 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
975eb568a669 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13810 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
19ce7e0e6ad2 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
30cb99078f14 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
a2be62610ae0 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
405d4807c2a8 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13798 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
07f26ebff998 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13797 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
1751306ec7c8 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13796 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
1e544538e5ad | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
c7e4cdbef46e | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
b8251655bc06 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
7c97b7526b35 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
7aa67f1617b1 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
ff68fb2caa4f | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13790 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
2db66bd56b43 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13789 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
907acf6b70a4 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
1326958aa4c7 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
88402f934839 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
4c13b8e623dc | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
53414f35a69a | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
77f5eba53086 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
10c844f2be0b | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
d3bab92bd946 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13780 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
601c29cef784 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
a1cab4967768 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13778 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
f52e4c8d40be | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13777 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
531e124f66f3 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
2e67ee8578f3 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
9f730773ed87 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
84d394368d8a | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
c57564e22327 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13771 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
39d0ff0724f2 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13770 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
edc7e698a50f | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13768 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
7fa949a57b64 | sjplimp/Pierre de Buyl | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13767 f3b2605a-c512-4ea7… | Aug 3 2015 | |||
b16e09fc8ba7 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 | |||
09c4c4620004 | sjplimp/Pierre de Buyl | '' | Aug 3 2015 |