Split vertical and horizontal grid

model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro.py

@@ -629,11 +629,7 @@ def __init__(
         # TODO (magdalena) vertical nesting is only relevant in the context of
         #      horizontal nesting, since we don't support this we should remove this option
         self.l_vert_nested: bool = False
-        if grid.lvert_nest:
-            self.l_vert_nested = True
-            self.jk_start = 1
-        else:
-            self.jk_start = 0
+        self.jk_start = 0
 
         self._en_smag_fac_for_zero_nshift(
             self._vertical_params.interface_physical_height,

model/common/src/icon4py/model/common/grid/base.py

@@ -10,7 +10,7 @@
 import uuid
 import warnings
 from abc import ABC, abstractmethod
-from typing import Callable, Dict
+from typing import Callable, Dict, Protocol, runtime_checkable
 
 import gt4py.next as gtx
 import numpy as np
@@ -24,6 +24,13 @@ class MissingConnectivity(ValueError):
     pass
 
 
+@runtime_checkable
+class VerticalSize(Protocol):
+    @property
+    def num_levels(self) -> int:
+        ...
+
+
 @dataclasses.dataclass(frozen=True)
 class HorizontalGridSize:
     num_vertices: int
@@ -39,7 +46,6 @@ class GridConfig:
     limited_area: bool = True
     n_shift_total: int = 0
     length_rescale_factor: float = 1.0
-    lvertnest: bool = False
     on_gpu: bool = False
 
     @property
@@ -91,11 +97,6 @@ def num_vertices(self) -> int:
     def num_edges(self) -> int:
         pass
 
-    @property
-    @abstractmethod
-    def num_levels(self) -> int:
-        pass
-
     @abstractmethod
     def _has_skip_values(self, dimension: gtx.Dimension) -> bool:
         pass

model/common/src/icon4py/model/common/grid/simple.py

@@ -12,7 +12,7 @@
 import numpy as np
 
 from icon4py.model.common import dimension as dims
-from icon4py.model.common.grid.base import BaseGrid, GridConfig, HorizontalGridSize
+from icon4py.model.common.grid import base
 
 # periodic
 #
@@ -377,10 +377,11 @@ class SimpleGridData:
     )
 
 
-class SimpleGrid(BaseGrid):
+class SimpleGrid(base.BaseGrid, base.VerticalSize):
     _CELLS = 18
     _EDGES = 27
     _VERTICES = 9
+    _NUM_LEVELS = 10
 
     def __init__(self):
         """Instantiate a SimpleGrid used for testing purposes."""
@@ -435,23 +436,23 @@ def __init__(self):
 
     @property
     def num_cells(self) -> int:
-        return self.config.num_cells
+        return self._CELLS
 
     @property
     def num_vertices(self) -> int:
-        return self.config.num_vertices
+        return self._VERTICES
 
     @property
     def num_edges(self) -> int:
-        return self.config.num_edges
+        return self._EDGES
 
     @property
     def diamond_table(self) -> np.ndarray:
         return SimpleGridData.e2c2v_table
 
     @property
     def num_levels(self) -> int:
-        return self.config.num_levels
+        return self._NUM_LEVELS
 
     @property
     def id(self) -> uuid.UUID:
@@ -461,11 +462,11 @@ def _has_skip_values(self, dimension: gtx.Dimension) -> bool:
         return False
 
     def _configure(self):
-        horizontal_grid_size = HorizontalGridSize(
+        horizontal_grid_size = base.HorizontalGridSize(
             num_vertices=self._VERTICES, num_edges=self._EDGES, num_cells=self._CELLS
         )
         vertical_grid_config = VerticalGridConfig(num_levels=10)
-        config = GridConfig(
+        config = base.GridConfig(
             horizontal_config=horizontal_grid_size,
             vertical_size=vertical_grid_config.num_levels,
         )