Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow filtering with implicit and semi-implicit solver #4600

Closed
wants to merge 1 commit into from
Closed

Allow filtering with implicit and semi-implicit solver #4600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions Source/Evolve/WarpXOneStepImplicitPicard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,24 @@ WarpX::OneStep_ImplicitPicard(amrex::Real cur_time)
(deltaE > picard_iteration_tolerance || deltaB > picard_iteration_tolerance)) {
iteration_count++;

if (picard_iteration_tolerance > 0. || iteration_count == max_picard_iterations) {
// Save the E at n+1/2 from the previous iteration so that the change
// in this iteration can be calculated
amrex::MultiFab::Copy(*Efield_save[0][0], *Efield_fp[0][0], 0, 0, ncomps, 0);
amrex::MultiFab::Copy(*Efield_save[0][1], *Efield_fp[0][1], 0, 0, ncomps, 0);
amrex::MultiFab::Copy(*Efield_save[0][2], *Efield_fp[0][2], 0, 0, ncomps, 0);

if (evolve_scheme == EvolveScheme::ImplicitPicard) {
// Save the B at n+1/2 from the previous iteration so that the change
// in this iteration can be calculated
amrex::MultiFab::Copy(*Bfield_save[0][0], *Bfield_fp[0][0], 0, 0, ncomps, 0);
amrex::MultiFab::Copy(*Bfield_save[0][1], *Bfield_fp[0][1], 0, 0, ncomps, 0);
amrex::MultiFab::Copy(*Bfield_save[0][2], *Bfield_fp[0][2], 0, 0, ncomps, 0);
}
}

if (use_filter) { ApplyFilterJ(Efield_fp, 0); }

// Advance the particle positions by 1/2 dt,
// particle velocities by dt, then take average of old and new v,
// deposit currents, giving J at n+1/2
Expand All @@ -156,14 +174,6 @@ WarpX::OneStep_ImplicitPicard(amrex::Real cur_time)

SyncCurrentAndRho();

if (picard_iteration_tolerance > 0. || iteration_count == max_picard_iterations) {
// Save the E at n+1/2 from the previous iteration so that the change
// in this iteration can be calculated
amrex::MultiFab::Copy(*Efield_save[0][0], *Efield_fp[0][0], 0, 0, ncomps, 0);
amrex::MultiFab::Copy(*Efield_save[0][1], *Efield_fp[0][1], 0, 0, ncomps, 0);
amrex::MultiFab::Copy(*Efield_save[0][2], *Efield_fp[0][2], 0, 0, ncomps, 0);
}

// Copy Efield_n into Efield_fp since EvolveE updates Efield_fp in place
amrex::MultiFab::Copy(*Efield_fp[0][0], *Efield_n[0][0], 0, 0, ncomps, Efield_n[0][0]->nGrowVect());
amrex::MultiFab::Copy(*Efield_fp[0][1], *Efield_n[0][1], 0, 0, ncomps, Efield_n[0][1]->nGrowVect());
Expand All @@ -176,14 +186,6 @@ WarpX::OneStep_ImplicitPicard(amrex::Real cur_time)
ApplyEfieldBoundary(0, PatchType::fine);

if (evolve_scheme == EvolveScheme::ImplicitPicard) {
if (picard_iteration_tolerance > 0. || iteration_count == max_picard_iterations) {
// Save the B at n+1/2 from the previous iteration so that the change
// in this iteration can be calculated
amrex::MultiFab::Copy(*Bfield_save[0][0], *Bfield_fp[0][0], 0, 0, ncomps, 0);
amrex::MultiFab::Copy(*Bfield_save[0][1], *Bfield_fp[0][1], 0, 0, ncomps, 0);
amrex::MultiFab::Copy(*Bfield_save[0][2], *Bfield_fp[0][2], 0, 0, ncomps, 0);
}

// Copy Bfield_n into Bfield_fp since EvolveB updates Bfield_fp in place
amrex::MultiFab::Copy(*Bfield_fp[0][0], *Bfield_n[0][0], 0, 0, ncomps, Bfield_n[0][0]->nGrowVect());
amrex::MultiFab::Copy(*Bfield_fp[0][1], *Bfield_n[0][1], 0, 0, ncomps, Bfield_n[0][1]->nGrowVect());
Expand Down
Loading