Move Python Callback function (#1793)

1 files changed, 5 insertions, 4 deletions

diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp
index d2392f21b..39b51b261 100644
--- a/Source/Evolve/WarpXEvolve.cpp
+++ b/Source/Evolve/WarpXEvolve.cpp
@@ -164,8 +164,6 @@ WarpX::Evolve (int numsteps)
             // B : guard cells are NOT up-to-date
         }
 
-        if (warpx_py_beforeEsolve) warpx_py_beforeEsolve();
-
         if (cur_time + dt[0] >= stop_time - 1.e-3*dt[0] || step == numsteps_max-1) {
             // At the end of last step, push p by 0.5*dt to synchronize
             UpdateAuxilaryData();
@@ -180,8 +178,6 @@ WarpX::Evolve (int numsteps)
             is_synchronized = true;
         }
 
-        if (warpx_py_afterEsolve) warpx_py_afterEsolve();
-
         for (int lev = 0; lev <= max_level; ++lev) {
             ++istep[lev];
         }
@@ -330,6 +326,8 @@ WarpX::OneStep_nosub (Real cur_time)
     if (do_pml && pml_has_particles) CopyJPML();
     if (do_pml && do_pml_j_damping) DampJPML();
 
+    if (warpx_py_beforeEsolve) warpx_py_beforeEsolve();
+
     if( do_electrostatic == ElectrostaticSolverAlgo::None ) {
         // Electromagnetic solver:
         // Push E and B from {n} to {n+1}
@@ -387,7 +385,10 @@ WarpX::OneStep_nosub (Real cur_time)
             if (safe_guard_cells)
                 FillBoundaryB(guard_cells.ng_alloc_EB);
         } // !PSATD
+
     } // !do_electrostatic
+
+    if (warpx_py_afterEsolve) warpx_py_afterEsolve();
 }
 
 /* /brief Perform one PIC iteration, with subcycling