Miura Weno scheme

model/atmosphere/advection/pyproject.toml

@@ -28,6 +28,7 @@ dependencies = [
   "icon4py-common~=0.2.0",
   # external dependencies
   "gt4py==1.1.11",
+  "numpy>=1.23.3",
   'packaging>=20.0'
 ]
 description = "ICON advection."

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

@@ -58,6 +58,10 @@ class HorizontalAdvectionType(Enum):
     NO_ADVECTION = 0
     #: 2nd order MIURA with linear reconstruction
     LINEAR_2ND_ORDER = 2
+    #: 2nd order MIURA with linear reconstruction and WENO candidate blending
+    LINEAR_2ND_ORDER_WENO = 102
+    #: 3rd order MIURA with quadratic reconstruction and WENO candidate blending
+    QUADRATIC_3RD_ORDER_WENO = 103
 
 
 class HorizontalAdvectionLimiter(Enum):
@@ -428,6 +432,8 @@ def convert_config_to_horizontal_vertical_advection(  # noqa: PLR0912 [too-many-
     cell_params: grid_states.CellParams,
     backend: gtx_typing.Backend | None,
     exchange: decomposition.ExchangeRuntime,
+    weno_linear_state: advection_states.AdvectionWenoLinearState | None = None,
+    weno_quadratic_state: advection_states.AdvectionWenoQuadraticState | None = None,
 ) -> tuple[advection_horizontal.HorizontalAdvection, advection_vertical.VerticalAdvection]:
     assert exchange is not None, "Exchange runtime must not be None."
     horizontal_limiter: advection_horizontal.HorizontalFluxLimiter | None
@@ -449,9 +455,51 @@ def convert_config_to_horizontal_vertical_advection(  # noqa: PLR0912 [too-many-
         case HorizontalAdvectionType.NO_ADVECTION:
             horizontal_advection = advection_horizontal.NoAdvection(grid=grid, backend=backend)
         case HorizontalAdvectionType.LINEAR_2ND_ORDER:
-            tracer_flux = advection_horizontal.SecondOrderMiura(
+            tracer_flux: advection_horizontal.SemiLagrangianTracerFlux = (
+                advection_horizontal.SecondOrderMiura(
+                    grid=grid,
+                    least_squares_state=least_squares_state,
+                    horizontal_limiter=horizontal_limiter,
+                    backend=backend,
+                )
+            )
+            horizontal_advection = advection_horizontal.SemiLagrangian(
+                tracer_flux=tracer_flux,
+                grid=grid,
+                interpolation_state=interpolation_state,
+                metric_state=metric_state,
+                edge_params=edge_params,
+                cell_params=cell_params,
+                backend=backend,
+            )
+        case HorizontalAdvectionType.LINEAR_2ND_ORDER_WENO:
+            if weno_linear_state is None:
+                raise ValueError(
+                    "Horizontal advection type 'LINEAR_2ND_ORDER_WENO' requires 'weno_linear_state'."
+                )
+            tracer_flux = advection_horizontal.SecondOrderMiuraWeno(
+                grid=grid,
+                weno_linear_state=weno_linear_state,
+                horizontal_limiter=horizontal_limiter,
+                backend=backend,
+            )
+            horizontal_advection = advection_horizontal.SemiLagrangian(
+                tracer_flux=tracer_flux,
+                grid=grid,
+                interpolation_state=interpolation_state,
+                metric_state=metric_state,
+                edge_params=edge_params,
+                cell_params=cell_params,
+                backend=backend,
+            )
+        case HorizontalAdvectionType.QUADRATIC_3RD_ORDER_WENO:
+            if weno_quadratic_state is None:
+                raise ValueError(
+                    "Horizontal advection type 'QUADRATIC_3RD_ORDER_WENO' requires 'weno_quadratic_state'."
+                )
+            tracer_flux = advection_horizontal.ThirdOrderMiuraWeno(
                 grid=grid,
-                least_squares_state=least_squares_state,
+                weno_quadratic_state=weno_quadratic_state,
                 horizontal_limiter=horizontal_limiter,
                 backend=backend,
             )
@@ -515,6 +563,8 @@ def convert_config_to_advection(
     backend: gtx_typing.Backend | None,
     exchange: decomposition.ExchangeRuntime,
     even_timestep: bool = False,
+    weno_linear_state: advection_states.AdvectionWenoLinearState | None = None,
+    weno_quadratic_state: advection_states.AdvectionWenoQuadraticState | None = None,
 ) -> Advection:
     if (
         config.horizontal_advection_type == HorizontalAdvectionType.NO_ADVECTION
@@ -533,6 +583,8 @@ def convert_config_to_advection(
         cell_params=cell_params,
         backend=backend,
         exchange=exchange,
+        weno_linear_state=weno_linear_state,
+        weno_quadratic_state=weno_quadratic_state,
     )
 
     advection = GodunovSplittingAdvection(