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

fix typos. restore compilation of LAMMPS class implementation with OpenMP

This commit is contained in:
Axel Kohlmeyer 2019-06-30 22:45:41 -04:00
parent e29361523f
commit 78af594381
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/include-file-conventions.md
View File

@ -25,7 +25,7 @@ well as make otherwise hidden dependencies visible.
## Rules ## Rules
Below are the various rules that are applied. Not all a enforced Below are the various rules that are applied. Not all are enforced
strictly and automatically. If there are no significant side effects, strictly and automatically. If there are no significant side effects,
exceptions may be possible for cases, where a full compliance to the exceptions may be possible for cases, where a full compliance to the
rules may require a large effort compared to the benefit. rules may require a large effort compared to the benefit.
@ -78,9 +78,9 @@ result in a high potential for direct or indirect symbol name clashes.
In the ideal case, the header would only include one file defining the In the ideal case, the header would only include one file defining the
parent class. That would typically be either `#include "pointers.h"` for parent class. That would typically be either `#include "pointers.h"` for
the `Pointers` class, or a header of a class derived from it like the `Pointers` class, or a header of a class derived from it like
`#include "pair.h"` for the `Pair` class and so on. Referenced to other `#include "pair.h"` for the `Pair` class and so on. References to other
classes inside the class should be make through pointers, for which forward classes inside the class should be make through pointers, for which forward
declarations (inside the `LAMMPS_NS` or the new class'es namespace) can declarations (inside the `LAMMPS_NS` or the new class' namespace) can
be employed. The full definition will then be included into the corresponding be employed. The full definition will then be included into the corresponding
implementation file. In the given example from above, the header file implementation file. In the given example from above, the header file
would be called `some_name.h` and the implementation `some_name.cpp` (all would be called `some_name.h` and the implementation `some_name.cpp` (all
@ -92,7 +92,7 @@ a forward slash).
In the implementation files (typically, those would have the same base name In the implementation files (typically, those would have the same base name
as the corresponding header with a .cpp extension instead of .h) include as the corresponding header with a .cpp extension instead of .h) include
statments should follow the "include what you use" principle. statements should follow the "include what you use" principle.
### Order of Include Statements ### Order of Include Statements
@ -107,7 +107,7 @@ Include files should be included in this order:
#### pointers.h #### pointers.h
The `pointer.h` header file also includes `cstdio` and `lmptype.h` The `pointer.h` header file also includes `cstdio` and `lmptype.h`
(and throught it `stdint.h`, `intttypes.h`, and `climits`). (and through it `stdint.h`, `intttypes.h`, and `climits`).
This means any header including `pointers.h` can assume that `FILE`, This means any header including `pointers.h` can assume that `FILE`,
`NULL`, `INT_MAX` are defined. `NULL`, `INT_MAX` are defined.
@ -115,7 +115,7 @@ This means any header including `pointers.h` can assume that `FILE`,
The [Include What You Use tool](https://include-what-you-use.org/) The [Include What You Use tool](https://include-what-you-use.org/)
can be used to provide supporting information about compliance with can be used to provide supporting information about compliance with
the rules listed here. There are some limitations and the IWWU tool the rules listed here. There are some limitations and the IWYU tool
may give incorrect advice. The tools is activated by setting the may give incorrect advice. The tools is activated by setting the
CMake variable `CMAKE_CXX_INCLUDE_WHAT_YOU_USE` variable to the CMake variable `CMAKE_CXX_INCLUDE_WHAT_YOU_USE` variable to the
path of the `include-what-you-use` command. When activated, the path of the `include-what-you-use` command. When activated, the

1
src/lammps.cpp
View File

@ -48,6 +48,7 @@
#include "output.h" #include "output.h"
#include "citeme.h" #include "citeme.h"
#include "accelerator_kokkos.h" #include "accelerator_kokkos.h"
#include "accelerator_omp.h"
#include "timer.h" #include "timer.h"
#include "lmppython.h" #include "lmppython.h"
#include "version.h" #include "version.h"