Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ndsl/grid/generation.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,9 @@ def __init__(
self._ak,
self._bk,
) = self._set_hybrid_pressure_coefficients(
eta_file, ak, bk # type: ignore
eta_file, # type: ignore
ak,
bk,
)
else:
self._ks = 0
Expand Down Expand Up @@ -555,6 +557,7 @@ def lon(self):
extent=self.grid.extent[:2],
units=self.grid.units,
gt4py_backend=self.grid.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@property
Expand All @@ -566,6 +569,7 @@ def lat(self) -> Quantity:
extent=self.grid.extent[:2],
units=self.grid.units,
gt4py_backend=self.grid.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@property
Expand All @@ -577,6 +581,7 @@ def lon_agrid(self) -> Quantity:
extent=self.agrid.extent[:2],
units=self.agrid.units,
gt4py_backend=self.agrid.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@property
Expand All @@ -588,6 +593,7 @@ def lat_agrid(self) -> Quantity:
extent=self.agrid.extent[:2],
units=self.agrid.units,
gt4py_backend=self.agrid.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@property
Expand Down Expand Up @@ -1551,6 +1557,7 @@ def rarea(self) -> Quantity:
extent=self.area.extent,
units="m^-2",
gt4py_backend=self.area.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@functools.cached_property
Expand All @@ -1565,6 +1572,7 @@ def rarea_c(self) -> Quantity:
extent=self.area_c.extent,
units="m^-2",
gt4py_backend=self.area_c.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@functools.cached_property
Expand All @@ -1580,6 +1588,7 @@ def rdx(self) -> Quantity:
extent=self.dx.extent,
units="m^-1",
gt4py_backend=self.dx.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@functools.cached_property
Expand All @@ -1595,6 +1604,7 @@ def rdy(self) -> Quantity:
extent=self.dy.extent,
units="m^-1",
gt4py_backend=self.dy.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@functools.cached_property
Expand All @@ -1610,6 +1620,7 @@ def rdxa(self) -> Quantity:
extent=self.dxa.extent,
units="m^-1",
gt4py_backend=self.dxa.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@functools.cached_property
Expand All @@ -1625,6 +1636,7 @@ def rdya(self) -> Quantity:
extent=self.dya.extent,
units="m^-1",
gt4py_backend=self.dya.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@functools.cached_property
Expand All @@ -1640,6 +1652,7 @@ def rdxc(self) -> Quantity:
extent=self.dxc.extent,
units="m^-1",
gt4py_backend=self.dxc.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

@functools.cached_property
Expand All @@ -1655,6 +1668,7 @@ def rdyc(self) -> Quantity:
extent=self.dyc.extent,
units="m^-1",
gt4py_backend=self.dyc.gt4py_backend,
number_of_halo_points=N_HALO_DEFAULT,
)

def _init_cartesian(self):
Expand Down
13 changes: 9 additions & 4 deletions ndsl/grid/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ def p_interface(self) -> Quantity:
dims=[Z_INTERFACE_DIM],
units="Pa",
gt4py_backend=self.ak.gt4py_backend,
number_of_halo_points=self.ak.metadata.n_halo,
)
return self._p_interface

Expand All @@ -203,6 +204,7 @@ def p(self) -> Quantity:
dims=[Z_DIM],
units="Pa",
gt4py_backend=self.p_interface.gt4py_backend,
number_of_halo_points=self.p_interface.metadata.n_halo,
)
return self._p

Expand All @@ -219,6 +221,7 @@ def dp(self) -> Quantity:
dims=[Z_DIM],
units="Pa",
gt4py_backend=self.ak.gt4py_backend,
number_of_halo_points=self.ak.metadata.n_halo,
)
return self._dp_ref

Expand Down Expand Up @@ -380,6 +383,7 @@ def _fC_from_data(data, lat: Quantity) -> Quantity:
origin=lat.origin,
extent=lat.extent,
gt4py_backend=lat.gt4py_backend,
number_of_halo_points=lat.metadata.n_halo,
)

@staticmethod
Expand Down Expand Up @@ -802,16 +806,16 @@ def new_from_grid_variables(
)


def split_quantity_along_last_dim(quantity):
def split_quantity_along_last_dim(quantity: Quantity) -> list[Quantity]:
"""Split a quantity along the last dimension into a list of quantities.

Args:
quantity: Quantity to split.
quantity (Quantity): Quantity to split.

Returns:
List of quantities.
list[Quantity]: List of quantities.
"""
return_list = []
return_list: list[Quantity] = []
for i in range(quantity.data.shape[-1]):
return_list.append(
Quantity(
Expand All @@ -821,6 +825,7 @@ def split_quantity_along_last_dim(quantity):
origin=quantity.origin[:-1],
extent=quantity.extent[:-1],
gt4py_backend=quantity.gt4py_backend,
number_of_halo_points=quantity.metadata.n_halo,
)
)
return return_list