diff options
| author |  Edoardo Zoni <59625522+EZoni@users.noreply.github.com>
| 2020-10-05 13:35:07 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-10-05 13:35:07 -0700 |
| commit | 77e2679ec93ae050258eb00abe5c152a518b66b7 (patch) | |
| tree | 20dc84254980a8e832ae8aa3de603be566a0a99d /Python | |
| parent | 0f580b87513490b346201449e40f056c5aaf35c7 (diff) | |
| download | WarpX-77e2679ec93ae050258eb00abe5c152a518b66b7.tar.gz WarpX-77e2679ec93ae050258eb00abe5c152a518b66b7.tar.zst WarpX-77e2679ec93ae050258eb00abe5c152a518b66b7.zip | |
PICMI: read flag for laser continuous injection (#1358)
* PICMI: read flag for laser continuous injection
* Simplify assignment of do_continuous_injection
* Update PICMI version
Co-authored-by: Remi Lehe <remi.lehe@normalesup.org>
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pywarpx/picmi.py | 4 | ||||
| -rw-r--r-- | Python/setup.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Python/pywarpx/picmi.py b/Python/pywarpx/picmi.py index 077a644b3..d23d97606 100644 --- a/Python/pywarpx/picmi.py +++ b/Python/pywarpx/picmi.py @@ -542,6 +542,7 @@ class GaussianLaser(picmistandard.PICMI_GaussianLaser): self.laser.beta = self.beta self.laser.phi2 = self.phi2 + self.laser.do_continuous_injection = self.fill_in class AnalyticLaser(picmistandard.PICMI_AnalyticLaser): def initialize_inputs(self): @@ -557,10 +558,11 @@ class AnalyticLaser(picmistandard.PICMI_AnalyticLaser): self.laser.polarization = self.polarization_direction # The main polarization vector self.laser.__setattr__('field_function(X,Y,t)', self.field_expression) + self.laser.do_continuous_injection = self.fill_in + for k,v in self.user_defined_kw.items(): setattr(pywarpx.my_constants, k, v) - class LaserAntenna(picmistandard.PICMI_LaserAntenna): def initialize_inputs(self, laser): laser.laser.position = self.position # This point is on the laser plane diff --git a/Python/setup.py b/Python/setup.py index b75443f9c..2999ce911 100644 --- a/Python/setup.py +++ b/Python/setup.py @@ -33,6 +33,6 @@ setup (name = 'pywarpx', package_dir = {'pywarpx':'pywarpx'}, description = """Wrapper of WarpX""", package_data = package_data, - install_requires=['numpy', 'picmistandard==0.0.11', 'periodictable'], + install_requires=['numpy', 'picmistandard==0.0.12', 'periodictable'], python_requires = '>=3.6' ) |