From da0a1f4917ec3cd7e481ce225780980a021180e8 Mon Sep 17 00:00:00 2001 From: David Grote Date: Thu, 14 May 2020 16:00:36 -0700 Subject: Implemented new particle diagnostics in picmi (#984) * Implemented new particle diagnostics in picmi * Cleaned up picmi adding new particle diagnostics * In PICMI examples, use name option for diagnostics * For travis, update ubuntu version to bionic --- Python/pywarpx/WarpX.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Python/pywarpx/WarpX.py') diff --git a/Python/pywarpx/WarpX.py b/Python/pywarpx/WarpX.py index edcf0524b..12afc4e15 100644 --- a/Python/pywarpx/WarpX.py +++ b/Python/pywarpx/WarpX.py @@ -15,7 +15,7 @@ from .Interpolation import interpolation from .Lasers import lasers, lasers_list from . import Particles from .Particles import particles, particles_list -from .Diagnostics import diagnostics, diagnostics_list +from .Diagnostics import diagnostics class WarpX(Bucket): @@ -54,9 +54,13 @@ class WarpX(Bucket): for laser in lasers_list: argv += laser.attrlist() + diagnostics.diags_names = diagnostics._diagnostics_dict.keys() argv += diagnostics.attrlist() - for diagnostic in diagnostics_list: + for diagnostic in diagnostics._diagnostics_dict.values(): + diagnostic.species = diagnostic._species_dict.keys() argv += diagnostic.attrlist() + for species_diagnostic in diagnostic._species_dict.values(): + argv += species_diagnostic.attrlist() return argv -- cgit v1.2.3