jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into small-doc-fixes

This commit is contained in:
Axel Kohlmeyer 2018-08-17 11:24:25 -04:00
parent bfaa345536 6c5d339a94
commit 4f37b46b10
10 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/CMakeLists.txt
View File

@ -731,6 +731,11 @@ if(PKG_KOKKOS)
${KOKKOS_PKG_SOURCES_DIR}/npair_kokkos.cpp
${KOKKOS_PKG_SOURCES_DIR}/domain_kokkos.cpp
${KOKKOS_PKG_SOURCES_DIR}/modify_kokkos.cpp)
if(PKG_KSPACE)
list(APPEND KOKKOS_PKG_SOURCES ${KOKKOS_PKG_SOURCES_DIR}/gridcomm_kokkos.cpp)
endif()
set_property(GLOBAL PROPERTY "KOKKOS_PKG_SOURCES" "${KOKKOS_PKG_SOURCES}")
# detects styles which have KOKKOS version

2
doc/src/Build.txt
View File

@ -1,5 +1,5 @@
"Previous Section"_Install.html - "LAMMPS WWW Site"_lws - "LAMMPS
Documentation"_ld - "LAMMPS Commands"_lc - "Next Section"_Run.html :c
Documentation"_ld - "LAMMPS Commands"_lc - "Next Section"_Run_head.html :c
:link(lws,http://lammps.sandia.gov)
:link(ld,Manual.html)

2
doc/src/Commands.txt
View File

@ -1,4 +1,4 @@
"Previous Section"_Run.html - "LAMMPS WWW Site"_lws -
"Previous Section"_Run_head.html - "LAMMPS WWW Site"_lws -
"LAMMPS Documentation"_ld - "LAMMPS Commands"_lc - "Next
Section"_Packages.html :c

4
doc/src/Manual.txt
View File

@ -74,7 +74,7 @@ every LAMMPS command.
Intro
Install
Build
Run
Run_head
Commands
Packages
Speed
@ -112,7 +112,7 @@ END_RST -->
"Introduction"_Intro.html :olb,l
"Install LAMMPS"_Install.html :l
"Build LAMMPS"_Build.html :l
"Run LAMMPS"_Run.html :l
"Run LAMMPS"_Run_head.html :l
"Commands"_Commands.html :l
"Optional packages"_Packages.html :l
"Accelerate performance"_Speed.html :l

2
doc/src/Run_basics.txt
View File

@ -1,4 +1,4 @@
"Higher level section"_Run.html - "LAMMPS WWW Site"_lws - "LAMMPS
"Higher level section"_Run_head.html - "LAMMPS WWW Site"_lws - "LAMMPS
Documentation"_ld - "LAMMPS Commands"_lc :c
:link(lws,http://lammps.sandia.gov)

0
doc/src/Run.txt → doc/src/Run_head.txt
View File

2
doc/src/Run_options.txt
View File

@ -1,4 +1,4 @@
"Higher level section"_Run.html - "LAMMPS WWW Site"_lws - "LAMMPS
"Higher level section"_Run_head.html - "LAMMPS WWW Site"_lws - "LAMMPS
Documentation"_ld - "LAMMPS Commands"_lc :c
:link(lws,http://lammps.sandia.gov)

2
doc/src/Run_output.txt
View File

@ -1,4 +1,4 @@
"Higher level section"_Run.html - "LAMMPS WWW Site"_lws - "LAMMPS
"Higher level section"_Run_head.html - "LAMMPS WWW Site"_lws - "LAMMPS
Documentation"_ld - "LAMMPS Commands"_lc :c
:link(lws,http://lammps.sandia.gov)

2
doc/src/Run_windows.txt
View File

@ -1,4 +1,4 @@
"Higher level section"_Run.html - "LAMMPS WWW Site"_lws - "LAMMPS
"Higher level section"_Run_head.html - "LAMMPS WWW Site"_lws - "LAMMPS
Documentation"_ld - "LAMMPS Commands"_lc :c
:link(lws,http://lammps.sandia.gov)

2
doc/src/lammps.book
View File

@ -25,7 +25,7 @@ Build_basics.html
Build_settings.html
Build_package.html
Build_extras.html
Run.html
Run_head.html
Run_basics.html
Run_options.html
Run_output.html