Commit 3e962c97 authored by Stan Moore's avatar Stan Moore
Browse files

Update from master

parents d8e0f488 1b0a8fdc
Loading
Loading
Loading
Loading
+44 −6
Original line number Diff line number Diff line
@@ -9,13 +9,51 @@ lib/kokkos/* @stanmoore1
lib/molfile/*         @akohlmey
lib/qmmm/*            @akohlmey
lib/vtk/*             @rbberger
lib/kim/*             @ellio167

# packages
src/KOKKOS            @stanmoore1
src/USER-CGSDK        @akohlmey
src/USER-COLVARS      @giacomofiorin
src/USER-OMP          @akohlmey
src/USER-QMMM         @akohlmey
# whole packages
src/COMPRESS/*        @akohlmey
src/GPU/*             @ndtrung81
src/KOKKOS/*          @stanmoore1
src/KIM/*             @ellio167
src/LATTE/*           @cnegre
src/SPIN/*            @julient31
src/USER-CGDNA/*      @ohenrich
src/USER-CGSDK/*      @akohlmey
src/USER-COLVARS/*    @giacomofiorin
src/USER-DPD/*        @timattox
src/USER-INTEL/*      @wmbrownintel
src/USER-MANIFOLD/*   @Pakketeretet2
src/USER-MEAMC/*      @martok
src/USER-MOFFF/*      @hheenen
src/USER-MOLFILE/*    @akohlmey
src/USER-NETCDF/*     @pastewka
src/USER-PHONON/*     @lingtikong
src/USER-OMP/*        @akohlmey
src/USER-QMMM/*       @akohlmey
src/USER-REAXC/*      @hasanmetin
src/USER-TALLY/*      @akohlmey
src/USER-UEF/*        @danicholson
src/USER-VTK/*        @rbberger

# individual files in packages
src/GPU/pair_vashishta_gpu.*        @andeplane
src/KOKKOS/pair_vashishta_kokkos.*  @andeplane
src/MANYBODY/pair_vashishta_table.* @andeplane
src/USER-MISC/fix_bond_react.*      @jrgissing
src/USER-MISC/*_grem.*              @dstelter92

# tools
tools/msi2lmp/*       @akohlmey
tools/emacs/*         @HaoZeke

# cmake
cmake/*               @junghans @rbberger

# python
python/*              @rbberger

# docs
doc/utils/*/*         @rbberger
doc/Makefile          @rbberger
doc/README            @rbberger
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ The LAMMPS distribution includes the following files and directories:
README			   this file
LICENSE			   the GNU General Public License (GPL)
bench			   benchmark problems
couple			   code coupling examples using LAMMPS as a library
cmake			   CMake build system
doc			   documentation
examples		   simple test problems
lib			   libraries LAMMPS can be linked with
+571 −178

File changed.

Preview size limit exceeded, changes collapsed.

cmake/Modules/FindFFTW2.cmake

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line
# - Find fftw2
# Find the native FFTW2 headers and libraries.
#
#  FFTW2_INCLUDE_DIRS - where to find fftw2.h, etc.
#  FFTW2_LIBRARIES    - List of libraries when using fftw2.
#  FFTW2_FOUND        - True if fftw2 found.
#

find_path(FFTW2_INCLUDE_DIR fftw.h)

find_library(FFTW2_LIBRARY NAMES fftw)

set(FFTW2_LIBRARIES ${FFTW2_LIBRARY})
set(FFTW2_INCLUDE_DIRS ${FFTW2_INCLUDE_DIR})

include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set FFTW2_FOUND to TRUE
# if all listed variables are TRUE

find_package_handle_standard_args(FFTW2 DEFAULT_MSG FFTW2_LIBRARY FFTW2_INCLUDE_DIR)

mark_as_advanced(FFTW2_INCLUDE_DIR FFTW2_LIBRARY )
+25 −0
Original line number Diff line number Diff line
# - Find fftw3f
# Find the native FFTW3F headers and libraries.
#
#  FFTW3F_INCLUDE_DIRS - where to find fftw3f.h, etc.
#  FFTW3F_LIBRARIES    - List of libraries when using fftw3f.
#  FFTW3F_FOUND        - True if fftw3f found.
#

find_package(PkgConfig)

pkg_check_modules(PC_FFTW3F fftw3f)
find_path(FFTW3F_INCLUDE_DIR fftw3.h HINTS ${PC_FFTW3F_INCLUDE_DIRS})

find_library(FFTW3F_LIBRARY NAMES fftw3f HINTS ${PC_FFTW3F_LIBRARY_DIRS})

set(FFTW3F_LIBRARIES ${FFTW3F_LIBRARY})
set(FFTW3F_INCLUDE_DIRS ${FFTW3F_INCLUDE_DIR})

include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set FFTW3F_FOUND to TRUE
# if all listed variables are TRUE

find_package_handle_standard_args(FFTW3F DEFAULT_MSG FFTW3F_LIBRARY FFTW3F_INCLUDE_DIR)

mark_as_advanced(FFTW3F_INCLUDE_DIR FFTW3F_LIBRARY )
Loading