Merge branch 'dev' into depositonmaingrid

1 files changed, 6 insertions, 3 deletions

diff --git a/Source/WarpXEvolve.cpp b/Source/WarpXEvolve.cpp
index 1701b53df..be5152fc2 100644
--- a/Source/WarpXEvolve.cpp
+++ b/Source/WarpXEvolve.cpp
@@ -47,6 +47,7 @@ WarpX::EvolveEM (int numsteps)
     Real walltime, walltime_start = amrex::second();
     for (int step = istep[0]; step < numsteps_max && cur_time < stop_time; ++step)
     {
+        Real walltime_beg_step = amrex::second();
 
 	// Start loop on time steps
         amrex::Print() << "\nSTEP " << step+1 << " starts ...\n";
@@ -174,9 +175,11 @@ WarpX::EvolveEM (int numsteps)
 
         amrex::Print()<< "STEP " << step+1 << " ends." << " TIME = " << cur_time
                       << " DT = " << dt[0] << "\n";
-        walltime = amrex::second() - walltime_start;
+        Real walltime_end_step = amrex::second();
+        walltime = walltime_end_step - walltime_start;
         amrex::Print()<< "Walltime = " << walltime
-             << " s; Avg. per step = " << walltime/(step+1) << " s\n";
+                      << " s; This step = " << walltime_end_step-walltime_beg_step
+                      << " s; Avg. per step = " << walltime/(step+1) << " s\n";
 
 	// sync up time
 	for (int i = 0; i <= max_level; ++i) {
@@ -685,7 +688,7 @@ WarpX::PushParticlesandDepose (int lev, Real cur_time)
                  *Bfield_aux[lev][0],*Bfield_aux[lev][1],*Bfield_aux[lev][2],
                  *current_fp[lev][0],*current_fp[lev][1],*current_fp[lev][2],
                  current_buf[lev][0].get(), current_buf[lev][1].get(), current_buf[lev][2].get(),
-                 rho_fp[lev].get(),
+                 rho_fp[lev].get(), charge_buf[lev].get(),
                  Efield_cax[lev][0].get(), Efield_cax[lev][1].get(), Efield_cax[lev][2].get(),
                  Bfield_cax[lev][0].get(), Bfield_cax[lev][1].get(), Bfield_cax[lev][2].get(),
                  cur_time, dt[lev]);