aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Source/FieldSolver/PicsarHybridSpectralSolver/Make.package6
-rw-r--r--Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridFFTData.H (renamed from Source/FieldSolver/PicsarHybridSpectralSolver/FFTData.H)6
-rw-r--r--Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridSpectralSolver.cpp (renamed from Source/FieldSolver/PicsarHybridSpectralSolver/WarpXFFT.cpp)0
-rw-r--r--Source/FieldSolver/PicsarHybridSpectralSolver/picsar_hybrid_spectral.F90 (renamed from Source/FieldSolver/PicsarHybridSpectralSolver/WarpX_fft.F90)0
-rw-r--r--Source/WarpX.H2
5 files changed, 7 insertions, 7 deletions
diff --git a/Source/FieldSolver/PicsarHybridSpectralSolver/Make.package b/Source/FieldSolver/PicsarHybridSpectralSolver/Make.package
index 6de79fd1d..e185525e6 100644
--- a/Source/FieldSolver/PicsarHybridSpectralSolver/Make.package
+++ b/Source/FieldSolver/PicsarHybridSpectralSolver/Make.package
@@ -1,6 +1,6 @@
-CEXE_headers += FFTData.H
-CEXE_sources += WarpXFFT.cpp
-F90EXE_sources += WarpX_fft.F90
+CEXE_headers += PicsarHybridFFTData.H
+CEXE_sources += PicsarHybridSpectralSolver.cpp
+F90EXE_sources += picsar_hybrid_spectral.F90
INCLUDE_LOCATIONS += $(WARPX_HOME)/Source/FieldSolver/PicsarHybridSpectralSolver
VPATH_LOCATIONS += $(WARPX_HOME)/Source/FieldSolver/PicsarHybridSpectralSolver \ No newline at end of file
diff --git a/Source/FieldSolver/PicsarHybridSpectralSolver/FFTData.H b/Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridFFTData.H
index 21c65028f..4e97ab675 100644
--- a/Source/FieldSolver/PicsarHybridSpectralSolver/FFTData.H
+++ b/Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridFFTData.H
@@ -1,5 +1,5 @@
-#ifndef WARPX_FFTDATA_H_
-#define WARPX_FFTDATA_H_
+#ifndef WARPX_PICSAR_HYBRID_FFTDATA_H_
+#define WARPX_PICSAR_HYBRID_FFTDATA_H_
// FFTData is a stuct containing a 22 pointers to auxiliary arrays
// 1-11: padded arrays in real space (required by FFTW); 12-22: arrays in spectral space
@@ -29,4 +29,4 @@ struct FFTData
void operator= (FFTData&&) = delete;
};
-#endif // WARPX_FFTDATA_H_ \ No newline at end of file
+#endif // WARPX_PICSAR_HYBRID_FFTDATA_H_ \ No newline at end of file
diff --git a/Source/FieldSolver/PicsarHybridSpectralSolver/WarpXFFT.cpp b/Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridSpectralSolver.cpp
index 26c93086a..26c93086a 100644
--- a/Source/FieldSolver/PicsarHybridSpectralSolver/WarpXFFT.cpp
+++ b/Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridSpectralSolver.cpp
diff --git a/Source/FieldSolver/PicsarHybridSpectralSolver/WarpX_fft.F90 b/Source/FieldSolver/PicsarHybridSpectralSolver/picsar_hybrid_spectral.F90
index 35357a63f..35357a63f 100644
--- a/Source/FieldSolver/PicsarHybridSpectralSolver/WarpX_fft.F90
+++ b/Source/FieldSolver/PicsarHybridSpectralSolver/picsar_hybrid_spectral.F90
diff --git a/Source/WarpX.H b/Source/WarpX.H
index e23fbffc2..35de5c88d 100644
--- a/Source/WarpX.H
+++ b/Source/WarpX.H
@@ -29,7 +29,7 @@
#include <SpectralSolver.H>
#endif
#ifdef WARPX_USE_PSATD_HYBRID
-#include <FFTData.H>
+#include <PicsarHybridFFTData.H>
#endif
#if defined(BL_USE_SENSEI_INSITU)