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

make inclusion guard defines consistent with LAMMPS and avoid redefinition of MAX()

This commit is contained in:
Axel Kohlmeyer 2020-01-30 16:56:02 -05:00
parent 9fade740fb
commit 6369ab230e
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
2 changed files with 6 additions and 5 deletions

7
src/KOKKOS/fftdata_kokkos.h
View File

@ -13,13 +13,14 @@
#include "kokkos_type.h" #include "kokkos_type.h"
#ifndef MAX
#define MAX(A,B) ((A) > (B) ? (A) : (B)) #define MAX(A,B) ((A) > (B) ? (A) : (B))
#endif
// data types for 2d/3d FFTs // data types for 2d/3d FFTs
#ifndef FFT_DATA_KOKKOS_H #ifndef LMP_FFT_DATA_KOKKOS_H
#define FFT_DATA_KOKKOS_H #define LMP_FFT_DATA_KOKKOS_H
// User-settable FFT precision // User-settable FFT precision

4
src/KOKKOS/kokkos_base_fft.h
View File

@ -11,8 +11,8 @@
See the README file in the top-level LAMMPS directory. See the README file in the top-level LAMMPS directory.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#ifndef KOKKOS_BASE_FFT_H #ifndef LMP_KOKKOS_BASE_FFT_H
#define KOKKOS_BASE_FFT_H #define LMP_KOKKOS_BASE_FFT_H
#include "fftdata_kokkos.h" #include "fftdata_kokkos.h"