Remove invalid beam particle from first diagnostic step (#1200)

Hi-PACE · Feb 12, 2025 · cf5abf8 · cf5abf8
1 parent c0ac640
commit cf5abf8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/particles/beam/BeamParticleContainer.cpp b/src/particles/beam/BeamParticleContainer.cpp
@@ -401,6 +401,10 @@ BeamParticleContainer::initializeSlice (int slice, int which_slice) {
             }
         );
     }
+
+    // remove invalid particles so they don't show up in the beam diagnostic of the first time step
+    amrex::removeInvalidParticles(getBeamSlice(which_slice));
+    resize(which_slice, getBeamSlice(which_slice).size(), 0);
 }
 
 void

diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             );
         }
+        // remove invalid particles so they don't show up in the beam diagnostic of the first time step
+        amrex::removeInvalidParticles(getBeamSlice(which_slice));
+        resize(which_slice, getBeamSlice(which_slice).size(), 0);
     }
     void
@@ Expand Down @@