From 8afe1d1f266ac1e112bf20c4c9899be1ad3d89dd Mon Sep 17 00:00:00 2001 From: Jan Petykiewicz Date: Fri, 16 Oct 2020 19:32:53 -0700 Subject: [PATCH] style fixes per flake8 --- .flake8 | 29 +++++++++++++++++++++++++++++ opencl_fdtd/simulation.py | 29 +++++++++++++---------------- 2 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 .flake8 diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000..0042015 --- /dev/null +++ b/.flake8 @@ -0,0 +1,29 @@ +[flake8] +ignore = + # E501 line too long + E501, + # W391 newlines at EOF + W391, + # E241 multiple spaces after comma + E241, + # E302 expected 2 newlines + E302, + # W503 line break before binary operator (to be deprecated) + W503, + # E265 block comment should start with '# ' + E265, + # E123 closing bracket does not match indentation of opening bracket's line + E123, + # E124 closing bracket does not match visual indentation + E124, + # E221 multiple spaces before operator + E221, + # E201 whitespace after '[' + E201, + # E741 ambiguous variable name 'I' + E741, + + +per-file-ignores = + # F401 import without use + */__init__.py: F401, diff --git a/opencl_fdtd/simulation.py b/opencl_fdtd/simulation.py index 5f52e35..70db2a9 100644 --- a/opencl_fdtd/simulation.py +++ b/opencl_fdtd/simulation.py @@ -85,7 +85,7 @@ class Simulation(object): queue: pyopencl.CommandQueue = None, float_type: numpy.float32 or numpy.float64 = numpy.float32, do_poynting: bool = True, - do_poynting_halves = False, + do_poynting_halves: bool = False, do_fieldsrc: bool = False): """ Initialize the simulation. @@ -179,7 +179,7 @@ class Simulation(object): base_fields[ptr('E')] = self.E base_fields[ptr('H')] = self.H base_fields[ctype + ' dt'] = self.dt - if uniform_dx == False: + if uniform_dx is False: inv_dx_names = ['inv_d' + eh + r for eh in 'eh' for r in 'xyz'] for name, field in zip(inv_dx_names, self.inv_dxes): base_fields[ptr(name)] = field @@ -199,17 +199,17 @@ class Simulation(object): bloch_fields[ptr('G')] = self.H common_source = jinja_env.get_template('common.cl').render( - ftype=ctype, - shape=self.shape, - ) + ftype=ctype, + shape=self.shape, + ) jinja_args = { - 'common_header': common_source, - 'pmls': pmls, - 'do_poynting': do_poynting, - 'do_poynting_halves': do_poynting_halves, - 'bloch': bloch_boundaries, - 'uniform_dx': uniform_dx, - } + 'common_header': common_source, + 'pmls': pmls, + 'do_poynting': do_poynting, + 'do_poynting_halves': do_poynting_halves, + 'bloch': bloch_boundaries, + 'uniform_dx': uniform_dx, + } E_source = jinja_env.get_template('update_e.cl').render(**jinja_args) H_source = jinja_env.get_template('update_h.cl').render(**jinja_args) self.sources['E'] = E_source @@ -227,7 +227,6 @@ class Simulation(object): self.sources['F'] = F_source self.sources['G'] = G_source - S_fields = OrderedDict() if do_poynting: self.S = pyopencl.array.zeros_like(self.E) @@ -238,7 +237,6 @@ class Simulation(object): S_fields[ptr('S0')] = self.S0 S_fields[ptr('S1')] = self.S1 - J_fields = OrderedDict() if do_fieldsrc: J_source = jinja_env.get_template('update_j.cl').render(**jinja_args) @@ -249,7 +247,6 @@ class Simulation(object): J_fields[ptr('Jr')] = self.Jr J_fields[ptr('Ji')] = self.Ji - ''' PML ''' @@ -273,9 +270,9 @@ class Simulation(object): arguments=', '.join(list(args.keys()) + var_args)) self.update_J = lambda e, *a: update(*args.values(), *a, wait_for=e) - def _create_pmls(self, pmls): ctype = type_to_C(self.arg_type) + def ptr(arg: str) -> str: return ctype + ' *' + arg