2 files changed, 4 insertions, 22 deletions
diff --git a/Source/Utils/WarpXAlgorithmSelection.H b/Source/Utils/WarpXAlgorithmSelection.H
index 6a32513b7..54c721abf 100644
--- a/Source/Utils/WarpXAlgorithmSelection.H
+++ b/Source/Utils/WarpXAlgorithmSelection.H
@@ -5,8 +5,6 @@
 #include <string>
 
 struct MaxwellSolverAlgo {
-    // These numbers corresponds to the algorithm code in WarpX's
-    // `warpx_push_bvec` and `warpx_push_evec_f`
     enum {
         Yee = 0,
         CKC = 1
@@ -14,8 +12,6 @@ struct MaxwellSolverAlgo {
 };
 
 struct ParticlePusherAlgo {
-    // These numbers correspond to the algorithm code in WarpX's
-    // `warpx_particle_pusher`
     enum {
         Boris = 0,
         Vay = 1
@@ -24,12 +20,8 @@ struct ParticlePusherAlgo {
 
 struct CurrentDepositionAlgo {
     enum {
-        // These numbers corresponds to the algorithm code in PICSAR's
-        // `depose_jxjyjz_generic` and `depose_jxjyjz_generic_2d`
-         Direct = 3,
-         DirectVectorized = 2,
-         EsirkepovNonOptimized = 1,
-         Esirkepov = 0
+         Esirkepov = 0,
+         Direct = 1
     };
 };
 
@@ -41,11 +33,9 @@ struct ChargeDepositionAlgo {
 };
 
 struct GatheringAlgo {
-    // These numbers corresponds to the algorithm code in PICSAR's
-    // `geteb3d_energy_conserving_generic` function
+    // Only the Standard algorithm is implemented
     enum {
-         Vectorized = 0,
-         Standard = 1
+         Standard = 0
     };
 };
 
diff --git a/Source/Utils/WarpXAlgorithmSelection.cpp b/Source/Utils/WarpXAlgorithmSelection.cpp
index 842085a36..24e55a77f 100644
--- a/Source/Utils/WarpXAlgorithmSelection.cpp
+++ b/Source/Utils/WarpXAlgorithmSelection.cpp
@@ -23,9 +23,6 @@ const std::map<std::string, int> particle_pusher_algo_to_int = {
 const std::map<std::string, int> current_deposition_algo_to_int = {
     {"esirkepov",            CurrentDepositionAlgo::Esirkepov },
     {"direct",               CurrentDepositionAlgo::Direct },
-#if (!defined AMREX_USE_GPU)&&(AMREX_SPACEDIM == 3) // Only available on CPU and 3D
-    {"direct-vectorized",    CurrentDepositionAlgo::DirectVectorized },
-#endif
     {"default",              CurrentDepositionAlgo::Esirkepov }
 };
 
@@ -36,12 +33,7 @@ const std::map<std::string, int> charge_deposition_algo_to_int = {
 
 const std::map<std::string, int> gathering_algo_to_int = {
     {"standard",   GatheringAlgo::Standard },
-#ifndef AMREX_USE_GPU // Only available on CPU
-    {"vectorized", GatheringAlgo::Vectorized },
-    {"default",    GatheringAlgo::Vectorized }
-#else
     {"default",    GatheringAlgo::Standard }
-#endif
 };