diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-05-08 11:18:45 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-05-08 11:18:45 -0700 |
| commit | 24eadeb23e2a02335472da22ad6f21f8169080f0 (patch) | |
| tree | 6b96aacc7ad96cb8b95fdffc93a61ae43e9c749c /Python | |
| parent | bd5b41b8178a720ef77eb5155adfac658b3f94d8 (diff) | |
| parent | c6335ccaf604b1713449a500eb56559d7c678d7c (diff) | |
| download | WarpX-24eadeb23e2a02335472da22ad6f21f8169080f0.tar.gz WarpX-24eadeb23e2a02335472da22ad6f21f8169080f0.tar.zst WarpX-24eadeb23e2a02335472da22ad6f21f8169080f0.zip | |
fix merge conflicts with dev
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pywarpx/picmi.py | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Python/pywarpx/picmi.py b/Python/pywarpx/picmi.py index a5d9fba87..a439205a7 100644 --- a/Python/pywarpx/picmi.py +++ b/Python/pywarpx/picmi.py @@ -113,6 +113,9 @@ class GaussianBunchDistribution(picmistandard.PICMI_GaussianBunchDistribution): species.uy = self.centroid_velocity[1] species.uz = self.centroid_velocity[2] + if self.fill_in: + species.do_continuous_injection = 1 + class UniformDistribution(picmistandard.PICMI_UniformDistribution): def initialize_inputs(self, species_number, layout, species): @@ -153,14 +156,6 @@ class UniformDistribution(picmistandard.PICMI_UniformDistribution): species.uy = self.directed_velocity[1] species.uz = self.directed_velocity[2] - if self.fill_in: - pywarpx.warpx.do_plasma_injection = 1 - if not hasattr(pywarpx.warpx, 'injected_plasma_species'): - pywarpx.warpx.injected_plasma_species = [] - - pywarpx.warpx.injected_plasma_species.append(species_number) - pywarpx.warpx.num_injected_species = len(pywarpx.warpx.injected_plasma_species) - class AnalyticDistribution(picmistandard.PICMI_AnalyticDistribution): def initialize_inputs(self, species_number, layout, species): @@ -205,12 +200,7 @@ class AnalyticDistribution(picmistandard.PICMI_AnalyticDistribution): species.uz = self.directed_velocity[2] if self.fill_in: - pywarpx.warpx.do_plasma_injection = 1 - if not hasattr(pywarpx.warpx, 'injected_plasma_species'): - pywarpx.warpx.injected_plasma_species = [] - - pywarpx.warpx.injected_plasma_species.append(species_number) - pywarpx.warpx.num_injected_species = len(pywarpx.warpx.injected_plasma_species) + species.do_continuous_injection = 1 class ParticleListDistribution(picmistandard.PICMI_ParticleListDistribution): |