Update makefile for new FFT procedure

Author: MSABuschmann

Make.sledgehamr

@@ -34,9 +34,14 @@ CEXE_headers += $(shell ls $(SLEDGEHAMR_PROJECT_PATH)/*/*.h | xargs -n 1 basenam
 include $(SLEDGEHAMR_HOME_ABS)/Make.projects
 
 # SWFFT
-include $(AMREX_HOME)/Src/Extern/SWFFT/Make.package
-INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/Extern/SWFFT
-VPATH_LOCATIONS   += $(AMREX_HOME)/Src/Extern/SWFFT
+#include $(AMREX_HOME)/Src/Extern/SWFFT/Make.package
+#INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/Extern/SWFFT
+#VPATH_LOCATIONS   += $(AMREX_HOME)/Src/Extern/SWFFT
+
+include $(AMREX_HOME)/Src/FFT/Make.package
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/FFT
+VPATH_LOCATIONS   += $(AMREX_HOME)/Src/FFT
+
 LIBRARIES += -L$(FFTW_DIR) -lfftw3_mpi -lfftw3_omp -lfftw3
 
 # Boost
@@ -49,6 +54,7 @@ LIBRARIES += -lhdf5
 # AMReX
 USE_MPI = TRUE
 USE_OMP = TRUE
+USE_FFT = TRUE
 DIM = 3
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.defs

source/utils/fft.h

@@ -1,13 +1,18 @@
 #ifndef SLEDGEHAMR_FFT_H_
 #define SLEDGEHAMR_FFT_H_
 
+// #define OLD_FFT
+
 #include <AMReX_BCUtil.H>
 #include <AMReX_FillPatchUtil.H>
 #include <AMReX_PhysBCFunct.H>
-// #include <AlignedAllocator.h>
-// #include <Dfft.H>
-// #include <Distribution.H>
+#ifdef OLD_FFT
+#include <AlignedAllocator.h>
+#include <Dfft.H>
+#include <Distribution.H>
+#else
 #include <AMReX_FFT.H>
+#endif
 #include <iterator>
 
 #include "hdf5_utils.h"
@@ -211,6 +216,8 @@ static void Fft(const amrex::MultiFab &field, const int comp,
 
     amrex::FillPatchSingleLevel(padded_field, 0, smf, stime, 0, 0, 1,
                                 padded_geom, physbc, 0);
+
+#ifndef OLD_FFT
     // Use the new amrex::FFT setup
     amrex::Box domain = padded_ba.minimalBox();
     amrex::FFT::R2C my_fft(domain);
@@ -253,8 +260,8 @@ static void Fft(const amrex::MultiFab &field, const int comp,
                 });
         }
     }
+#else
 
-    /*
     // Now setup SWFFT
     int nx = padded_ba[0].size()[0];
     int ny = padded_ba[0].size()[1];
@@ -340,7 +347,7 @@ static void Fft(const amrex::MultiFab &field, const int comp,
             }
         }
     }
-    */
+#endif
 }
 
 }; // namespace utils