Per-slice fixed_ppc beam initialization #1000
Conversation
| /** Width of the Gaussian beam. Only used for a fixed-weight beam */ | ||
| amrex::RealVect m_position_std {0., 0., 0.}; |
There was a problem hiding this comment.
This has nothing to do with this PR, but isn't that also used for a fixed ppc beam with a Gaussian profile?
There was a problem hiding this comment.
Position std for the fixed ppc Gaussian profile is stored inside GetInitialDensity, so that variable in BeamParticleContainer is only used for fixed weight beams.
There was a problem hiding this comment.
Ah, I see, that makes sense
| @@ -202,7 +199,7 @@ BeamParticleContainer::InitData (const amrex::Geometry& geom) | |||
| amrex::ParallelDescriptor::Communicator()); | |||
| #endif | |||
|
|
|||
| if (Hipace::HeadRank()) { | |||
| if (Hipace::HeadRank() && m_injection_type != "fixed_ppc") { | |||
| m_init_sorter.sortParticlesByBox(*this, geom); | |||
| } | |||
There was a problem hiding this comment.
Why do we still sort particles by box when we removed the loop over boxes with the per slice comms?
There was a problem hiding this comment.
The function actually sorts per slice (1 box == 1 slice there)
| if ( ncells_total / Hipace::m_beam_injection_cr / Hipace::m_beam_injection_cr | ||
| > std::numeric_limits<int>::max() / 100 ){ | ||
| amrex::Print()<<"WARNING: the number of cells is close to overflowing the maximum int,\n"; | ||
| amrex::Print()<<"consider using a larger hipace.beam_injection_cr\n"; |
There was a problem hiding this comment.
With the per slice init, the m_beam_injection_cr is deprecated. Could you please fully remove it from the code and add it to the deprecated input paramters?
|
|
||
| rarrdata[BeamIdx::x ][pidx] = x; | ||
| rarrdata[BeamIdx::y ][pidx] = y; | ||
| rarrdata[BeamIdx::z ][pidx] = z; | ||
| rarrdata[BeamIdx::ux ][pidx] = u[0] * speed_of_light; | ||
| rarrdata[BeamIdx::uy ][pidx] = u[1] * speed_of_light; | ||
| rarrdata[BeamIdx::uz ][pidx] = u[2] * speed_of_light; | ||
| rarrdata[BeamIdx::w ][pidx] = std::abs(weight); | ||
|
|
||
| // ensure id is always valid | ||
| // it will repeat if there are more than 2^31-1 particles | ||
| int id = int((pid + pidx) & ((1ull << 31) - 1)); | ||
| if (id == 0) id = 1; | ||
|
|
||
| iarrdata[BeamIdx::id ][pidx] = id; | ||
| iarrdata[BeamIdx::cpu][pidx] = 0; | ||
|
|
There was a problem hiding this comment.
Why can't this be in AddOneBeamParticle? The extra safety for more than 2^31-1 particles should also become relevant for fixed weight beams, so it would be nice to add this to the function and call the function. Or am I missing something?
There was a problem hiding this comment.
AddOneBeamParticle does not initialize BeamIdx::cpu and takes slightly different function arguments than what are available here.
constisconst)