edits following review

C2SM · Dec 6, 2024 · 2c18429 · 2c18429
1 parent d73e4f4
commit 2c18429
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/model/common/src/icon4py/model/common/grid/base.py b/model/common/src/icon4py/model/common/grid/base.py
@@ -114,12 +114,7 @@ def offset_providers(self):
 
     @utils.chainable
     def with_connectivities(self, connectivity: Dict[gtx.Dimension, field_alloc.NDArray]):
-        self.connectivities.update(
-            {
-                d: k.ndarray.astype(gtx.int32) if hasattr(k, "ndarray") else k.astype(gtx.int32)
-                for d, k in connectivity.items()
-            }
-        )
+        self.connectivities.update({d: k.astype(gtx.int32) for d, k in connectivity.items()})
         self.size.update({d: t.shape[1] for d, t in connectivity.items()})
 
     @utils.chainable

diff --git a/model/common/src/icon4py/model/common/grid/icon.py b/model/common/src/icon4py/model/common/grid/icon.py
@@ -13,10 +13,10 @@
 from typing import Final
 
 import gt4py.next as gtx
+import numpy as np
 
 from icon4py.model.common import constants, dimension as dims, utils
 from icon4py.model.common.grid import base, horizontal as h_grid
-from icon4py.model.common.utils import gt4py_field_allocation as field_alloc
 
 
 log = logging.getLogger(__name__)
@@ -129,20 +129,12 @@ def __eq__(self, other: "IconGrid"):
     def with_start_end_indices(
         self,
         dim: gtx.Dimension,
-        start_indices: field_alloc.NDArray,
-        end_indices: field_alloc.NDArray,
+        start_indices: np.ndarray,
+        end_indices: np.ndarray,
     ):
         log.debug(f"Using start_indices {dim} {start_indices}, end_indices {dim} {end_indices}")
-        self._start_indices[dim] = (
-            start_indices.ndarray.astype(gtx.int32)
-            if hasattr(start_indices, "ndarray")
-            else start_indices.astype(gtx.int32)
-        )
-        self._end_indices[dim] = (
-            end_indices.ndarray.astype(gtx.int32)
-            if hasattr(end_indices, "ndarray")
-            else end_indices.astype(gtx.int32)
-        )
+        self._start_indices[dim] = start_indices.astype(gtx.int32)
+        self._end_indices[dim] = end_indices.astype(gtx.int32)
 
     @utils.chainable
     def with_global_params(self, global_params: GlobalGridParams):