Merge pull request #125 from ECP-WarpX/inject_laser_refac

consistent continuous injection for PhysicalParticle and LaserParticle

1 files changed, 27 insertions, 1 deletions

diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index a74a8bb2e..9810a168f 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -424,11 +424,37 @@ MultiParticleContainer
 void
 MultiParticleContainer::ContinuousInjection(Real dt, const RealBox& prob_domain) const
 {
-    for (int i=nspecies; i<nspecies+nlasers; i++){
+    for (int i=0; i<nspecies+nlasers; i++){
         auto& pc = allcontainers[i];
+        Print()<<"i "<<i<<" pc->do_continuous_injection "<<pc->do_continuous_injection<<std::endl;
         if (pc->do_continuous_injection)
         {
+            Print()<<"i "<<i<<" pc->do_continuous_injection "<<pc->do_continuous_injection<<std::endl;
             pc->ContinuousInjection(dt, prob_domain);
         }
     }
 }
+
+void
+MultiParticleContainer::UpdateContinuousInjectionPosition(Real dt) const
+{
+    for (int i=0; i<nspecies+nlasers; i++){
+        auto& pc = allcontainers[i];
+        Print()<<"i "<<i<<" pc->do_continuous_injection "<<pc->do_continuous_injection<<std::endl;
+        if (pc->do_continuous_injection)
+        {
+            Print()<<"i "<<i<<" pc->do_continuous_injection "<<pc->do_continuous_injection<<std::endl;
+            pc->UpdateContinuousInjectionPosition(dt);
+        }
+    }
+    /*
+    for (int i=nspecies; i<nspecies+nlasers; i++){
+        // WarpXParticleContainer& pc = allcontainers[i];
+        WarpXParticleContainer& pc = GetParticleContainer(i);
+        auto& lpc = dynamic_cast<LaserParticleContainer&>(pc);
+        // auto& pc = allcontainers[i];
+        // auto& lpc = dynamic_cast<LaserParticleContainer&>(pc);
+        lpc.UpdateContinuousInjectionPosition(dt);
+    }
+    */
+}