diff options
| author |  Luca Fedeli <luca.fedeli@cea.fr>
| 2019-12-19 12:01:30 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-12-19 12:01:30 +0100 |
| commit | 95bf72520c3a78d93f22965fe4848f7cd443ed4c (patch) | |
| tree | fb83394162ef20b11e97dad43720bf4f1fc7c636 /Source/Evolve/WarpXEvolveEM.cpp | |
| parent | f047e4beaab1e2a31bd4a0992fa7a63b0ba0cf8c (diff) | |
| parent | 7d1a572483d5f1b314020b5282c92d48afa26f9d (diff) | |
| download | WarpX-95bf72520c3a78d93f22965fe4848f7cd443ed4c.tar.gz WarpX-95bf72520c3a78d93f22965fe4848f7cd443ed4c.tar.zst WarpX-95bf72520c3a78d93f22965fe4848f7cd443ed4c.zip | |
Merge branch 'dev' into add_harmonic_beam
Diffstat (limited to 'Source/Evolve/WarpXEvolveEM.cpp')
| -rw-r--r-- | Source/Evolve/WarpXEvolveEM.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Evolve/WarpXEvolveEM.cpp b/Source/Evolve/WarpXEvolveEM.cpp index fe0fb9157..f5491ffe3 100644 --- a/Source/Evolve/WarpXEvolveEM.cpp +++ b/Source/Evolve/WarpXEvolveEM.cpp @@ -280,6 +280,7 @@ WarpX::OneStep_nosub (Real cur_time) // Loop over species. For each ionizable species, create particles in // product species. mypc->doFieldIonization(); + mypc->doCoulombCollisions(); // Push particle from x^{n} to x^{n+1} // from p^{n-1/2} to p^{n+1/2} // Deposit current j^{n+1/2} @@ -475,7 +476,7 @@ WarpX::OneStep_sub1 (Real curtime) } void -WarpX::PushParticlesandDepose (Real cur_time) +WarpX::PushParticlesandDepose (amrex::Real cur_time) { // Evolve particles to p^{n+1/2} and x^{n+1} // Depose current, j^{n+1/2} @@ -485,7 +486,7 @@ WarpX::PushParticlesandDepose (Real cur_time) } void -WarpX::PushParticlesandDepose (int lev, Real cur_time, DtType a_dt_type) +WarpX::PushParticlesandDepose (int lev, amrex::Real cur_time, DtType a_dt_type) { mypc->Evolve(lev, *Efield_aux[lev][0],*Efield_aux[lev][1],*Efield_aux[lev][2], |