1 files changed, 24 insertions, 11 deletions

diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
index 0be623eed..16894da78 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
@@ -8,10 +8,11 @@
 #include "SpectralSolver.H"
 #include "SpectralAlgorithms/PsatdAlgorithm.H"
 #include "SpectralAlgorithms/GalileanAlgorithm.H"
+#include "SpectralAlgorithms/AvgGalileanAlgorithm.H"
 #include "SpectralAlgorithms/PMLPsatdAlgorithm.H"
 #include "WarpX.H"
 #include "Utils/WarpXProfilerWrapper.H"
-
+#include "Utils/WarpXUtil.H"
 
 #if WARPX_USE_PSATD
 
@@ -50,19 +51,30 @@ SpectralSolver::SpectralSolver(
     // - Select the algorithm depending on the input parameters
     //   Initialize the corresponding coefficients over k space
 
+    amrex::ParmParse pp("psatd");
+    pp.query("do_time_averaging", fft_do_time_averaging);
+
     if (pml) {
         algorithm = std::unique_ptr<PMLPsatdAlgorithm>( new PMLPsatdAlgorithm(
             k_space, dm, norder_x, norder_y, norder_z, nodal, dt ) );
-    } else if ((v_galilean[0]==0) && (v_galilean[1]==0) && (v_galilean[2]==0)){
-         // v_galilean is 0: use standard PSATD algorithm
-         algorithm = std::unique_ptr<PsatdAlgorithm>( new PsatdAlgorithm(
-             k_space, dm, norder_x, norder_y, norder_z, nodal, dt, update_with_rho ) );
-      } else {
-          // Otherwise: use the Galilean algorithm
-          algorithm = std::unique_ptr<GalileanAlgorithm>( new GalileanAlgorithm(
-              k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt ));
-       }
-
+    }
+    else {
+        if (fft_do_time_averaging){
+            algorithm = std::unique_ptr<AvgGalileanAlgorithm>( new AvgGalileanAlgorithm(
+                k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt ) );
+        }
+        else {
+            if ((v_galilean[0]==0) && (v_galilean[1]==0) && (v_galilean[2]==0)){
+                // v_galilean is 0: use standard PSATD algorithm
+                algorithm = std::unique_ptr<PsatdAlgorithm>( new PsatdAlgorithm(
+                   k_space, dm, norder_x, norder_y, norder_z, nodal, dt, update_with_rho ) );
+            }
+            else {
+                algorithm = std::unique_ptr<GalileanAlgorithm>( new GalileanAlgorithm(
+                    k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt ) );
+            }
+        }
+    }
 
     // - Initialize arrays for fields in spectral space + FFT plans
     field_data = SpectralFieldData( realspace_ba, k_space, dm,
@@ -96,4 +108,5 @@ SpectralSolver::pushSpectralFields(){
     // initialized in the constructor of `SpectralSolver`
     algorithm->pushSpectralFields( field_data );
 }
+
 #endif // WARPX_USE_PSATD