diff options
| author |  Edoardo Zoni <59625522+EZoni@users.noreply.github.com>
| 2022-01-09 07:53:02 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-01-09 07:53:02 -0800 |
| commit | bd91b3d5ba42cdf867c132bfc333fac7c887de73 (patch) | |
| tree | 8dd430ee991860e5c19b7a21321da2b9a04f6d74 /Source/WarpX.cpp | |
| parent | b673c598713a8dba4e2477caecabe7a720e13045 (diff) | |
| download | WarpX-bd91b3d5ba42cdf867c132bfc333fac7c887de73.tar.gz WarpX-bd91b3d5ba42cdf867c132bfc333fac7c887de73.tar.zst WarpX-bd91b3d5ba42cdf867c132bfc333fac7c887de73.zip | |
Multi-J: J Always Linear in Time (#2679)
* Remove WarpX::J_linear_in_time
* Fix Bug
* Implement Deposition of Rho at Half Time
* Implement New Equations for E
* Fix New Equations for E
* Cleaning
* Fix Limits of X2, X3, X7
* Implement New Equations for F
* Implement New Equations for F
* Revert E Equations to Avoid Roundoff Changes
* Remove Quadratic Equations
* Remove Deposition of Rho at Half Time Step
Diffstat (limited to 'Source/WarpX.cpp')
| -rw-r--r-- | Source/WarpX.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp index c30eb79d1..b2f6480a7 100644 --- a/Source/WarpX.cpp +++ b/Source/WarpX.cpp @@ -183,7 +183,6 @@ int WarpX::self_fields_verbosity = 2; int WarpX::do_subcycling = 0; int WarpX::do_multi_J = 0; int WarpX::do_multi_J_n_depositions; -int WarpX::J_linear_in_time = 0; bool WarpX::safe_guard_cells = 0; IntVect WarpX::filter_npass_each_dir(1); @@ -1088,7 +1087,6 @@ WarpX::ReadParameters () pp_psatd.query("current_correction", current_correction); pp_psatd.query("do_time_averaging", fft_do_time_averaging); - pp_psatd.query("J_linear_in_time", J_linear_in_time); if (!fft_periodic_single_box && current_correction) amrex::Abort( @@ -1200,12 +1198,9 @@ WarpX::ReadParameters () { amrex::Abort("Multi-J algorithm not implemented with Galilean PSATD"); } - } - if (J_linear_in_time) - { AMREX_ALWAYS_ASSERT_WITH_MESSAGE(update_with_rho, - "psatd.update_with_rho must be set to 1 when psatd.J_linear_in_time = 1"); + "psatd.update_with_rho must be set to 1 when warpx.do_multi_J = 1"); } for (int dir = 0; dir < AMREX_SPACEDIM; dir++) @@ -2016,7 +2011,7 @@ void WarpX::AllocLevelSpectralSolverRZ (amrex::Vector<std::unique_ptr<SpectralSo solver_dt, update_with_rho, fft_do_time_averaging, - J_linear_in_time, + do_multi_J, do_dive_cleaning, do_divb_cleaning); spectral_solver[lev] = std::move(pss); @@ -2072,7 +2067,7 @@ void WarpX::AllocLevelSpectralSolver (amrex::Vector<std::unique_ptr<SpectralSolv fft_periodic_single_box, update_with_rho, fft_do_time_averaging, - J_linear_in_time, + do_multi_J, do_dive_cleaning, do_divb_cleaning); spectral_solver[lev] = std::move(pss); |