Add tracer advection to standalone driver [cycle 34]

model/atmosphere/advection/src/icon4py/model/atmosphere/advection/advection.py

@@ -27,7 +27,12 @@
     apply_interpolated_tracer_time_tendency,
 )
 from icon4py.model.atmosphere.advection.stencils.copy_cell_kdim_field import copy_cell_kdim_field
-from icon4py.model.common import dimension as dims, field_type_aliases as fa, type_alias as ta
+from icon4py.model.common import (
+    dimension as dims,
+    field_type_aliases as fa,
+    model_backends,
+    type_alias as ta,
+)
 from icon4py.model.common.decomposition import definitions as decomposition
 from icon4py.model.common.grid import horizontal as h_grid, icon as icon_grid
 from icon4py.model.common.model_options import setup_program
@@ -98,10 +103,10 @@ class AdvectionConfig:
     Contains necessary parameters to configure an advection run.
     """
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._validate()
 
-    def _validate(self):
+    def _validate(self) -> None:
         """Apply consistency checks and validation on configuration parameters."""
 
         if not hasattr(HorizontalAdvectionType, self.horizontal_advection_type.name):
@@ -140,7 +145,7 @@ def run(
         p_tracer_now: fa.CellKField[ta.wpfloat],
         p_tracer_new: fa.CellKField[ta.wpfloat],
         dtime: ta.wpfloat,
-    ):
+    ) -> None:
         """
         Run an advection step.
 
@@ -198,7 +203,7 @@ def run(
         p_tracer_now: fa.CellKField[ta.wpfloat],
         p_tracer_new: fa.CellKField[ta.wpfloat],
         dtime: ta.wpfloat,
-    ):
+    ) -> None:
         log.debug("advection run - start")
 
         log.debug("communication of prep_adv cell field: mass_flx_ic - start")
@@ -242,7 +247,10 @@ def __init__(
         # density fields
         #: intermediate density times cell thickness, includes either the horizontal or vertical advective density increment [kg/m^2]
         self._rhodz_ast2 = data_alloc.zero_field(
-            self._grid, dims.CellDim, dims.KDim, allocator=self._backend
+            self._grid,
+            dims.CellDim,
+            dims.KDim,
+            allocator=model_backends.get_allocator(self._backend),
         )
         self._determine_local_domains()
         # stencils
@@ -277,7 +285,7 @@ def __init__(
 
         log.debug("advection class init - end")
 
-    def _determine_local_domains(self):
+    def _determine_local_domains(self) -> None:
         # cell indices
         cell_domain = h_grid.domain(dims.CellDim)
         self._start_cell_lateral_boundary = self._grid.start_index(
@@ -301,7 +309,7 @@ def run(
         p_tracer_now: fa.CellKField[ta.wpfloat],
         p_tracer_new: fa.CellKField[ta.wpfloat],
         dtime: ta.wpfloat,
-    ):
+    ) -> None:
         log.debug("advection run - start")
 
         log.debug("communication of prep_adv cell field: mass_flx_ic - start")
@@ -410,9 +418,10 @@ def convert_config_to_horizontal_vertical_advection(  # noqa: PLR0912 [too-many-
 ) -> tuple[advection_horizontal.HorizontalAdvection, advection_vertical.VerticalAdvection]:
     exchange = exchange or decomposition.SingleNodeExchange()
     assert exchange is not None, "Exchange runtime must not be None."
+    horizontal_limiter: advection_horizontal.HorizontalFluxLimiter | None
     match config.horizontal_advection_limiter:
         case HorizontalAdvectionLimiter.NO_LIMITER:
-            horizontal_limiter = advection_horizontal.HorizontalFluxLimiter()
+            horizontal_limiter = advection_horizontal.NoLimiter()
         case HorizontalAdvectionLimiter.POSITIVE_DEFINITE:
             horizontal_limiter = advection_horizontal.PositiveDefinite(
                 grid=grid,
@@ -423,6 +432,7 @@ def convert_config_to_horizontal_vertical_advection(  # noqa: PLR0912 [too-many-
         case _:
             raise NotImplementedError("Unknown horizontal advection limiter.")
 
+    horizontal_advection: advection_horizontal.HorizontalAdvection
     match config.horizontal_advection_type:
         case HorizontalAdvectionType.NO_ADVECTION:
             horizontal_advection = advection_horizontal.NoAdvection(grid=grid, backend=backend)
@@ -446,6 +456,7 @@ def convert_config_to_horizontal_vertical_advection(  # noqa: PLR0912 [too-many-
         case _:
             raise NotImplementedError("Unknown horizontal advection type.")
 
+    vertical_limiter: advection_vertical.VerticalLimiter
     match config.vertical_advection_limiter:
         case VerticalAdvectionLimiter.NO_LIMITER:
             vertical_limiter = advection_vertical.NoLimiter(grid=grid, backend=backend)
@@ -454,6 +465,7 @@ def convert_config_to_horizontal_vertical_advection(  # noqa: PLR0912 [too-many-
         case _:
             raise NotImplementedError("Unknown vertical advection limiter.")
 
+    vertical_advection: advection_vertical.VerticalAdvection
     match config.vertical_advection_type:
         case VerticalAdvectionType.NO_ADVECTION:
             vertical_advection = advection_vertical.NoAdvection(grid=grid, backend=backend)