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

Replace predictor-corrector by analytic integration and multigrid solve #437

Merged
merged 43 commits into from
Apr 7, 2021
Merged

Replace predictor-corrector by analytic integration and multigrid solve #437

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
dc338c9
skeleton code for new Bx By calculation
MaxThevenet Feb 24, 2021
d8697c9
Implementation of First Term of 18a and skeleton for 18b. Modificatio…
SaVicente Mar 16, 2021
b007d46
fix compilation errors and implement squared j deposition (#428)
MaxThevenet Mar 17, 2021
d5f2d7c
First version of full WAND-PIC implementation. equatios-hipace correc…
SaVicente Mar 22, 2021
695f97c
fix merge conflicts
MaxThevenet Mar 23, 2021
afcfb4d
fix runtime errors
MaxThevenet Mar 23, 2021
d210633
remove tabs from tex document
MaxThevenet Mar 23, 2021
7bf20bc
eol
MaxThevenet Mar 23, 2021
3498101
fix some issue and minor reformatting
MaxThevenet Mar 23, 2021
192b6a4
deactivate CI on new_bxby
MaxThevenet Mar 23, 2021
945a40a
define some variable for lighter notations
MaxThevenet Mar 23, 2021
ba4f530
constify
MaxThevenet Mar 23, 2021
cf1663b
MF Probably can't be const
MaxThevenet Mar 23, 2021
60011e8
Merge branch 'development' into new_bxby
MaxThevenet Mar 30, 2021
113823c
calculate the source terms in a ParallelFor
MaxThevenet Mar 30, 2021
e873c2c
call AMReX MG solver to solve for Bx and By
MaxThevenet Mar 30, 2021
65d4229
use old version by default
MaxThevenet Mar 30, 2021
442a179
fix bug in rho ions and expose option to use wand-pic approach
MaxThevenet Mar 30, 2021
69be693
clean up and create local communicator
MaxThevenet Mar 30, 2021
2dcc160
ne is different from rho
MaxThevenet Mar 30, 2021
5b91633
add amrex:: prefix and fix some sign errors
MaxThevenet Mar 30, 2021
2f9f6d2
no reduction needed
MaxThevenet Apr 1, 2021
3941073
make solvebxby public, not private, for gpu issue
MaxThevenet Apr 1, 2021
bea5a81
separate MG calls for Bx abd By
MaxThevenet Apr 1, 2021
2516efb
jz has the same sign in wandpic and hipace++
MaxThevenet Apr 1, 2021
6a81d33
fix transverse square current
MaxThevenet Apr 1, 2021
eaedd3e
typo in previous fix
MaxThevenet Apr 1, 2021
68939dd
change sign of source terms. Dont know why it works, but the linear e…
MaxThevenet Apr 1, 2021
885a15a
update theory, in particular correspondance wandpic/hipace++ quantities
MaxThevenet Apr 4, 2021
1f78ea4
clean cross current terms and change calculation of n*gamma
MaxThevenet Apr 4, 2021
8ab5174
fix important typo
SeverinDiederichs Apr 6, 2021
09aa7ab
counter sign error of psi
SeverinDiederichs Apr 6, 2021
ae270cc
only advance particles once
MaxThevenet Apr 6, 2021
372c333
fix two-component solve
MaxThevenet Apr 7, 2021
b64cd0b
Update src/Hipace.cpp
MaxThevenet Apr 7, 2021
d2fc08a
Update src/Hipace.cpp
MaxThevenet Apr 7, 2021
087b76d
cleaning, and get rid of double MG solve
MaxThevenet Apr 7, 2021
91a4607
make MG tolerance a runtime parameter
MaxThevenet Apr 7, 2021
9f86d29
update doc with sign fixes
MaxThevenet Apr 7, 2021
fca2669
final cleaning
MaxThevenet Apr 7, 2021
ff9cbee
create automated test with only checksum for explicit solver
MaxThevenet Apr 7, 2021
8c055c5
update benchmark for explicit solver CI test
Apr 7, 2021
7a1a6d3
comments from review
MaxThevenet Apr 7, 2021
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
Prev Previous commit
Next Next commit
eol
  • Loading branch information
@MaxThevenet
MaxThevenet committed Mar 23, 2021
commit 7bf20bc4c66d81cbb633d8fb291fe683d1fc12c3
8 changes: 4 additions & 4 deletions src/Hipace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ Hipace::SolveBxBy (const int islice, const int lev)
amrex::MultiFab Sy_comp(m_fields.getSlices(lev, WhichSlice::This).boxArray(), // Declaration of the MultiFab
m_fields.getSlices(lev, WhichSlice::This).DistributionMap(), 1,
m_fields.getSlices(lev, WhichSlice::This).nGrowVect());

/*

// TO-DO: Calculate First Term of Sx and Sy
Expand All @@ -524,7 +524,7 @@ Hipace::SolveBxBy (const int islice, const int lev)

*/


// ########################### EQUATION 18-d (y) ###########################

amrex::MultiFab n_star_gamma(m_fields.getSlices(lev, WhichSlice::This).boxArray(), // Declaration of the MultiFab
Expand Down Expand Up @@ -587,13 +587,13 @@ Hipace::SolveBxBy (const int islice, const int lev)
m_fields.getSlices(lev, WhichSlice::This).DistributionMap(), 1,
m_fields.getSlices(lev, WhichSlice::This).nGrowVect());
m_fields.TransverseDerivative(m_fields.getSlices(lev, WhichSlice::This), dx_psi,
Direction::x,
Direction::x,
m_slice_geom.CellSize(Direction::x),
1.,
SliceOperatorType::Assign,
Comps[WhichSlice::This]["Psi"], 0);
m_fields.TransverseDerivative(m_fields.getSlices(lev, WhichSlice::This), dy_psi,
Direction::y,
Direction::y,
m_slice_geom.CellSize(Direction::y),
1.,
SliceOperatorType::Assign,
Expand Down