Merge branch 'Hi-PACE:development' into laser_ion_momentum_2

Hi-PACE · Feb 12, 2025 · a314292 · a314292
2 parents ff4dc77 + 4680512
commit a314292
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 3 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -8,6 +8,7 @@
 sphinx>=5.3
 sphinx-copybutton
 sphinx_rtd_theme>=1.1.1
+sphinxcontrib-googleanalytics
 recommonmark
 # docutils 0.17 breaks HTML tags & RTD theme
 # https://github.com/sphinx-doc/sphinx/issues/9001

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -37,8 +37,13 @@
 extensions = [
     "breathe",
     "sphinx_copybutton",
+    "sphinxcontrib.googleanalytics",
 ]
 
+# Google Analytics
+googleanalytics_id = "G-Z1D5ZZDNC6"
+googleanalytics_enabled = True
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 

diff --git a/docs/source/run/parameters.rst b/docs/source/run/parameters.rst
@@ -519,6 +519,9 @@ When both are specified, the per-species value is used.
     the domain. However, this will also result in a gap at the domain boundary,
     which can lead to noise.
 
+* ``<plasma name> or plasmas.do_push`` (`bool`) optional (default `1`)
+    When set to `0`, disables the particle pusher.
+
 Beam parameters
 ---------------
 

diff --git a/src/particles/beam/BeamParticleContainer.cpp b/src/particles/beam/BeamParticleContainer.cpp
@@ -401,6 +401,10 @@ BeamParticleContainer::initializeSlice (int slice, int which_slice) {
             }
         );
     }
+
+    // remove invalid particles so they don't show up in the beam diagnostic of the first time step
+    amrex::removeInvalidParticles(getBeamSlice(which_slice));
+    resize(which_slice, getBeamSlice(which_slice).size(), 0);
 }
 
 void

diff --git a/src/particles/beam/BeamParticleContainerInit.cpp b/src/particles/beam/BeamParticleContainerInit.cpp
@@ -102,7 +102,7 @@ namespace
         ptd.rdata(BeamIdx::ux )[ip] = uxp;
         ptd.rdata(BeamIdx::uy )[ip] = uyp;
         ptd.rdata(BeamIdx::uz )[ip] = uz * speed_of_light;
-        ptd.rdata(BeamIdx::w  )[ip] = std::abs(weight);
+        ptd.rdata(BeamIdx::w  )[ip] = is_valid ? std::abs(weight) : amrex::Real{0};
 
         ptd.idata(BeamIdx::nsubcycles)[ip] = 0;
         ptd.idata(BeamIdx::mr_level)[ip] = 0;

diff --git a/src/particles/plasma/MultiPlasma.cpp b/src/particles/plasma/MultiPlasma.cpp
@@ -100,7 +100,9 @@ MultiPlasma::AdvanceParticles (
     int const current_N_level)
 {
     for (int i=0; i<m_nplasmas; i++) {
-        AdvancePlasmaParticles(m_all_plasmas[i], fields, gm, temp_slice, lev, current_N_level);
+        if (m_all_plasmas[i].m_do_push){
+            AdvancePlasmaParticles(m_all_plasmas[i], fields, gm, temp_slice, lev, current_N_level);
+        }
     }
 }
 

diff --git a/src/particles/plasma/PlasmaParticleContainer.H b/src/particles/plasma/PlasmaParticleContainer.H
@@ -195,6 +195,7 @@ public:
     amrex::Real m_mass = 0; /**< mass of each particle of this species */
     amrex::Real m_charge = 0; /**< charge of each particle of this species, per Ion level */
     int m_n_subcycles = 1; /**< number of subcycles in the plasma particle push */
+    bool m_do_push = true; /**< whether the plasma pusher is enabled */
 
     // ionization:
 

diff --git a/src/particles/plasma/PlasmaParticleContainer.cpp b/src/particles/plasma/PlasmaParticleContainer.cpp
@@ -173,6 +173,7 @@ PlasmaParticleContainer::ReadParameters ()
         "Both 'fine_ppc' and 'fine_patch(x,y)' must be specified "
         "to use the fine plasma patch feature");
     queryWithParserAlt(pp, "prevent_centered_particle", m_prevent_centered_particle, pp_alt);
+    queryWithParser(pp, "do_push", m_do_push);
 }
 
 void

diff --git a/src/salame/Salame.cpp b/src/salame/Salame.cpp
@@ -428,7 +428,6 @@ SalameMultiplyBeamWeight (const amrex::Real W, Hipace* hipace)
                 // invalidate particles with a weight of zero
                 if (W == 0) {
                     id.make_invalid();
-                    return;
                 }
 
                 // Multiply SALAME beam particles on this slice with W
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             );
         }
+        // remove invalid particles so they don't show up in the beam diagnostic of the first time step
+        amrex::removeInvalidParticles(getBeamSlice(which_slice));
+        resize(which_slice, getBeamSlice(which_slice).size(), 0);
     }
     void
@@ Expand Down @@