diff options
author | 2020-12-11 14:15:12 -0800 | |
---|---|---|
committer | 2020-12-11 14:15:12 -0800 | |
commit | aee2ed2c75560bfc5bc29b51ad9cb621166ec834 (patch) | |
tree | ffd8c0d65106dfd3bea43c217156c3fdf423c939 /Source/Evolve/WarpXEvolve.cpp | |
parent | 35f3a124414f99139818e34347b73c84d7e31400 (diff) | |
download | WarpX-aee2ed2c75560bfc5bc29b51ad9cb621166ec834.tar.gz WarpX-aee2ed2c75560bfc5bc29b51ad9cb621166ec834.tar.zst WarpX-aee2ed2c75560bfc5bc29b51ad9cb621166ec834.zip |
Code-Alignment Leftovers (#1570)
Fix some code alignment leftovers.
Diffstat (limited to 'Source/Evolve/WarpXEvolve.cpp')
-rw-r--r-- | Source/Evolve/WarpXEvolve.cpp | 92 |
1 files changed, 46 insertions, 46 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 } |