fix conflicts

1 files changed, 15 insertions, 2 deletions

diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp
index ff5442b00..23637ec97 100644
--- a/Source/Initialization/WarpXInitData.cpp
+++ b/Source/Initialization/WarpXInitData.cpp
@@ -6,6 +6,7 @@
 
 #include <WarpX.H>
 #include <WarpX_f.H>
+#include <BilinearFilter.H>
 
 #ifdef BL_USE_SENSEI_INSITU
 #include <AMReX_AmrMeshInSituBridge.H>
@@ -21,7 +22,7 @@ WarpX::InitData ()
     if (restart_chkfile.empty())
     {
         ComputeDt();
-	InitFromScratch();
+        InitFromScratch();
     }
     else
     {
@@ -38,6 +39,10 @@ WarpX::InitData ()
         WarpX::InitNCICorrector();
     }
 
+    if (WarpX::use_filter) {
+        WarpX::InitFilter();
+    }
+
     BuildBufferMasks();
 
     InitDiagnostics();
@@ -92,7 +97,7 @@ WarpX::InitDiagnostics () {
                                                moving_window_v, dt_snapshots_lab,
                                                num_snapshots_lab, gamma_boost,
                                                t_new[0], dt_boost, 
-                                               moving_window_dir));
+                                               moving_window_dir, geom[0]));
     }
 }
 
@@ -178,6 +183,14 @@ WarpX::InitNCICorrector ()
 }
 
 void
+WarpX::InitFilter (){
+    if (WarpX::use_filter){
+        WarpX::bilinear_filter.npass_each_dir = WarpX::filter_npass_each_dir;
+        WarpX::bilinear_filter.ComputeStencils();
+    }
+}
+
+void
 WarpX::PostRestart ()
 {
 #ifdef WARPX_USE_PSATD