Skip to content

Fix mypy warnings for DiffusionConfig #1086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msimberg merged 2 commits into from
Mar 2, 2026
Merged

Fix mypy warnings for DiffusionConfig #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c26ebf3
Fix typing issue in DiffusionConfig
msimberg Mar 2, 2026
b4b7de9
Rename HETEROGENOUS to HETEROGENEOUS
msimberg Mar 2, 2026
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
8 changes: 4 additions & 4 deletions model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class TemperatureDiscretizationType(int, enum.Enum):
"""

HOMOGENEOUS = 1 #: K Lap(T)
HETEROGENOUS = 2 #: Div (K Grad(T))
HETEROGENEOUS = 2 #: Div (K Grad(T))


class TurbulenceShearForcingType(int, enum.Enum):
Expand Down Expand Up @@ -136,7 +136,7 @@ class TurbulenceShearForcingType(int, enum.Enum):
SmagorinskyStencilType.DIAMOND_VERTICES, SmagorinskyStencilType.CELLS_AND_VERTICES
]
ValidTemperatureDiscretizationType = Literal[
TemperatureDiscretizationType.HOMOGENEOUS, TemperatureDiscretizationType.HETEROGENOUS
TemperatureDiscretizationType.HOMOGENEOUS, TemperatureDiscretizationType.HETEROGENEOUS
]
ValidTurbulenceShearForcingType = Literal[
TurbulenceShearForcingType.VERTICAL_OF_HORIZONTAL_WIND,
Expand Down Expand Up @@ -167,7 +167,7 @@ def __init__(
hdiff_smag_w: bool = False,
type_vn_diffu: ValidSmagorinskyStencilType = SmagorinskyStencilType.DIAMOND_VERTICES,
smag_3d: bool = False,
type_t_diffu: ValidTemperatureDiscretizationType = TemperatureDiscretizationType.HETEROGENOUS,
type_t_diffu: ValidTemperatureDiscretizationType = TemperatureDiscretizationType.HETEROGENEOUS,
hdiff_efdt_ratio: float = 36.0,
hdiff_w_efdt_ratio: float = 15.0,
smagorinski_scaling_factor: float = 0.015,
Expand Down Expand Up @@ -309,7 +309,7 @@ def _validate(self):
"Only type_vn_diffu 1 = `Smagorinsky diffusion with diamond stencil on vertices` is implemented"
)

if self.type_t_diffu != TemperatureDiscretizationType.HETEROGENOUS:
if self.type_t_diffu != TemperatureDiscretizationType.HETEROGENEOUS:
raise NotImplementedError(
"Only type_t_diffu 2 = `Smagorinsky diffusion with heterogeneous discretization` is implemented"
)
Expand Down
4 changes: 2 additions & 2 deletions model/standalone_driver/src/icon4py/model/standalone_driver/standalone_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,8 @@ def _read_config(
hdiff_vn=True,
hdiff_temp=False,
n_substeps=5,
type_t_diffu=2,
type_vn_diffu=1,
type_t_diffu=diffusion.TemperatureDiscretizationType.HETEROGENEOUS,
type_vn_diffu=diffusion.SmagorinskyStencilType.DIAMOND_VERTICES,
hdiff_efdt_ratio=10.0,
hdiff_w_efdt_ratio=15.0,
smagorinski_scaling_factor=0.025,
Expand Down
4 changes: 2 additions & 2 deletions model/testing/src/icon4py/model/testing/definitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def construct_diffusion_config(
diffusion_type=diffusion.DiffusionType.SMAGORINSKY_4TH_ORDER,
hdiff_w=True,
hdiff_vn=True,
type_t_diffu=diffusion.TemperatureDiscretizationType.HETEROGENOUS,
type_t_diffu=diffusion.TemperatureDiscretizationType.HETEROGENEOUS,
type_vn_diffu=diffusion.SmagorinskyStencilType.DIAMOND_VERTICES,
hdiff_efdt_ratio=24.0,
hdiff_w_efdt_ratio=15.0,
Expand All @@ -260,7 +260,7 @@ def construct_diffusion_config(
hdiff_w=True,
hdiff_vn=True,
zdiffu_t=False,
type_t_diffu=diffusion.TemperatureDiscretizationType.HETEROGENOUS,
type_t_diffu=diffusion.TemperatureDiscretizationType.HETEROGENEOUS,
type_vn_diffu=diffusion.SmagorinskyStencilType.DIAMOND_VERTICES,
hdiff_efdt_ratio=24.0,
smagorinski_scaling_factor=0.025,
Expand Down