Skip to content

[WIP] Fix DefaultInitializeRuntimeAttributes #6409

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

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

[WIP] Fix DefaultInitializeRuntimeAttributes #6409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Source/Particles/Collision/BinaryCollision/Bremsstrahlung/PhotonCreationFunc.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public:
ParticleCreation::DefaultInitializeRuntimeAttributes(*tile_products[i],
0, 0,
pc_products[i]->getUserRealAttribs(), pc_products[i]->getUserIntAttribs(),
pc_products[i]->GetRealSoANames(), pc_products[i]->GetIntSoANames(),
//pc_products[i]->GetRealSoANames(), pc_products[i]->GetIntSoANames(),
pc_products[i]->getUserRealAttribParser(),
pc_products[i]->getUserIntAttribParser(),
#ifdef WARPX_QED
Expand Down
2 changes: 1 addition & 1 deletion Source/Particles/Collision/BinaryCollision/DSMC/SplitAndScatterFunc.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ public:
ParticleCreation::DefaultInitializeRuntimeAttributes(*tile_products[i],
0, 0,
pc_products[i]->getUserRealAttribs(), pc_products[i]->getUserIntAttribs(),
pc_products[i]->GetRealSoANames(), pc_products[i]->GetIntSoANames(),
//pc_products[i]->GetRealSoANames(), pc_products[i]->GetIntSoANames(),
pc_products[i]->getUserRealAttribParser(),
pc_products[i]->getUserIntAttribParser(),
#ifdef WARPX_QED
Expand Down
2 changes: 1 addition & 1 deletion Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public:
ParticleCreation::DefaultInitializeRuntimeAttributes(*tile_products[i],
0, 0,
pc_products[i]->getUserRealAttribs(), pc_products[i]->getUserIntAttribs(),
pc_products[i]->GetRealSoANames(), pc_products[i]->GetIntSoANames(),
//pc_products[i]->GetRealSoANames(), pc_products[i]->GetIntSoANames(),
pc_products[i]->getUserRealAttribParser(),
pc_products[i]->getUserIntAttribParser(),
#ifdef WARPX_QED
Expand Down
8 changes: 6 additions & 2 deletions Source/Particles/ParticleCreation/DefaultInitialization.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ void DefaultInitializeRuntimeAttributes (PTile& ptile,
const int n_external_attr_int,
const std::vector<std::string>& user_real_attribs,
const std::vector<std::string>& user_int_attribs,
const std::vector<std::string>& particle_comps,
const std::vector<std::string>& particle_icomps,
//const std::vector<std::string>& particle_comps,
//const std::vector<std::string>& particle_icomps,
const std::vector<amrex::Parser*>& user_real_attrib_parser,
const std::vector<amrex::Parser*>& user_int_attrib_parser,
#ifdef WARPX_QED
Expand All @@ -134,6 +134,10 @@ void DefaultInitializeRuntimeAttributes (PTile& ptile,
{
using namespace amrex::literals;

// Get particle component names from ParticleTile object
std::vector<std::string> particle_comps = ptile.GetStructOfArrays().GetRealNames();
std::vector<std::string> particle_icomps = ptile.GetStructOfArrays().GetIntNames();

// Preparing data needed for user defined attributes
const auto n_user_real_attribs = static_cast<int>(user_real_attribs.size());
const auto n_user_int_attribs = static_cast<int>(user_int_attribs.size());
Expand Down
6 changes: 3 additions & 3 deletions Source/Particles/ParticleCreation/FilterCopyTransform.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Index filterCopyTransformParticles (DstPC& pc, DstTile& dst, SrcTile& src,
ParticleCreation::DefaultInitializeRuntimeAttributes(dst,
0, 0,
pc.getUserRealAttribs(), pc.getUserIntAttribs(),
pc.GetRealSoANames(), pc.GetIntSoANames(),
//pc.GetRealSoANames(), pc.GetIntSoANames(),
pc.getUserRealAttribParser(),
pc.getUserIntAttribParser(),
#ifdef WARPX_QED
Expand Down Expand Up @@ -262,7 +262,7 @@ Index filterCopyTransformParticles (DstPC& pc1, DstPC& pc2, DstTile& dst1, DstTi
ParticleCreation::DefaultInitializeRuntimeAttributes(dst1,
0, 0,
pc1.getUserRealAttribs(), pc1.getUserIntAttribs(),
pc1.GetRealSoANames(), pc1.GetIntSoANames(),
//pc1.GetRealSoANames(), pc1.GetIntSoANames(),
pc1.getUserRealAttribParser(),
pc1.getUserIntAttribParser(),
#ifdef WARPX_QED
Expand All @@ -276,7 +276,7 @@ Index filterCopyTransformParticles (DstPC& pc1, DstPC& pc2, DstTile& dst1, DstTi
ParticleCreation::DefaultInitializeRuntimeAttributes(dst2,
0, 0,
pc2.getUserRealAttribs(), pc2.getUserIntAttribs(),
pc2.GetRealSoANames(), pc2.GetIntSoANames(),
//pc2.GetRealSoANames(), pc2.GetIntSoANames(),
pc2.getUserRealAttribParser(),
pc2.getUserIntAttribParser(),
#ifdef WARPX_QED
Expand Down
4 changes: 2 additions & 2 deletions Source/Particles/ParticleCreation/FilterCreateTransformFromFAB.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Index filterCreateTransformFromFAB (DstPC& pc1, DstPC& pc2,
ParticleCreation::DefaultInitializeRuntimeAttributes(dst1,
0, 0,
pc1.getUserRealAttribs(), pc1.getUserIntAttribs(),
pc1.GetRealSoANames(), pc1.GetIntSoANames(),
//pc1.GetRealSoANames(), pc1.GetIntSoANames(),
pc1.getUserRealAttribParser(),
pc1.getUserIntAttribParser(),
#ifdef WARPX_QED
Expand All @@ -159,7 +159,7 @@ Index filterCreateTransformFromFAB (DstPC& pc1, DstPC& pc2,
ParticleCreation::DefaultInitializeRuntimeAttributes(dst2,
0, 0,
pc2.getUserRealAttribs(), pc2.getUserIntAttribs(),
pc2.GetRealSoANames(), pc2.GetIntSoANames(),
//pc2.GetRealSoANames(), pc2.GetIntSoANames(),
pc2.getUserRealAttribParser(),
pc2.getUserIntAttribParser(),
#ifdef WARPX_QED
Expand Down
2 changes: 1 addition & 1 deletion Source/Particles/PhysicalParticleContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ PhysicalParticleContainer::DefaultInitializeRuntimeAttributes (
ParticleCreation::DefaultInitializeRuntimeAttributes(pinned_tile,
n_external_attr_real, n_external_attr_int,
m_user_real_attribs, m_user_int_attribs,
GetRealSoANames(), GetIntSoANames(),
//GetRealSoANames(), GetIntSoANames(),
amrex::GetVecOfPtrs(m_user_real_attrib_parser),
amrex::GetVecOfPtrs(m_user_int_attrib_parser),
#ifdef WARPX_QED
Expand Down
Loading