jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,940 Commits 9 Branches 198 Tags 1.1 GiB
Commit Graph

13940 Commits

Author SHA1 Message Date
Steve Plimpton cc9b6118b8
Merge pull request #748 from stanmoore1/kk_docs 
Update Kokkos docs
 2018-01-08 09:15:36 -07:00
Steve Plimpton 09bed0c09a
Merge pull request #747 from stanmoore1/kk_reax_hist 
Fix broken charge history in fix qeq/reax/kk
 2018-01-08 09:15:21 -07:00
Steve Plimpton 1b51efd6b8
Merge pull request #744 from akohlmey/doc-update 
Documentation build updates
 2018-01-08 09:15:02 -07:00
Steve Plimpton 8888b05b18
Merge pull request #742 from rbberger/fix_python_move 
Fix python/move
 2018-01-08 09:14:36 -07:00
Steve Plimpton 3bb8294f31
Merge pull request #718 from timattox/USER-DPD_es_RNG 
USER-DPD: External State RNG
 2018-01-08 09:13:11 -07:00
Steve Plimpton 450c689ae9
Merge pull request #725 from stanmoore1/kk_update 
Update the Kokkos library in LAMMPS to v2.5.00
 2018-01-08 09:12:51 -07:00
Axel Kohlmeyer 09ca7b32fc Revert "no need to include library.o in the LAMMPS executable" 
This reverts commit 4a3a6b4455.
As it turns out, when using the LAMMPS python wrapper from inside
code using the PYTHON package, the library symbols *are* needed.
Thanks for Richard Berger (@rbberger) for pointing this out.
 2018-01-06 19:47:33 +01:00
Richard Berger d6d7dde653 Add error output if python evaluation failed 2018-01-06 18:54:55 +01:00
Stan Moore 7d07baa8ad Better load balance fix_qeq_reax_kokkos for half neigh list 2017-12-21 11:07:51 -07:00
Stan Moore 798d68c607 Edits to accelerate_kokkos.txt 2017-12-18 14:50:33 -07:00
Stan Moore 46fe0a968b Fix compiler warnings in atom_vec_hybrid_kokkos 2017-12-18 14:09:39 -07:00
Stan Moore 00a9672524 Fix issue in fix_qeq_reax_kokkos, can't call child function from base constructor 2017-12-18 13:58:37 -07:00
Stan Moore a2756db66b Update to Kokkos library v2.5.00 2017-12-15 16:42:06 -07:00
Stan Moore da83feb8ca Merge branch 'master' into kk_update 2017-12-15 16:36:21 -07:00
Richard Berger 73c55ac4d1 Fix up docs after renaming 2017-12-15 14:06:16 -05:00
Richard Berger 2a131d1416 Merge remote-tracking branch 'upstream/master' into fix_python_move 2017-12-15 13:56:54 -05:00
Richard Berger bcc5f49d0b Rename fix python to fix python/invoke 2017-12-15 13:53:04 -05:00
Richard Berger 950bfb84a9 Clean up after renaming back to fix python/move 2017-12-15 13:27:27 -05:00
Richard Berger 4d725c3153 Revert "Rename fix python/move to move/python" 
This reverts commit 4d915dba08.
 2017-12-15 13:17:12 -05:00
Stan Moore 8a93f63de9 Update Kokkos docs 2017-12-13 10:05:53 -07:00
Stan Moore 193252275f A few more tweaks to charge history in fix_qeq_reax_kokkos 2017-12-12 09:54:28 -07:00
Stan Moore 5968850306 Fix broken charge history in fix_qeq_reax_kokkos 2017-12-12 09:20:09 -07:00
Axel Kohlmeyer 3291a4fe96 Revert "no need to include library.o in the LAMMPS executable" 
This reverts commit 4a3a6b4455.
As it turns out, when using the LAMMPS python wrapper from inside
code using the PYTHON package, the library symbols *are* needed.
Thanks for Richard Berger (@rbberger) for pointing this out.
 2017-12-11 08:08:49 -05:00
Richard Berger 1b07a4edee Fix memory leak in pair python 2017-12-10 17:14:08 -05:00
Axel Kohlmeyer 81a1c007ed correct file name for doc file 2017-12-07 16:39:41 -05:00
Axel Kohlmeyer 0b51e9b2ff add documentation for fix move/python 2017-12-07 16:36:36 -05:00
Axel Kohlmeyer 4b1bcaa1ae fix speelink in documentation files 2017-12-07 16:01:02 -05:00
Axel Kohlmeyer ed8680d695 suspend support for sphinxcontrib.images 
the sphinxcontrib.image extension was broken with sphinx 16.x.
however, sphinx 15.x breaks with newer version of the multiprocessor module.
so we suspend the thumbnail processing and lift the lock to sphinx 15.x

