diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Evolve/WarpXEvolve.cpp | 92 | ||||
| -rw-r--r-- | Source/WarpX.cpp | 22 |
2 files changed, 57 insertions, 57 deletions
diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp index a037c973c..94c34efa2 100644 --- a/Source/Evolve/WarpXEvolve.cpp +++ b/Source/Evolve/WarpXEvolve.cpp @@ -327,56 +327,56 @@ WarpX::OneStep_nosub (Real cur_time) if (do_pml && do_pml_j_damping) DampJPML(); if( do_electrostatic == ElectrostaticSolverAlgo::None ) { - // Electromagnetic solver: - // Push E and B from {n} to {n+1} - // (And update guard cells immediately afterwards) - if (WarpX::maxwell_solver_id == MaxwellSolverAlgo::PSATD) { - if (use_hybrid_QED) - { - WarpX::Hybrid_QED_Push(dt); + // Electromagnetic solver: + // Push E and B from {n} to {n+1} + // (And update guard cells immediately afterwards) + if (WarpX::maxwell_solver_id == MaxwellSolverAlgo::PSATD) { + if (use_hybrid_QED) + { + WarpX::Hybrid_QED_Push(dt); + FillBoundaryE(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); + } + PushPSATD(dt[0]); FillBoundaryE(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); - } - PushPSATD(dt[0]); - FillBoundaryE(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); - FillBoundaryB(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); + FillBoundaryB(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); - if (use_hybrid_QED) - { - WarpX::Hybrid_QED_Push(dt); - FillBoundaryE(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); - } - if (do_pml) DampPML(); - } else { - EvolveF(0.5 * dt[0], DtType::FirstHalf); - FillBoundaryF(guard_cells.ng_FieldSolverF); - EvolveB(0.5 * dt[0]); // We now have B^{n+1/2} - - FillBoundaryB(guard_cells.ng_FieldSolver, IntVect::TheZeroVector()); - if (WarpX::em_solver_medium == MediumForEM::Vacuum) { - // vacuum medium - EvolveE(dt[0]); // We now have E^{n+1} - } else if (WarpX::em_solver_medium == MediumForEM::Macroscopic) { - // macroscopic medium - MacroscopicEvolveE(dt[0]); // We now have E^{n+1} + if (use_hybrid_QED) + { + WarpX::Hybrid_QED_Push(dt); + FillBoundaryE(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); + } + if (do_pml) DampPML(); } else { - amrex::Abort(" Medium for EM is unknown \n"); - } + EvolveF(0.5 * dt[0], DtType::FirstHalf); + FillBoundaryF(guard_cells.ng_FieldSolverF); + EvolveB(0.5 * dt[0]); // We now have B^{n+1/2} + + FillBoundaryB(guard_cells.ng_FieldSolver, IntVect::TheZeroVector()); + if (WarpX::em_solver_medium == MediumForEM::Vacuum) { + // vacuum medium + EvolveE(dt[0]); // We now have E^{n+1} + } else if (WarpX::em_solver_medium == MediumForEM::Macroscopic) { + // macroscopic medium + MacroscopicEvolveE(dt[0]); // We now have E^{n+1} + } else { + amrex::Abort(" Medium for EM is unknown \n"); + } - FillBoundaryE(guard_cells.ng_FieldSolver, IntVect::TheZeroVector()); - EvolveF(0.5 * dt[0], DtType::SecondHalf); - EvolveB(0.5 * dt[0]); // We now have B^{n+1} - if (do_pml) { - FillBoundaryF(guard_cells.ng_alloc_F); - DampPML(); - FillBoundaryE(guard_cells.ng_MovingWindow, IntVect::TheZeroVector()); - FillBoundaryF(guard_cells.ng_MovingWindow); - FillBoundaryB(guard_cells.ng_MovingWindow, IntVect::TheZeroVector()); - } - // E and B are up-to-date in the domain, but all guard cells are - // outdated. - if (safe_guard_cells) - FillBoundaryB(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); - } // !PSATD + FillBoundaryE(guard_cells.ng_FieldSolver, IntVect::TheZeroVector()); + EvolveF(0.5 * dt[0], DtType::SecondHalf); + EvolveB(0.5 * dt[0]); // We now have B^{n+1} + if (do_pml) { + FillBoundaryF(guard_cells.ng_alloc_F); + DampPML(); + FillBoundaryE(guard_cells.ng_MovingWindow, IntVect::TheZeroVector()); + FillBoundaryF(guard_cells.ng_MovingWindow); + FillBoundaryB(guard_cells.ng_MovingWindow, IntVect::TheZeroVector()); + } + // E and B are up-to-date in the domain, but all guard cells are + // outdated. + if (safe_guard_cells) + FillBoundaryB(guard_cells.ng_alloc_EB, guard_cells.ng_Extra); + } // !PSATD } // !do_electrostatic } diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp index 6e9c05427..13762bd80 100644 --- a/Source/WarpX.cpp +++ b/Source/WarpX.cpp @@ -1136,13 +1136,13 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm spectral_solver_fp[lev]->InitFilter(filter_npass_each_dir, use_filter_compensation); } # else - if ( fft_periodic_single_box == false ) { - realspace_ba.grow(ngE); // add guard cells - } - bool const pml_flag_false=false; - spectral_solver_fp[lev] = std::make_unique<SpectralSolver>( realspace_ba, dm, - nox_fft, noy_fft, noz_fft, do_nodal, m_v_galilean, m_v_comoving, dx_vect, dt[lev], - pml_flag_false, fft_periodic_single_box, update_with_rho, fft_do_time_averaging ); + if ( fft_periodic_single_box == false ) { + realspace_ba.grow(ngE); // add guard cells + } + bool const pml_flag_false = false; + spectral_solver_fp[lev] = std::make_unique<SpectralSolver>( realspace_ba, dm, + nox_fft, noy_fft, noz_fft, do_nodal, m_v_galilean, m_v_comoving, dx_vect, dt[lev], + pml_flag_false, fft_periodic_single_box, update_with_rho, fft_do_time_averaging ); # endif #endif } // MaxwellSolverAlgo::PSATD @@ -1264,10 +1264,10 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm spectral_solver_cp[lev]->InitFilter(filter_npass_each_dir, use_filter_compensation); } # else - c_realspace_ba.grow(ngE); // add guard cells - spectral_solver_cp[lev] = std::make_unique<SpectralSolver>( c_realspace_ba, dm, - nox_fft, noy_fft, noz_fft, do_nodal, m_v_galilean, m_v_comoving, cdx_vect, dt[lev], - pml_flag_false, fft_periodic_single_box, update_with_rho, fft_do_time_averaging ); + c_realspace_ba.grow(ngE); // add guard cells + spectral_solver_cp[lev] = std::make_unique<SpectralSolver>( c_realspace_ba, dm, + nox_fft, noy_fft, noz_fft, do_nodal, m_v_galilean, m_v_comoving, cdx_vect, dt[lev], + pml_flag_false, fft_periodic_single_box, update_with_rho, fft_do_time_averaging ); # endif #endif } // MaxwellSolverAlgo::PSATD |