@@ -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 ()
0 commit comments