Unverified Commit 421f97e4 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1214 from akohlmey/collected-small-changes

Collected small changes and many spelling fixes for next release candidate
parents 0d72c376 9f960baa
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -791,6 +791,13 @@ foreach(PKG ${DEFAULT_PACKAGES})
  endif()
endforeach()

# packages that need defines set
foreach(PKG MPIIO)
  if(PKG_${PKG})
    add_definitions(-DLMP_${PKG})
  endif()
endforeach()

# dedicated check for entire contents of accelerator packages
foreach(PKG ${ACCEL_PACKAGES})
  set(${PKG}_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/${PKG})
+3 −1
Original line number Diff line number Diff line
@@ -107,7 +107,9 @@ Here are some items to check:
  * new style docs should be added to the "overview" files in
  `doc/src/Commands_*.txt`, `doc/src/{fixes,computes,pairs,bonds,...}.txt`
  and `doc/src/lammps.book`
  * new files in packages should be added to `src/.gitignore`
  * check whether manual cleanly translates with `make html` and `make pdf`
  * check spelling of manual with `make spelling` in doc folder
  * new source files in packages should be added to `src/.gitignore`
  * removed or renamed files in packages should be added to `src/Purge.list`
  * C++ source files should use C++ style include files for accessing
  C-library APIs, e.g. `#include <cstdlib>` instead of `#include <stdlib.h>`.
+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ This will create a lammps/doc/html dir with the HTML doc pages so that
you can browse them locally on your system.  Type "make" from the
lammps/doc dir to see other options.

NOTE: You can also download a tarball of the documention for the
NOTE: You can also download a tarball of the documentation for the
current LAMMPS version (HTML and PDF files), from the website
"download page"_http://lammps.sandia.gov/download.html.

+4 −4
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ can be shared across multiple MD packages and can be updated, for as
long as the shared PLUMED library is ABI-compatible. The third linkage
mode is "runtime" which allows to switch the PLUMED kernel at runtime
between different variants through setting the PLUMED_KERNEL environment
varible, which has to point to the location of the libplumedKernel.so
variable, which has to point to the location of the libplumedKernel.so
dynamical shared object, which is then loaded at runtime. This is
particularly convenient for doing PLUMED development and comparing
multiple PLUMED versions without having to recompile the hosting MD
@@ -750,7 +750,7 @@ a global PLUMED installation or downloading it during building LAMMPS.
-D PLUMED_MODE=value       # Linkage mode for PLUMED, value = static (default), shared, or runtime :pre

If DOWNLOAD_PLUMED is set to "yes", the PLUMED library will be
downloaded (the version of that is hardcoded to a vetted version of
downloaded (the version of that is hard-coded to a vetted version of
PLUMED, usually a recent stable release version) and built inside the
CMake build directory.  If DOWNLOAD_PLUMED is set to "no" (the default),
CMake will try to detect an installed version of PLUMED and link to
@@ -788,7 +788,7 @@ Note that 2 symbolic (soft) links, "includelink" and "liblink" are
created in lib/plumed to point into the location of the PLUMED build to
use and also a new file lib/plumed/Makefile.lammps is created with
settings suitable for LAMMPS to compile and link PLUMED in the desired
linkage mode. After this step is compleded, you can install the
linkage mode. After this step is completed, you can install the
USER-PLUMED package and compile LAMMPS in the usual manner:

make yes-user-plumed 
@@ -804,7 +804,7 @@ operating systems, using the static linkage is expected to be the most
portable, and thus set to be the default.

If you want to change the linkage mode, you have to re-run "make
lib-plumed" with the desired settings [and] do a reinstall if the
lib-plumed" with the desired settings [and] do a re-install if the
USER-PLUMED package with "make yes-user-plumed" to update the required
makefile settings with the changes in the lib/plumed folder.

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ adequate.
[Makefile.machine setting]:

LMP_INC = -DLAMMPS_SMALLBIG    # or -DLAMMPS_BIGBIG or -DLAMMPS_SMALLSMALL :pre
                               # default is LAMMMPS_SMALLBIG if not specified
                               # default is LAMMPS_SMALLBIG if not specified
[CMake and make info]:

The default "smallbig" setting allows for simulations with:
Loading