C++: Add mixin:: Element Namespace

Mirror directory structure and separate from "physical" elements as we do in Python.
ECP-WarpX · Jan 15, 2025 · 87f85e9 · 87f85e9
1 parent 5dcb441
commit 87f85e9
Show file tree

Hide file tree

Showing 41 changed files with 234 additions and 234 deletions.
diff --git a/src/initialization/InitElement.cpp b/src/initialization/InitElement.cpp
@@ -502,7 +502,7 @@ namespace detail
             amrex::ParticleReal ds = 0.0;
             pp_element.queryAdd("ds", ds);
 
-            elements::LinearTransport::Map6x6 transport_map = elements::LinearTransport::Map6x6::Identity();
+            elements::mixin::LinearTransport::Map6x6 transport_map = elements::mixin::LinearTransport::Map6x6::Identity();
 
             // safe to ParmParse inputs for reproducibility
             for (int i=1; i<=6; ++i) {

diff --git a/src/particles/elements/Aperture.H b/src/particles/elements/Aperture.H
@@ -26,11 +26,11 @@
 namespace impactx
 {
     struct Aperture
-    : public elements::Named,
-      public elements::BeamOptic<Aperture>,
-      public elements::Thin,
-      public elements::Alignment,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<Aperture>,
+      public elements::mixin::Thin,
+      public elements::mixin::Alignment,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "Aperture";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/Buncher.H b/src/particles/elements/Buncher.H
@@ -26,11 +26,11 @@
 namespace impactx
 {
     struct Buncher
-    : public elements::Named,
-      public elements::BeamOptic<Buncher>,
-      public elements::Thin,
-      public elements::Alignment,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<Buncher>,
+      public elements::mixin::Thin,
+      public elements::mixin::Alignment,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "Buncher";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/CFbend.H b/src/particles/elements/CFbend.H
@@ -28,12 +28,12 @@
 namespace impactx
 {
     struct CFbend
-    : public elements::Named,
-      public elements::BeamOptic<CFbend>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<CFbend>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "CFbend";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/ChrDrift.H b/src/particles/elements/ChrDrift.H
@@ -27,12 +27,12 @@
 namespace impactx
 {
     struct ChrDrift
-    : public elements::Named,
-      public elements::BeamOptic<ChrDrift>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<ChrDrift>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "ChrDrift";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/ChrPlasmaLens.H b/src/particles/elements/ChrPlasmaLens.H
@@ -27,12 +27,12 @@
 namespace impactx
 {
     struct ChrPlasmaLens
-    : public elements::Named,
-      public elements::BeamOptic<ChrPlasmaLens>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<ChrPlasmaLens>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "ChrPlasmaLens";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/ChrQuad.H b/src/particles/elements/ChrQuad.H
@@ -28,12 +28,12 @@
 namespace impactx
 {
     struct ChrQuad
-    : public elements::Named,
-      public elements::BeamOptic<ChrQuad>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<ChrQuad>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "ChrQuad";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/ChrUniformAcc.H b/src/particles/elements/ChrUniformAcc.H
@@ -27,12 +27,12 @@
 namespace impactx
 {
     struct ChrAcc
-    : public elements::Named,
-      public elements::BeamOptic<ChrAcc>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<ChrAcc>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "ChrAcc";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/ConstF.H b/src/particles/elements/ConstF.H
@@ -27,12 +27,12 @@
 namespace impactx
 {
     struct ConstF
-    : public elements::Named,
-      public elements::BeamOptic<ConstF>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<ConstF>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "ConstF";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/DipEdge.H b/src/particles/elements/DipEdge.H
@@ -26,11 +26,11 @@
 namespace impactx
 {
     struct DipEdge
-    : public elements::Named,
-      public elements::BeamOptic<DipEdge>,
-      public elements::Thin,
-      public elements::Alignment,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<DipEdge>,
+      public elements::mixin::Thin,
+      public elements::mixin::Alignment,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "DipEdge";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/Drift.H b/src/particles/elements/Drift.H
@@ -30,12 +30,12 @@
 namespace impactx
 {
     struct Drift
-    : public elements::Named,
-      public elements::BeamOptic<Drift>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<Drift>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "Drift";
         using PType = ImpactXParticleContainer::ParticleType;
@@ -178,7 +178,7 @@ namespace impactx
          * @returns 6x6 transport matrix
          */
         AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
-        elements::LinearTransport::Map6x6
+        elements::mixin::LinearTransport::Map6x6
         transport_map (RefPart & AMREX_RESTRICT refpart) const
         {
             using namespace amrex::literals; // for _rt and _prt
@@ -191,7 +191,7 @@ namespace impactx
             amrex::ParticleReal const betgam2 = std::pow(pt_ref, 2) - 1.0_prt;
 
             // assign linear map matrix elements
-            elements::LinearTransport::Map6x6 R = elements::LinearTransport::Map6x6::Identity();
+            elements::mixin::LinearTransport::Map6x6 R = elements::mixin::LinearTransport::Map6x6::Identity();
             R(1,2) = slice_ds;
             R(3,4) = slice_ds;
             R(5,6) = slice_ds / betgam2;

diff --git a/src/particles/elements/Empty.H b/src/particles/elements/Empty.H
@@ -22,8 +22,8 @@
 namespace impactx
 {
     struct Empty
-    : public elements::Thin,
-      public elements::NoFinalize
+    : public elements::mixin::Thin,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "None";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/ExactDrift.H b/src/particles/elements/ExactDrift.H
@@ -27,12 +27,12 @@
 namespace impactx
 {
     struct ExactDrift
-    : public elements::Named,
-      public elements::BeamOptic<ExactDrift>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<ExactDrift>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "ExactDrift";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/ExactSbend.H b/src/particles/elements/ExactSbend.H
@@ -29,12 +29,12 @@
 namespace impactx
 {
     struct ExactSbend
-    : public elements::Named,
-      public elements::BeamOptic<ExactSbend>,
-      public elements::Thick,
-      public elements::Alignment,
-      public elements::PipeAperture,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<ExactSbend>,
+      public elements::mixin::Thick,
+      public elements::mixin::Alignment,
+      public elements::mixin::PipeAperture,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "ExactSbend";
         static constexpr amrex::ParticleReal degree2rad = ablastr::constant::math::pi / 180.0;

diff --git a/src/particles/elements/Kicker.H b/src/particles/elements/Kicker.H
@@ -26,11 +26,11 @@
 namespace impactx
 {
     struct Kicker
-    : public elements::Named,
-      public elements::BeamOptic<Kicker>,
-      public elements::Thin,
-      public elements::Alignment,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<Kicker>,
+      public elements::mixin::Thin,
+      public elements::mixin::Alignment,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "Kicker";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/LinearMap.H b/src/particles/elements/LinearMap.H
@@ -26,11 +26,11 @@
 namespace impactx
 {
     struct LinearMap
-    : public elements::Named,
-      public elements::BeamOptic<LinearMap>,
-      public elements::Alignment,
-      public elements::LinearTransport,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<LinearMap>,
+      public elements::mixin::Alignment,
+      public elements::mixin::LinearTransport,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "LinearMap";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/Marker.H b/src/particles/elements/Marker.H
@@ -22,9 +22,9 @@
 namespace impactx
 {
     struct Marker
-    : public elements::Named,
-      public elements::Thin,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::Thin,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "Marker";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/Multipole.H b/src/particles/elements/Multipole.H
@@ -26,11 +26,11 @@
 namespace impactx
 {
     struct Multipole
-    : public elements::Named,
-      public elements::BeamOptic<Multipole>,
-      public elements::Thin,
-      public elements::Alignment,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<Multipole>,
+      public elements::mixin::Thin,
+      public elements::mixin::Alignment,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "Multipole";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/NonlinearLens.H b/src/particles/elements/NonlinearLens.H
@@ -26,11 +26,11 @@
 namespace impactx
 {
     struct NonlinearLens
-    : public elements::Named,
-      public elements::BeamOptic<NonlinearLens>,
-      public elements::Thin,
-      public elements::Alignment,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<NonlinearLens>,
+      public elements::mixin::Thin,
+      public elements::mixin::Alignment,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "NonlinearLens";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/PRot.H b/src/particles/elements/PRot.H
@@ -28,10 +28,10 @@
 namespace impactx
 {
     struct PRot
-    : public elements::Named,
-      public elements::BeamOptic<PRot>,
-      public elements::Thin,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<PRot>,
+      public elements::mixin::Thin,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "PRot";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/PlaneXYRot.H b/src/particles/elements/PlaneXYRot.H
@@ -29,11 +29,11 @@
 namespace impactx
 {
     struct PlaneXYRot
-    : public elements::Named,
-      public elements::BeamOptic<PlaneXYRot>,
-      public elements::Thin,
-      public elements::Alignment,
-      public elements::NoFinalize
+    : public elements::mixin::Named,
+      public elements::mixin::BeamOptic<PlaneXYRot>,
+      public elements::mixin::Thin,
+      public elements::mixin::Alignment,
+      public elements::mixin::NoFinalize
     {
         static constexpr auto type = "PlaneXYRot";
         using PType = ImpactXParticleContainer::ParticleType;

diff --git a/src/particles/elements/Programmable.H b/src/particles/elements/Programmable.H
@@ -23,7 +23,7 @@
 namespace impactx
 {
     struct Programmable
-    : public elements::Named
+    : public elements::mixin::Named
     {
         static constexpr auto type = "Programmable";
         using PType = ImpactXParticleContainer::ParticleType;