use id is_valid

Hi-PACE · Feb 13, 2024 · 21b43c3 · 21b43c3
1 parent 2837d31
commit 21b43c3
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/src/particles/beam/BeamParticleContainer.cpp b/src/particles/beam/BeamParticleContainer.cpp
@@ -378,8 +378,7 @@ BeamParticleContainer::intializeSlice (int slice, int which_slice) {
                 ptd.rdata(BeamIdx::uy)[ip] = ptd_init.rdata(BeamIdx::uy)[idx_src];
                 ptd.rdata(BeamIdx::uz)[ip] = ptd_init.rdata(BeamIdx::uz)[idx_src];
 
-                ptd.id(ip) = ptd_init.id(idx_src);
-                ptd.cpu(ip) = 0;
+                ptd.idcpu(ip) = ptd_init.idcpu(idx_src);
                 ptd.idata(BeamIdx::nsubcycles)[ip] = 0;
             }
         );
@@ -472,7 +471,7 @@ BeamParticleContainer::InSituComputeDiags (int islice)
 
             const amrex::Real uz_inv = uz == 0._rt ? 0._rt : 1._rt / uz;
 
-            if (ptd.id(ip) < 0 || x*x + y*y > insitu_radius_sq) {
+            if (!ptd.id(ip).is_valid() || x*x + y*y > insitu_radius_sq) {
                 return amrex::IdentityTuple(ReduceTuple{}, reduce_op);
             }
             const amrex::Real gamma = std::sqrt(1.0_rt + ux*ux + uy*uy + uz*uz);

diff --git a/src/particles/beam/BeamParticleContainerInit.cpp b/src/particles/beam/BeamParticleContainerInit.cpp
@@ -53,6 +53,7 @@ namespace
         ptd.rdata(BeamIdx::w  )[ip] = std::abs(weight);
 
         ptd.id(ip) = pid > 0 ? pid + ip : pid;
+        ptd.cpu(ip) = 0;
     }
 
     /** \brief Adds a single beam particle into the per-slice BeamTile

diff --git a/src/particles/deposition/BeamDepositCurrent.cpp b/src/particles/deposition/BeamDepositCurrent.cpp
@@ -99,7 +99,7 @@ DepositCurrentSlice (BeamParticleContainer& beam, Fields& fields,
 
             // Skip invalid particles and ghost particles not in the last slice
             // beam deposits only up to its finest level
-            if (ptd.id(ip) < 0 || (only_highest ? (ptd.cpu(ip)!=lev) : (ptd.cpu(ip)<lev))) return;
+            if (!ptd.id(ip).is_valid() || (only_highest ? (ptd.cpu(ip)!=lev) : (ptd.cpu(ip)<lev))) return;
 
             // --- Get particle quantities
             const amrex::Real ux = ptd.rdata(BeamIdx::ux)[ip];

diff --git a/src/particles/deposition/ExplicitDeposition.cpp b/src/particles/deposition/ExplicitDeposition.cpp
@@ -103,7 +103,7 @@ ExplicitDeposition (PlasmaParticleContainer& plasma, Fields& fields, const Multi
 
                 ip += idx_begin;
 
-                if (ptd.id(ip) < 0 || (lev != 0 && ptd.cpu(ip) < lev)) return;
+                if (!ptd.id(ip).is_valid() || (lev != 0 && ptd.cpu(ip) < lev)) return;
                 const amrex::Real psi_inv = 1._rt/ptd.rdata(PlasmaIdx::psi)[ip];
                 const amrex::Real xp = ptd.pos(0, ip);
                 const amrex::Real yp = ptd.pos(1, ip);

diff --git a/src/particles/deposition/PlasmaDepositCurrent.cpp b/src/particles/deposition/PlasmaDepositCurrent.cpp
@@ -190,7 +190,7 @@ DepositCurrent (PlasmaParticleContainer& plasma, Fields & fields, const MultiLas
                 const int ox = idx % outer_depos_order_x_1;
 
                 // only deposit plasma currents on or below their according MR level
-                if (ptd.id(ip) < 0 || (lev != 0 && ptd.cpu(ip) < lev)) return;
+                if (!ptd.id(ip).is_valid() || (lev != 0 && ptd.cpu(ip) < lev)) return;
 
                 const amrex::Real psi_inv = 1._rt/ptd.rdata(PlasmaIdx::psi)[ip];
                 const amrex::Real xp = ptd.pos(0, ip);
@@ -233,7 +233,7 @@ DepositCurrent (PlasmaParticleContainer& plasma, Fields & fields, const MultiLas
                     // This particle violates the QSA, discard it and do not deposit its current
                     amrex::Gpu::Atomic::Add(p_n_qsa_violation, 1);
                     ptd.rdata(PlasmaIdx::w)[ip] = 0.0_rt;
-                    ptd.id(ip) = -std::abs(ptd.id(ip));
+                    ptd.id(ip).make_invalid();
                     return;
                 }
 

diff --git a/src/particles/plasma/PlasmaParticleContainer.cpp b/src/particles/plasma/PlasmaParticleContainer.cpp
@@ -484,7 +484,7 @@ PlasmaParticleContainer::InSituComputeDiags (int islice)
                 const amrex::Real uy = ptd.rdata(PlasmaIdx::uy)[ip] * clight_inv;
                 const amrex::Real psi = ptd.rdata(PlasmaIdx::psi)[ip];
 
-                if (ptd.id(ip) < 0 || x*x + y*y > insitu_radius_sq) {
+                if (!ptd.id(ip).is_valid() || x*x + y*y > insitu_radius_sq) {
                     return amrex::IdentityTuple(ReduceTuple{}, reduce_op);
                 }
                 // particle's Lorentz factor

diff --git a/src/particles/pusher/BeamParticleAdvance.cpp b/src/particles/pusher/BeamParticleAdvance.cpp
@@ -129,7 +129,7 @@ AdvanceBeamParticlesSlice (
         beam.getNumParticlesIncludingSlipped(WhichBeamSlice::This),
         [=] AMREX_GPU_DEVICE (int ip, auto depos_order, auto c_use_external_fields) {
 
-            if (ptd.id(ip) < 0) return;
+            if (!ptd.id(ip).is_valid()) return;
 
             amrex::Real xp = ptd.pos(0, ip);
             amrex::Real yp = ptd.pos(1, ip);

diff --git a/src/particles/pusher/GetAndSetPosition.H b/src/particles/pusher/GetAndSetPosition.H
@@ -72,7 +72,7 @@ struct EnforceBCandSetPos
         const bool invalid = (shifted && !m_is_per);
         if (invalid) {
             ptd.rdata(PlasmaIdx::w)[ip] = 0.0_rt;
-            p.id() = -std::abs(p.id());
+            p.id().make_invalid();
         }
         x = p.pos(0);
         y = p.pos(1);
@@ -103,7 +103,7 @@ struct EnforceBCandSetPos
         const bool invalid = (shifted && !m_is_per);
         if (invalid) {
             ptd.rdata(BeamIdx::w)[ip] = 0.0_rt;
-            p.id() = -std::abs(p.id());
+            p.id().make_invalid();
         }
         x = p.pos(0);
         y = p.pos(1);

diff --git a/src/particles/pusher/PlasmaParticleAdvance.cpp b/src/particles/pusher/PlasmaParticleAdvance.cpp
@@ -107,7 +107,7 @@ AdvancePlasmaParticles (PlasmaParticleContainer& plasma, const Fields & fields,
                 [=] AMREX_GPU_DEVICE (int idx, auto depos_order, auto use_laser) {
                     const int ip = idx + idx_begin;
                     // only push plasma particles on their according MR level
-                    if (ptd.id(ip) < 0 || ptd.cpu(ip) != lev) return;
+                    if (!ptd.id(ip).is_valid() || ptd.cpu(ip) != lev) return;
 
                     // define field at particle position reals
                     amrex::Real ExmByp = 0._rt, EypBxp = 0._rt, Ezp = 0._rt;

diff --git a/src/salame/Salame.cpp b/src/salame/Salame.cpp
@@ -302,7 +302,7 @@ SalameOnlyAdvancePlasma (Hipace* hipace, const int lev)
                     [=] AMREX_GPU_DEVICE (long idx, auto depos_order) {
                         const int ip = idx + idx_begin;
                         // only push plasma particles on their according MR level
-                        if (ptd.id(ip) < 0 || ptd.cpu(ip) != lev) return;
+                        if (!ptd.id(ip).is_valid() || ptd.cpu(ip) != lev) return;
 
                         const amrex::Real xp = ptd.rdata(PlasmaIdx::x_prev)[ip];
                         const amrex::Real yp = ptd.rdata(PlasmaIdx::y_prev)[ip];