also, the number of parallel sphinx tasks is can be overridden with SPHINXEXTRA="-j #'.
default is to try use all local CPU cores.
 2017-12-07 15:38:15 -05:00
Stan Moore 29df5a536f Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_es_RNG 2017-12-07 10:57:01 -07:00
Steve Plimpton d029cb9002
Merge pull request #743 from stanmoore1/kk_yukawa_fix 
Fix compile error in pair_yukawa_kokkos
 2017-12-07 10:31:04 -07:00
Stan Moore 3e99d1a83a Add pair yukawa/kk to Section_commands 2017-12-07 09:06:33 -07:00
Stan Moore c4e83be533 Fix compile error in pair_yukawa_kokkos 2017-12-07 08:42:17 -07:00
Steve Plimpton d7e5d60f90
Merge pull request #738 from rbberger/pylammps_thermo_style_fix 
PyLammps bugfix to support custom thermo output with vector element addressing
 2017-12-07 08:25:01 -07:00
Steve Plimpton 5179efd2bb
Merge pull request #741 from stanmoore1/kk_compile 
Reduce Kokkos compile dependencies
 2017-12-07 08:24:22 -07:00
Steve Plimpton abb2fe5be7
Merge pull request #740 from stanmoore1/improve_reax 
Improve ReaxFF
 2017-12-07 08:23:47 -07:00
Steve Plimpton bae45e2493
Merge pull request #737 from akohlmey/collected-bugfixes 
Collected bugfixes and small updates for next patch
 2017-12-07 08:23:06 -07:00
Steve Plimpton 73d509f339
Merge pull request #735 from jaapkroe/extep 
Add ExTeP pair style
 2017-12-07 08:22:34 -07:00
Steve Plimpton fa0c28b717
Merge pull request #731 from Pakketeretet2/pair-yukawa-kk 
Added a KOKKOS-enabled Yukawa pair style.
 2017-12-07 08:21:20 -07:00
Steve Plimpton bc3a84b480
Merge pull request #727 from lammps/fix-gcmc-examples 
new example scripts for fix gcmc
 2017-12-07 08:19:56 -07:00
Richard Berger 4d915dba08 Rename fix python/move to move/python 2017-12-05 23:42:57 -05:00
Stan Moore f64544a5fe Move instantiation of MemoryKokkos class 2017-12-05 08:34:24 -07:00
Jaap Kroes fc742eb2ef Remove outdated elastic constants 2017-12-05 16:23:20 +01:00
Stefan Paquay 1baecc689e
Merge pull request #3 from stanmoore1/kk_yukawa 
Add pair_yukawa_kokkos to Install.sh and minor cleanup.

These changes look fine. Sorry for the tabs, I must have forgotten about those.
 2017-12-04 14:16:53 -05:00
Stan Moore d916416cc5 Add pair_yukawa_kokkos to Install.sh and minor cleanup 2017-12-04 12:02:32 -07:00
Stan Moore 2813923f15 Add multiple inheritance to pair_multi_lucy_rx_kokkos 2017-12-04 10:43:41 -07:00
Axel Kohlmeyer 4a3a6b4455 no need to include library.o in the LAMMPS executable 2017-12-03 19:37:42 -05:00
Richard Berger f8891a4451 Rename fix python/integrate to python/move 
This is to avoid confusion to what LAMMPS considers to be an
integrator like Verlet and RESPA.
 2017-12-02 01:04:46 -05:00
Giacomo Fiorin 51688b2504 Improve performance of Python integrator (NVE_Opt version) 
Removing the loop over atoms by using NumPy array indexing allows to recover
performance close to that of plain fix nve.
 2017-12-02 00:40:21 -05:00
Richard Berger 93be2d264e Detect correct integer type in lammps python interface 2017-12-02 00:39:15 -05:00
Richard Berger b9fd1156b2 Completed first version of fix python/integrate 
This includes an example of how to implement fix NVE in Python.

The library interface was extended to provide direct access to atom data using
numpy arrays. No data copies are made and numpy operations directly manipulate
memory of the native code.

To keep this numpy dependency optional, all functions are wrapped into the
lammps.numpy sub-object which is only loaded when accessed.
 2017-12-02 00:39:15 -05:00