Fix: shift_in Position Update

BLAST-ImpactX · Dec 23, 2023 · 57e3386 · 57e3386
1 parent a90c64f
commit 57e3386
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 59 deletions.
diff --git a/src/particles/elements/Aperture.H b/src/particles/elements/Aperture.H
@@ -85,14 +85,14 @@ namespace impactx
         {
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             auto const id = p.id();
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // scale horizontal and vertical coordinates
             amrex::ParticleReal const u = x / m_xmax;
             amrex::ParticleReal const v = y / m_ymax;

diff --git a/src/particles/elements/Buncher.H b/src/particles/elements/Buncher.H
@@ -75,14 +75,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // access reference particle values to find (beta*gamma)^2
             amrex::ParticleReal const pt_ref = refpart.pt;
             amrex::ParticleReal const betgam2 = pow(pt_ref, 2) - 1.0_prt;

diff --git a/src/particles/elements/CFbend.H b/src/particles/elements/CFbend.H
@@ -83,14 +83,15 @@ namespace impactx
         {
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // initialize output values of momenta
             amrex::ParticleReal pxout = px;
             amrex::ParticleReal pyout = py;

diff --git a/src/particles/elements/ChrDrift.H b/src/particles/elements/ChrDrift.H
@@ -77,13 +77,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
 
             // initialize output values of momenta
             amrex::ParticleReal const pxout = px;

diff --git a/src/particles/elements/ChrQuad.H b/src/particles/elements/ChrQuad.H
@@ -89,13 +89,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
 
             // length of the current slice
             amrex::ParticleReal const slice_ds = m_ds / nslice();

diff --git a/src/particles/elements/ChrUniformAcc.H b/src/particles/elements/ChrUniformAcc.H
@@ -84,13 +84,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
 
             // length of the current slice
             amrex::ParticleReal const slice_ds = m_ds / nslice();

diff --git a/src/particles/elements/ConstF.H b/src/particles/elements/ConstF.H
@@ -81,13 +81,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
 
             // access reference particle values to find beta*gamma^2
             amrex::ParticleReal const pt_ref = refpart.pt;

diff --git a/src/particles/elements/DipEdge.H b/src/particles/elements/DipEdge.H
@@ -86,13 +86,13 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // access reference particle values if needed
 
             // edge focusing matrix elements (zero gap)

diff --git a/src/particles/elements/Drift.H b/src/particles/elements/Drift.H
@@ -74,14 +74,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // initialize output values of momenta
             amrex::ParticleReal const pxout = px;
             amrex::ParticleReal const pyout = py;

diff --git a/src/particles/elements/ExactDrift.H b/src/particles/elements/ExactDrift.H
@@ -75,13 +75,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
 
             // initialize output values of momenta
             amrex::ParticleReal const pxout = px;

diff --git a/src/particles/elements/ExactSbend.H b/src/particles/elements/ExactSbend.H
@@ -91,13 +91,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
 
             // angle of arc for the current slice
             amrex::ParticleReal const slice_phi = m_phi / nslice();

diff --git a/src/particles/elements/Kicker.H b/src/particles/elements/Kicker.H
@@ -84,13 +84,14 @@ namespace impactx
         {
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
 
             // normalize quad units to MAD-X convention if needed
             amrex::ParticleReal dpx = m_xkick;

diff --git a/src/particles/elements/Multipole.H b/src/particles/elements/Multipole.H
@@ -83,6 +83,9 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // a complex type with two amrex::ParticleReal
             using Complex = amrex::GpuComplex<amrex::ParticleReal>;
 
@@ -91,9 +94,6 @@ namespace impactx
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // access reference particle values to find (beta*gamma)^2
             //amrex::ParticleReal const pt_ref = refpart.pt;
             //amrex::ParticleReal const betgam2 = pow(pt_ref, 2) - 1.0_prt;

diff --git a/src/particles/elements/NonlinearLens.H b/src/particles/elements/NonlinearLens.H
@@ -83,14 +83,14 @@ namespace impactx
             // a complex type with two amrex::ParticleReal
             using Complex = amrex::GpuComplex<amrex::ParticleReal>;
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // access reference particle values to find (beta*gamma)^2
             //amrex::ParticleReal const pt_ref = refpart.pt;
             //amrex::ParticleReal const betgam2 = pow(pt_ref, 2) - 1.0_prt;

diff --git a/src/particles/elements/Quad.H b/src/particles/elements/Quad.H
@@ -81,14 +81,14 @@ namespace impactx
         {
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // length of the current slice
             amrex::ParticleReal const slice_ds = m_ds / nslice();
 

diff --git a/src/particles/elements/RFCavity.H b/src/particles/elements/RFCavity.H
@@ -194,14 +194,14 @@ namespace RFCavityData
         {
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // initialize output values of momenta
             amrex::ParticleReal pxout = px;
             amrex::ParticleReal pyout = py;

diff --git a/src/particles/elements/Sbend.H b/src/particles/elements/Sbend.H
@@ -77,14 +77,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // initialize output values of momenta
             amrex::ParticleReal pxout = px;
             amrex::ParticleReal const pyout = py;

diff --git a/src/particles/elements/ShortRF.H b/src/particles/elements/ShortRF.H
@@ -80,14 +80,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // Define parameters and intermediate constants
             using ablastr::constant::math::pi;
             using ablastr::constant::SI::c;

diff --git a/src/particles/elements/SoftQuad.H b/src/particles/elements/SoftQuad.H
@@ -199,14 +199,14 @@ namespace SoftQuadrupoleData
         {
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // initialize output values of momenta
             amrex::ParticleReal pxout = px;
             amrex::ParticleReal pyout = py;

diff --git a/src/particles/elements/SoftSol.H b/src/particles/elements/SoftSol.H
@@ -204,14 +204,14 @@ namespace SoftSolenoidData
         {
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // initialize output values of momenta
             amrex::ParticleReal pxout = px;
             amrex::ParticleReal pyout = py;

diff --git a/src/particles/elements/Sol.H b/src/particles/elements/Sol.H
@@ -78,14 +78,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // length of the current slice
             amrex::ParticleReal const slice_ds = m_ds / nslice();
 

diff --git a/src/particles/elements/ThinDipole.H b/src/particles/elements/ThinDipole.H
@@ -80,14 +80,14 @@ namespace impactx
 
             using namespace amrex::literals; // for _rt and _prt
 
+            // shift due to alignment errors of the element
+            shift_in(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);
+
             // access AoS data such as positions and cpu/id
             amrex::ParticleReal x = p.pos(RealAoS::x);
             amrex::ParticleReal y = p.pos(RealAoS::y);
             amrex::ParticleReal const t = p.pos(RealAoS::t);
 
-            // shift due to alignment errors of the element
-            shift_in(x, y, px, py);
-
             // access reference particle to find relativistic beta
             amrex::ParticleReal const beta_ref = refpart.beta();