Merge branch 'qed_bw_qs_factory_class' into qed_evolve_optical_depth

2 files changed, 5 insertions, 4 deletions

diff --git a/Source/Utils/WarpXAlgorithmSelection.H b/Source/Utils/WarpXAlgorithmSelection.H
index 269171a5f..7d26e7af5 100644
--- a/Source/Utils/WarpXAlgorithmSelection.H
+++ b/Source/Utils/WarpXAlgorithmSelection.H
@@ -34,9 +34,9 @@ struct ChargeDepositionAlgo {
 };
 
 struct GatheringAlgo {
-    // Only the Standard algorithm is implemented
     enum {
-         Standard = 0
+         EnergyConserving = 0,
+         MomentumConserving
     };
 };
 
diff --git a/Source/Utils/WarpXAlgorithmSelection.cpp b/Source/Utils/WarpXAlgorithmSelection.cpp
index be9cdd118..4b66a0809 100644
--- a/Source/Utils/WarpXAlgorithmSelection.cpp
+++ b/Source/Utils/WarpXAlgorithmSelection.cpp
@@ -34,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 }
 };