Converted fft files to C++.
authorRossen Apostolov <rossen@kth.se>
Wed, 3 Sep 2014 09:54:39 +0000 (11:54 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 9 Sep 2014 08:45:20 +0000 (10:45 +0200)
Change-Id: I33609cb7019b216f1f675110ecc37bdd882dcfa5

src/gromacs/fft/CMakeLists.txt
src/gromacs/fft/fft.cpp [moved from src/gromacs/fft/fft.c with 100% similarity]
src/gromacs/fft/fft_fftpack.cpp [moved from src/gromacs/fft/fft_fftpack.c with 100% similarity]
src/gromacs/fft/fft_mkl.cpp [moved from src/gromacs/fft/fft_mkl.c with 100% similarity]
src/gromacs/fft/parallel_3dfft.cpp [moved from src/gromacs/fft/parallel_3dfft.c with 99% similarity]

index cb5a51f736a77587c2354730a844cb46cd2809a8..5de9782aa6bf3f226ef617a26c4ffab8cd09cfbe 100644 (file)
 
 # GLOB is used to get full paths
 file(GLOB FFT_SOURCES
-     fft.c fft5d.cpp parallel_3dfft.c)
+     fft.cpp fft5d.cpp parallel_3dfft.cpp)
 
 if (GMX_FFT_FFTPACK)
-    file(GLOB FFT_SPECIFIC_SOURCES fft_fftpack.c)
+    file(GLOB FFT_SPECIFIC_SOURCES fft_fftpack.cpp)
     list(APPEND FFT_SPECIFIC_SOURCES
          ${CMAKE_SOURCE_DIR}/src/external/fftpack/fftpack.c)
 endif()
@@ -45,7 +45,7 @@ if (GMX_FFT_FFTW3)
     file(GLOB FFT_SPECIFIC_SOURCES fft_fftw3.cpp)
 endif()
 if (GMX_FFT_MKL)
-    file(GLOB FFT_SPECIFIC_SOURCES fft_mkl.c)
+    file(GLOB FFT_SPECIFIC_SOURCES fft_mkl.cpp)
 endif()
 
 set(LIBGROMACS_SOURCES
similarity index 99%
rename from src/gromacs/fft/parallel_3dfft.c
rename to src/gromacs/fft/parallel_3dfft.cpp
index ff69a13bc850d08e03a1b13baf4411a9b27834bb..f721bab65f500464461f2b75dfd5445a9c250eba 100644 (file)
@@ -131,7 +131,7 @@ gmx_parallel_3dfft_real_limits(gmx_parallel_3dfft_t      pfft_setup,
 
 static void reorder_ivec_yzx(ivec v)
 {
-    real tmp;
+    int tmp;
 
     tmp   = v[0];
     v[XX] = v[2];