diff options
author | 2019-07-10 23:02:23 +0200 | |
---|---|---|
committer | 2019-07-10 23:02:23 +0200 | |
commit | b1e6965c9dc669bb26bedad8fd526674934e107e (patch) | |
tree | c0e90e294b0af20a0cbac3b03c0446f22ff23c38 /Source/Evolve/WarpXEvolveEM.cpp | |
parent | 2a0d7f525f3e4a8650f927f7792584828260891a (diff) | |
parent | 2bc4cf47c7c91cf7dd6428263354a0da31b6908d (diff) | |
download | WarpX-b1e6965c9dc669bb26bedad8fd526674934e107e.tar.gz WarpX-b1e6965c9dc669bb26bedad8fd526674934e107e.tar.zst WarpX-b1e6965c9dc669bb26bedad8fd526674934e107e.zip |
Merge branch 'dev' into overlap_pml
Diffstat (limited to 'Source/Evolve/WarpXEvolveEM.cpp')
-rw-r--r-- | Source/Evolve/WarpXEvolveEM.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Evolve/WarpXEvolveEM.cpp b/Source/Evolve/WarpXEvolveEM.cpp index ab5b28ade..531cd6a56 100644 --- a/Source/Evolve/WarpXEvolveEM.cpp +++ b/Source/Evolve/WarpXEvolveEM.cpp @@ -84,12 +84,14 @@ WarpX::EvolveEM (int numsteps) *Bfield_aux[lev][0],*Bfield_aux[lev][1],*Bfield_aux[lev][2]); } is_synchronized = false; + } else { // Beyond one step, we have E^{n} and B^{n}. // Particles have p^{n-1/2} and x^{n}. FillBoundaryE(); FillBoundaryB(); UpdateAuxilaryData(); + } if (do_subcycling == 0 || finest_level == 0) { @@ -134,6 +136,7 @@ WarpX::EvolveEM (int numsteps) // slice generation // bool to_make_slice_plot = (slice_plot_int > 0) && ( (step+1)% slice_plot_int == 0); + bool do_insitu = ((step+1) >= insitu_start) && (insitu_int > 0) && ((step+1) % insitu_int == 0); @@ -283,13 +286,14 @@ WarpX::OneStep_nosub (Real cur_time) if (warpx_py_beforedeposition) warpx_py_beforedeposition(); #endif PushParticlesandDepose(cur_time); + #ifdef WARPX_USE_PY if (warpx_py_afterdeposition) warpx_py_afterdeposition(); #endif SyncCurrent(); - SyncRho(rho_fp, rho_cp); + SyncRho(); // Push E and B from {n} to {n+1} // (And update guard cells immediately afterwards) |