diff --git a/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion.py b/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion.py index ad3a919de5..720d3af2aa 100644 --- a/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion.py +++ b/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion.py @@ -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): @@ -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, @@ -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, @@ -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" ) diff --git a/model/standalone_driver/src/icon4py/model/standalone_driver/standalone_driver.py b/model/standalone_driver/src/icon4py/model/standalone_driver/standalone_driver.py index da7474f905..85e3dcd26d 100644 --- a/model/standalone_driver/src/icon4py/model/standalone_driver/standalone_driver.py +++ b/model/standalone_driver/src/icon4py/model/standalone_driver/standalone_driver.py @@ -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, diff --git a/model/testing/src/icon4py/model/testing/definitions.py b/model/testing/src/icon4py/model/testing/definitions.py index 3f43a826f6..a6a011b9dd 100644 --- a/model/testing/src/icon4py/model/testing/definitions.py +++ b/model/testing/src/icon4py/model/testing/definitions.py @@ -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, @@ -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,