Skip to content

Commit 09a1041

Browse files
committed
Pylint fixes
1 parent 05dc99a commit 09a1041

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

PyMPDATA/solver.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def __init__(self):
5656

5757
def call(
5858
self, traversals_data, flux, g_factor, step, iteration
59-
): # pylint: disable=unused-argument
59+
): # pylint: disable=unused-argument,disable=too-many-arguments
6060
"""think of it as a `__call__` method (which Numba does not allow)"""
6161

6262

@@ -81,11 +81,10 @@ def __init__(
8181
n_dims = advector.n_dims
8282
if isinstance(advectee, ScalarField):
8383
self.__fields = {"advectee": (advectee,)}
84-
# self.advectee = advectee
8584

8685
elif isinstance(advectee, Mapping):
8786
self.__fields = {"advectee": tuple(advectee.values())}
88-
# advectee = tuple(advectee.values())
87+
8988
elif isinstance(advectee, Iterable):
9089
self.__fields = {"advectee": tuple(advectee)}
9190

scenarios_mpi/_scenario.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class _Scenario: # pylint: disable=too-few-public-methods
99
# pylint: disable=too-many-arguments
1010
def __init__(self, *, mpi_dim, solver=None):
1111
self.mpi_dim = mpi_dim
12-
self.solvers = {"psi": solver}
12+
self.solver = solver
1313

1414
def advance(self, dataset, output_steps, mpi_range):
1515
"""Logic for performing simulation. Returns wall time of one timestep (in clock ticks)"""
@@ -21,20 +21,19 @@ def advance(self, dataset, output_steps, mpi_range):
2121
wall_time_per_timestep = self._solver_advance(n_steps=n_steps)
2222
wall_time += wall_time_per_timestep * n_steps
2323
steps_done += n_steps
24-
for key in self.solvers.advectee:
25-
data = self[key]
24+
data = self.solver.advectee.get()
2625
dataset[
2726
(
2827
mpi_range if self.mpi_dim == OUTER else slice(None),
2928
mpi_range if self.mpi_dim == INNER else slice(None),
3029
slice(index, index + 1),
3130
)
3231
] = data.reshape((data.shape[0], data.shape[1], 1))
33-
break # TODO #510: add logic to seperatly read multp. advectees
32+
# TODO #510: add logic to seperatly read multp. advectees
3433
return wall_time
3534

3635
def _solver_advance(self, n_steps):
37-
return self.solvers["psi"].advance(n_steps=n_steps)
36+
return self.solver.advance(n_steps=n_steps)
3837

3938
def __getitem__(self, _):
40-
return self.solvers["psi"].advectee.get()
39+
return self.solver.advectee.get()

scenarios_mpi/shallow_water.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
from PyMPDATA import ScalarField, Solver, Stepper, VectorField
1111
from PyMPDATA.boundary_conditions import Periodic
1212
from PyMPDATA.impl.domain_decomposition import make_subdomain
13-
from PyMPDATA.impl.enumerations import INNER, MAX_DIM_NUM, OUTER
14-
from PyMPDATA.impl.formulae_divide import make_divide_or_zero
13+
from PyMPDATA.impl.enumerations import INNER, OUTER
1514
from scenarios_mpi._scenario import _Scenario
1615

1716
subdomain = make_subdomain(jit_flags={})
@@ -42,7 +41,6 @@ def initial_condition(x, y, lx, ly):
4241

4342
# pylint: disable=invalid-name
4443
self.halo = mpdata_options.n_halo
45-
n_threads = n_threads
4644

4745
xyi = mpi_indices(grid=grid, rank=rank, size=size, mpi_dim=mpi_dim)
4846
nx, ny = xyi[mpi_dim].shape

0 commit comments

Comments
 (0)