aboutsummaryrefslogtreecommitdiff
path: root/Source/WarpXEvolve.cpp
diff options
context:
space:
mode:
authorGravatar Weiqun Zhang <weiqunzhang@lbl.gov> 2017-06-04 12:24:54 -0700
committerGravatar Weiqun Zhang <weiqunzhang@lbl.gov> 2017-06-04 12:24:54 -0700
commit287fadd5c8fed34c1da880e84ed37d92755cf22d (patch)
treeb5208fa0cd6a2a73a66f61f821f4344c326ce85f /Source/WarpXEvolve.cpp
parent814badb9cd598b97c57b1b9a319c388f540707f6 (diff)
downloadWarpX-287fadd5c8fed34c1da880e84ed37d92755cf22d.tar.gz
WarpX-287fadd5c8fed34c1da880e84ed37d92755cf22d.tar.zst
WarpX-287fadd5c8fed34c1da880e84ed37d92755cf22d.zip
add back PushParticleandDepose
Diffstat (limited to 'Source/WarpXEvolve.cpp')
-rw-r--r--Source/WarpXEvolve.cpp30
1 files changed, 13 insertions, 17 deletions
diff --git a/Source/WarpXEvolve.cpp b/Source/WarpXEvolve.cpp
index 0b971ea12..768314149 100644
--- a/Source/WarpXEvolve.cpp
+++ b/Source/WarpXEvolve.cpp
@@ -60,15 +60,7 @@ WarpX::Evolve (int numsteps)
UpdateAuxilaryData();
- for (int lev = 0; lev <= finest_level; ++lev) {
- // Evolve particles to p^{n+1/2} and x^{n+1}
- // Depose current, j^{n+1/2}
- mypc->Evolve(lev,
- *Efield_aux[lev][0],*Efield_aux[lev][1],*Efield_aux[lev][2],
- *Bfield_aux[lev][0],*Bfield_aux[lev][1],*Bfield_aux[lev][2],
- *current_fp[lev][0],*current_fp[lev][1],*current_fp[lev][2],
- cur_time, dt[lev]);
- }
+ PushParticlesandDepose(cur_time);
EvolveB(0.5*dt[0]); // We now B^{n+1/2}
@@ -372,19 +364,23 @@ WarpX::EvolveE (int lev, Real dt)
}
void
-WarpX::PushParticlesandDepose(int lev, Real cur_time)
+WarpX::PushParticlesandDepose (Real cur_time)
{
// Evolve particles to p^{n+1/2} and x^{n+1}
// Depose current, j^{n+1/2}
-// xxxxx
-#if 0
+ for (int lev = 0; lev <= finest_level; ++lev) {
+ PushParticlesandDepose(lev, cur_time);
+ }
+}
+
+void
+WarpX::PushParticlesandDepose (int lev, Real cur_time)
+{
mypc->Evolve(lev,
- *Efield[lev][0],*Efield[lev][1],*Efield[lev][2],
- *Bfield[lev][0],*Bfield[lev][1],*Bfield[lev][2],
- *current[lev][0],*current[lev][1],*current[lev][2],
- bndry4fine[lev].get(), bndry4crse[lev].get(),
+ *Efield_aux[lev][0],*Efield_aux[lev][1],*Efield_aux[lev][2],
+ *Bfield_aux[lev][0],*Bfield_aux[lev][1],*Bfield_aux[lev][2],
+ *current_fp[lev][0],*current_fp[lev][1],*current_fp[lev][2],
cur_time, dt[lev]);
-#endif
}
void