Commit 2023fa28 authored by Dan Ibanez's avatar Dan Ibanez
Browse files

consistent #ifdefs for fft3d variable (2) 

this variable is only used when FFTW3
is enabled, so its declaration and
initialization should be protected
under the same conditions to avoid
compiler warnings
parent 5b295158

src/KSPACE/fft3d.cpp

+6 −1
Original line number Original line Diff line number Diff line
@@ -1094,7 +1094,10 @@ void bifactor(int n, int *factor1, int *factor2) 
void fft_1d_only(FFT_DATA *data, int nsize, int flag, struct fft_plan_3d *plan)

void fft_1d_only(FFT_DATA *data, int nsize, int flag, struct fft_plan_3d *plan)

{

{

  int i,num;

  int i,num;

  FFT_SCALAR norm, *data_ptr;

  FFT_SCALAR norm;

#if defined(FFT_FFTW3)

  FFT_SCALAR *data_ptr;

#endif





  // system specific constants

  // system specific constants
@@ -1258,7 +1261,9 @@ void fft_1d_only(FFT_DATA *data, int nsize, int flag, struct fft_plan_3d *plan) 
  if (flag == 1 && plan->scaled) {

  if (flag == 1 && plan->scaled) {

    norm = plan->norm;

    norm = plan->norm;

    num = MIN(plan->normnum,nsize);

    num = MIN(plan->normnum,nsize);

#if defined(FFT_FFTW3)

    data_ptr = (FFT_SCALAR *)data;

    data_ptr = (FFT_SCALAR *)data;

#endif

    for (i = 0; i < num; i++) {

    for (i = 0; i < num; i++) {

#if defined(FFT_FFTW3)

#if defined(FFT_FFTW3)

      *(data_ptr++) *= norm;

      *(data_ptr++) *= norm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE