Commit 4f37b46b authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into small-doc-fixes

parents bfaa3455 6c5d339a

cmake/CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -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

doc/src/Build.txt

+1 −1
Original line number Diff line number Diff line 
"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)

doc/src/Commands.txt

+1 −1
Original line number Diff line number Diff line 
"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

doc/src/Manual.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

doc/src/Run_basics.txt

+1 −1
Original line number Diff line number Diff line 
"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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE