Merge remote-tracking branch 'mainline/development' into topic-covari…

…ance-and-transport-maps
ECP-WarpX · Oct 11, 2024 · a9888ce · a9888ce
2 parents cd4c989 + 23b2808
commit a9888ce
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/cmake/dependencies/ABLASTR.cmake b/cmake/dependencies/ABLASTR.cmake
@@ -169,7 +169,7 @@ set(ImpactX_ablastr_branch "24.10"
 set(ImpactX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(ImpactX_amrex_internal)")
-set(ImpactX_amrex_branch ""
+set(ImpactX_amrex_branch "e64ffef57a7608d1d60f9abe738cc634e9c1272e"
     CACHE STRING
     "Repository branch for ImpactX_amrex_repo if(ImpactX_amrex_internal)")
 

diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake
@@ -74,7 +74,7 @@ option(ImpactX_pyamrex_internal "Download & build pyAMReX" ON)
 set(ImpactX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
     CACHE STRING
     "Repository URI to pull and build pyamrex from if(ImpactX_pyamrex_internal)")
-set(ImpactX_pyamrex_branch "24.10"
+set(ImpactX_pyamrex_branch "8742a79c29b7db30c7287c8e33109c0d8be1277a"
     CACHE STRING
     "Repository branch for ImpactX_pyamrex_repo if(ImpactX_pyamrex_internal)")
 

diff --git a/docs/source/acknowledge_us.rst b/docs/source/acknowledge_us.rst
@@ -42,10 +42,20 @@ If your project leads to a scientific publication, please consider citing the pa
 Further ImpactX References
 **************************
 
-- Sandberg R T, Lehe R, Mitchell C E, Garten M, Myers A, Qiang J, Vay J-L and Huebl A.
+- Mitchell C, Formenti A, Huebl A, Vay J-L, Qiang J, Garten M, Lehe R.
+  **ImpactX Space Charge Modeling of High Intensity Linacs with Mesh Refinement**.
+  32nd Linear Accelerator Conference (LINAC'24), TUPB090, p. 505, 2024.
+  `DOI:10.18429/JACoW-LINAC2024-TUPB090 <https://doi.org/10.18429/JACoW-LINAC2024-TUPB090>`__
+
+- Mitchell C, Formenti A, Huebl A, Vay J-L, Qiang J, Garten M, Lehe R, Sandberg R.
+  **ImpactX Space Charge Modeling of High Intensity Linacs with Mesh Refinement**.
+  15th International Particle Accelerator Physics Conference (IPAC'24), WEPR65, p. 2653, 2024.
+  `DOI:10.18429/JACoW-IPAC2024-WEPR65 <https://doi.org/10.18429/JACoW-IPAC2024-WEPR65>`__
+
+- Sandberg R T, Lehe R, Mitchell C E, Garten M, Myers A, Qiang J, Vay J-L, Huebl A.
   **Synthesizing Particle-in-Cell Simulations Through Learning and GPU Computing for Hybrid Particle Accelerator Beamlines**.
-  Proc. of Platform for Advanced Scientific Computing (PASC'24), *submitted*, 2024.
-  `arXiv:2402.17248 <http://arxiv.org/abs/2402.17248>`__
+  Proc. of Platform for Advanced Scientific Computing (PASC'24), *PASC24 Best Paper Award*, 2024.
+  `DOI:10.1145/3659914.3659937 <https://doi.org/10.1145/3659914.3659937>`__
 
 - Mitchell C E, Huebl A, Qiang J, Lehe R, Garten M, Sandberg R T, Vay J-L.
   **ImpactX Modeling of Benchmark Tests for Space Charge Validation**.

diff --git a/examples/pytorch_surrogate_model/README.rst b/examples/pytorch_surrogate_model/README.rst
@@ -8,8 +8,8 @@ For more details, see:
 
 - Sandberg R T, Lehe R, Mitchell C E, Garten M, Myers A, Qiang J, Vay J-L and Huebl A.
   **Synthesizing Particle-in-Cell Simulations Through Learning and GPU Computing for Hybrid Particle Accelerator Beamlines**.
-  Proc. of Platform for Advanced Scientific Computing (PASC'24), *submitted*, 2024.
-  `arXiv:2402.17248 <http://arxiv.org/abs/2402.17248>`__
+  Proc. of Platform for Advanced Scientific Computing (PASC'24), *PASC24 Best Paper Award*, 2024.
+  `DOI:10.1145/3659914.3659937 <https://doi.org/10.1145/3659914.3659937>`__
 
 - Sandberg R T, Lehe R, Mitchell C E, Garten M, Qiang J, Vay J-L and Huebl A.
   **Hybrid Beamline Element ML-Training for Surrogates in the ImpactX Beam-Dynamics Code**.

diff --git a/src/particles/distribution/Thermal.H b/src/particles/distribution/Thermal.H
@@ -420,7 +420,6 @@ namespace distribution
             pt = -pz * m_bg;
         }
 
-    private:
         amrex::ParticleReal m_k; //! linear focusing strength (1/meters)
         amrex::ParticleReal m_T1, m_T2; //! temperature of each particle population
         amrex::ParticleReal m_normalize, m_normalize_halo; //! normalization constant of first/second population
@@ -431,6 +430,7 @@ namespace distribution
         amrex::ParticleReal m_bg; ///< reference value of relativistic beta*gamma
         amrex::ParticleReal m_w;  ///< weight of the secondary (halo) population
 
+    private:
         // radial profile data
         amrex::ParticleReal const * m_cdf1 = nullptr; //! non-owning pointer to device core CDF
         amrex::ParticleReal const * m_cdf2 = nullptr; //! non-owning pointer to device halo CDF

diff --git a/src/particles/distribution/Waterbag.H b/src/particles/distribution/Waterbag.H
@@ -151,9 +151,9 @@ namespace impactx::distribution
             pt = a2;
         }
 
-        amrex::ParticleReal m_lambdaX,m_lambdaY,m_lambdaT;  //! related position axis intercepts (length) of the phase space ellipse
-        amrex::ParticleReal m_lambdaPx,m_lambdaPy,m_lambdaPt;  //! related momentum axis intercepts of the phase space ellipse
-        amrex::ParticleReal m_muxpx,m_muypy,m_mutpt;  //! correlation length-momentum
+        amrex::ParticleReal m_lambdaX, m_lambdaY, m_lambdaT;  //! related position axis intercepts (length) of the phase space ellipse
+        amrex::ParticleReal m_lambdaPx, m_lambdaPy, m_lambdaPt;  //! related momentum axis intercepts of the phase space ellipse
+        amrex::ParticleReal m_muxpx, m_muypy, m_mutpt;  //! correlation length-momentum
     };
 
 } // namespace impactx::distribution