Merge branch 'dev' of https://github.com/ECP-WarpX/WarpX into doNotDepositCurrent

1 files changed, 4 insertions, 2 deletions

diff --git a/Source/Utils/WarpXAlgorithmSelection.cpp b/Source/Utils/WarpXAlgorithmSelection.cpp
index 8a6ff6dbf..4b66a0809 100644
--- a/Source/Utils/WarpXAlgorithmSelection.cpp
+++ b/Source/Utils/WarpXAlgorithmSelection.cpp
@@ -18,6 +18,7 @@ const std::map<std::string, int> maxwell_solver_algo_to_int = {
 const std::map<std::string, int> particle_pusher_algo_to_int = {
     {"boris",   ParticlePusherAlgo::Boris },
     {"vay",     ParticlePusherAlgo::Vay },
+    {"higuera",     ParticlePusherAlgo::HigueraCary },
     {"default", ParticlePusherAlgo::Boris }
 };
 
@@ -33,8 +34,9 @@ const std::map<std::string, int> charge_deposition_algo_to_int = {
 };
 
 const std::map<std::string, int> gathering_algo_to_int = {
-    {"standard",   GatheringAlgo::Standard },
-    {"default",    GatheringAlgo::Standard }
+    {"energy-conserving",   GatheringAlgo::EnergyConserving },
+    {"momentum-conserving", GatheringAlgo::MomentumConserving },
+    {"default",             GatheringAlgo::EnergyConserving }
 };