From 2c00044641882f35c70528b913a8d9efbb0a5336 Mon Sep 17 00:00:00 2001 From: Yinjian Zhao Date: Fri, 18 Nov 2022 10:54:54 -0700 Subject: Adding an if statement for the last step diagnostic (#3436) * modified * Include max_step and stop_time as input parameters * Add comments * update * update * Fix CI test: apply suggestion from @ax3l * Do not force consistency between `max_step` and `stop_time` Co-authored-by: Dave Grote Co-authored-by: Edoardo Zoni --- Python/pywarpx/WarpX.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Python/pywarpx/WarpX.py') diff --git a/Python/pywarpx/WarpX.py b/Python/pywarpx/WarpX.py index 517c74d42..76f66c6d2 100644 --- a/Python/pywarpx/WarpX.py +++ b/Python/pywarpx/WarpX.py @@ -30,8 +30,13 @@ class WarpX(Bucket): A Python wrapper for the WarpX C++ class """ - def create_argv_list(self): + def create_argv_list(self, **kw): argv = [] + + for k, v in kw.items(): + if v is not None: + argv.append(f'{k} = {v}') + argv += warpx.attrlist() argv += my_constants.attrlist() argv += amr.attrlist() @@ -86,8 +91,8 @@ class WarpX(Bucket): return argv - def init(self, mpi_comm=None): - argv = ['warpx'] + self.create_argv_list() + def init(self, mpi_comm=None, **kw): + argv = ['warpx'] + self.create_argv_list(**kw) libwarpx.initialize(argv, mpi_comm=mpi_comm) def evolve(self, nsteps=-1): @@ -103,10 +108,7 @@ class WarpX(Bucket): return libwarpx.libwarpx_so.warpx_getProbHi(direction) def write_inputs(self, filename='inputs', **kw): - argv = self.create_argv_list() - - for k, v in kw.items(): - argv.append(f'{k} = {v}') + argv = self.create_argv_list(**kw) # Sort the argv list to make it more human readable argv.sort() -- cgit v1.2.3