Move space charge envelope files.

BLAST-ImpactX · Feb 18, 2025 · eee70e9 · eee70e9
1 parent 0df5bc4
commit eee70e9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -12,6 +12,7 @@ add_subdirectory(diagnostics)
 add_subdirectory(elements)
 add_subdirectory(initialization)
 add_subdirectory(particles)
+add_subdirectory(envelope)
 add_subdirectory(tracking)
 
 

diff --git a/src/elements/Aperture.H b/src/elements/Aperture.H
@@ -12,7 +12,6 @@
 
 
 #include "particles/ImpactXParticleContainer.H"
-#include "particles/CovarianceMatrix.H"
 #include "mixin/alignment.H"
 #include "mixin/beamoptic.H"
 #include "mixin/thin.H"

diff --git a/src/envelope/CMakeLists.txt b/src/envelope/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(lib
+  PRIVATE
+)
+
+add_subdirectory(spacecharge)
diff --git a/src/envelope/spacecharge/CMakeLists.txt b/src/envelope/spacecharge/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(lib
+  PRIVATE
+    EnvelopeSpaceChargePush.cpp
+)
diff --git a/...les/spacecharge/EnvelopeSpaceChargePush.H → ...ope/spacecharge/EnvelopeSpaceChargePush.H b/...les/spacecharge/EnvelopeSpaceChargePush.H → ...ope/spacecharge/EnvelopeSpaceChargePush.H
diff --git a/...s/spacecharge/EnvelopeSpaceChargePush.cpp → ...e/spacecharge/EnvelopeSpaceChargePush.cpp b/...s/spacecharge/EnvelopeSpaceChargePush.cpp → ...e/spacecharge/EnvelopeSpaceChargePush.cpp
diff --git a/src/particles/spacecharge/CMakeLists.txt b/src/particles/spacecharge/CMakeLists.txt
@@ -4,5 +4,4 @@ target_sources(lib
     GatherAndPush.cpp
     HandleSpacecharge.cpp
     PoissonSolve.cpp
-    EnvelopeSpaceChargePush.cpp
 )
diff --git a/src/tracking/envelope.cpp b/src/tracking/envelope.cpp
@@ -11,7 +11,7 @@
 #include "initialization/InitAmrCore.H"
 #include "particles/ImpactXParticleContainer.H"
 #include "particles/Push.H"
-#include "particles/spacecharge/EnvelopeSpaceChargePush.H"
+#include "envelope/spacecharge/EnvelopeSpaceChargePush.H"
 #include "diagnostics/DiagnosticOutput.H"
 
 #include <AMReX.H>