From dc5187e78685eceb265107400326744238024dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Bj=C3=B8rndal?= Date: Fri, 3 Jun 2016 15:13:54 +0200 Subject: [PATCH] fixing SyntaxError in input_cmd_funcs.py, the unpacking was unnecesary anyway --- gprMax/input_cmd_funcs.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gprMax/input_cmd_funcs.py b/gprMax/input_cmd_funcs.py index 7010bc93..2186221d 100644 --- a/gprMax/input_cmd_funcs.py +++ b/gprMax/input_cmd_funcs.py @@ -142,7 +142,7 @@ def geometry_view(xs, ys, zs, xf, yf, zf, dx, dy, dz, filename, type='n'): s = Coordinate(xs, ys, zs) f = Coordinate(xf, yf, zf) d = Coordinate(dx, dy, dz) - command('geometry_view', *s, *f, *d, filename, type) + command('geometry_view', s, f, d, filename, type) return s, f, d @@ -167,7 +167,7 @@ def snapshot(xs, ys, zs, xf, yf, zf, dx, dy, dz, time, filename): else: time = '{:d}'.format(int(time)) - command('snapshot', *s, *f, *d, time, filename) + command('snapshot', s, f, d, time, filename) return s, f, d @@ -183,7 +183,7 @@ def edge(xs, ys, zs, xf, yf, zf, material): """ s = Coordinate(xs, ys, zs) f = Coordinate(xf, yf, zf) - command('edge', *s, *f, material) + command('edge', s, f, material) return s, f @@ -199,7 +199,7 @@ def plate(xs, ys, zs, xf, yf, zf, material): """ s = Coordinate(xs, ys, zs) f = Coordinate(xf, yf, zf) - command('plate', *s, *f, material) + command('plate', s, f, material) return s, f @@ -217,7 +217,7 @@ def triangle(x1, y1, z1, x2, y2, z2, x3, y3, z3, thickness, material): v1 = Coordinate(x1, y1, z1) v2 = Coordinate(x2, y2, z2) v3 = Coordinate(x3, y3, z3) - command('triangle', *v1, *v2, *v3, thickness, material) + command('triangle', v1, v2, v3, thickness, material) return v1, v2, v3 @@ -235,7 +235,7 @@ def box(xs, ys, zs, xf, yf, zf, material, averaging=''): """ s = Coordinate(xs, ys, zs) f = Coordinate(xf, yf, zf) - command('box', *s, *f, material, averaging) + command('box', s, f, material, averaging) return s, f @@ -253,7 +253,7 @@ def sphere(x, y, z, radius, material, averaging=''): c (tuple): namedtuple Coordinate for the center of the sphere """ c = Coordinate(x, y, z) - command('sphere', *c, radius, material, averaging) + command('sphere', c, radius, material, averaging) return c @@ -272,7 +272,7 @@ def cylinder(x1, y1, z1, x2, y2, z2, radius, material, averaging=''): """ c1 = Coordinate(x1, y1, z1) c2 = Coordinate(x2, y2, z2) - command('cylinder', *c1, *c2, radius, material, averaging) + command('cylinder', c1, c2, radius, material, averaging) return c1, c2