From 7ed026c5c9f8dd4f7bfd68068831fadc88028ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Bj=C3=B8rndal?= Date: Fri, 20 May 2016 19:15:54 +0200 Subject: [PATCH] converted a few print() calls to command() calls. Should be identical in behavior. --- gprMax/input_cmd_funcs.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gprMax/input_cmd_funcs.py b/gprMax/input_cmd_funcs.py index 727d910d..4f702aef 100644 --- a/gprMax/input_cmd_funcs.py +++ b/gprMax/input_cmd_funcs.py @@ -59,12 +59,16 @@ def command(cmd, *parameters): try: s = '#{}: {}'.format(cmd, " ".join(parameters)) except TypeError as e: + # append info about cmd and parameters to the exception: if not e.args: e.args=('', ) - e.args = e.args + ("Creating cmd = #%s with parameters %s failed" % (cmd, parameters),) + additional_info = "Creating cmd = #{} with parameters {} failed".format(cmd, parameters) + e.args = e.args + (additional_info,) raise e + # and now we can print it: print(s) return s + def domain(x, y, z): """Prints the gprMax #domain command. @@ -76,8 +80,8 @@ def domain(x, y, z): """ domain = Coordinate(x, y, z) - print('#domain: {}'.format(domain)) - + command('domain', domain) + return domain @@ -92,7 +96,7 @@ def dx_dy_dz(x, y, z): """ dx_dy_dz = Coordinate(x, y, z) - print('#dx_dy_dz: {}'.format(dx_dy_dz)) + command('dx_dy_dz', dx_dy_dz) return dx_dy_dz @@ -106,8 +110,8 @@ def time_window(time_window): Returns: time_window (float): Duration of simulation. """ - - print('#time_window: {:g}'.format(time_window)) + + command('time_window', time_window) return time_window