From e3922930d0ef73f89d0f830ee34f56d56050f14b Mon Sep 17 00:00:00 2001 From: AlexanderSinn Date: Thu, 6 Feb 2025 13:45:56 +0100 Subject: [PATCH] ensure invalid particles have a weight of zero --- src/particles/beam/BeamParticleContainerInit.cpp | 2 +- src/salame/Salame.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/particles/beam/BeamParticleContainerInit.cpp b/src/particles/beam/BeamParticleContainerInit.cpp index e13ba7bec7..98d42cd6f2 100644 --- a/src/particles/beam/BeamParticleContainerInit.cpp +++ b/src/particles/beam/BeamParticleContainerInit.cpp @@ -102,7 +102,7 @@ namespace ptd.rdata(BeamIdx::ux )[ip] = uxp; ptd.rdata(BeamIdx::uy )[ip] = uyp; ptd.rdata(BeamIdx::uz )[ip] = uz * speed_of_light; - ptd.rdata(BeamIdx::w )[ip] = std::abs(weight); + ptd.rdata(BeamIdx::w )[ip] = is_valid ? std::abs(weight) : amrex::Real{0}; ptd.idata(BeamIdx::nsubcycles)[ip] = 0; ptd.idata(BeamIdx::mr_level)[ip] = 0; diff --git a/src/salame/Salame.cpp b/src/salame/Salame.cpp index 6fe1763a12..909b40981f 100644 --- a/src/salame/Salame.cpp +++ b/src/salame/Salame.cpp @@ -428,7 +428,6 @@ SalameMultiplyBeamWeight (const amrex::Real W, Hipace* hipace) // invalidate particles with a weight of zero if (W == 0) { id.make_invalid(); - return; } // Multiply SALAME beam particles on this slice with W