Skip to content
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

Fix usage of as_offset #542

Merged
merged 5 commits into from
Sep 12, 2024
+39 −42
Merged

Fix usage of as_offset #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d2c0eb
Fix _compute_hydrostatic_correction_term
tehrengruber Sep 11, 2024
ac78f35
Fix _compute_horizontal_gradient_of_exner_pressure_for_multiple_levels
edopao Sep 11, 2024
a043495
Fix code format
edopao Sep 11, 2024
82c07c6
fix as_offset in truly_horizontal_diffusion_nabla_of_theta_over_steep…
halungge Sep 12, 2024
5398658
pre-commit
halungge Sep 12, 2024
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
27 changes: 9 additions & 18 deletions ...osphere/diffusion/stencils/truly_horizontal_diffusion_nabla_of_theta_over_steep_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,22 @@ def _truly_horizontal_diffusion_nabla_of_theta_over_steep_points(
) -> fa.CellKField[vpfloat]:
z_temp_wp = astype(z_temp, wpfloat)

theta_v_0 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[0])))
theta_v_1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[1])))
theta_v_2 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[2])))
theta_v_0 = theta_v(C2E2C[0])(as_offset(Koff, zd_vertoffset(C2CEC[0])))
theta_v_1 = theta_v(C2E2C[1])(as_offset(Koff, zd_vertoffset(C2CEC[1])))
theta_v_2 = theta_v(C2E2C[2])(as_offset(Koff, zd_vertoffset(C2CEC[2])))

theta_v_0_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[0]) + 1))
theta_v_1_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[1]) + 1))
theta_v_2_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[2]) + 1))
theta_v_0_m1 = theta_v(C2E2C[0])(as_offset(Koff, zd_vertoffset(C2CEC[0]) + 1))
theta_v_1_m1 = theta_v(C2E2C[1])(as_offset(Koff, zd_vertoffset(C2CEC[1]) + 1))
theta_v_2_m1 = theta_v(C2E2C[2])(as_offset(Koff, zd_vertoffset(C2CEC[2]) + 1))

sum_tmp = (
theta_v * geofac_n2s_c
+ geofac_n2s_nbh(C2CEC[0])
* (
vcoef(C2CEC[0]) * theta_v_0(C2E2C[0])
+ (wpfloat("1.0") - vcoef(C2CEC[0])) * theta_v_0_m1(C2E2C[0])
)
* (vcoef(C2CEC[0]) * theta_v_0 + (wpfloat("1.0") - vcoef(C2CEC[0])) * theta_v_0_m1)
+ geofac_n2s_nbh(C2CEC[1])
* (
vcoef(C2CEC[1]) * theta_v_1(C2E2C[1])
+ (wpfloat("1.0") - vcoef(C2CEC[1])) * theta_v_1_m1(C2E2C[1])
)
* (vcoef(C2CEC[1]) * theta_v_1 + (wpfloat("1.0") - vcoef(C2CEC[1])) * theta_v_1_m1)
+ geofac_n2s_nbh(C2CEC[2])
* (
vcoef(C2CEC[2]) * theta_v_2(C2E2C[2])
+ (wpfloat("1.0") - vcoef(C2CEC[2])) * theta_v_2_m1(C2E2C[2])
)
* (vcoef(C2CEC[2]) * theta_v_2 + (wpfloat("1.0") - vcoef(C2CEC[2])) * theta_v_2_m1)
)

z_temp_wp = where(
Expand Down
20 changes: 10 additions & 10 deletions ...el/atmosphere/dycore/compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,26 @@ def _compute_horizontal_gradient_of_exner_pressure_for_multiple_levels(
z_dexner_dz_c_2: fa.CellKField[vpfloat],
) -> fa.EdgeKField[vpfloat]:
"""Formerly known as _mo_solve_nonhydro_stencil_20."""
z_exner_ex_pr_0 = z_exner_ex_pr(as_offset(Koff, ikoffset(E2EC[0])))
z_exner_ex_pr_1 = z_exner_ex_pr(as_offset(Koff, ikoffset(E2EC[1])))
z_exner_ex_pr_0 = z_exner_ex_pr(E2C[0])(as_offset(Koff, ikoffset(E2EC[0])))
z_exner_ex_pr_1 = z_exner_ex_pr(E2C[1])(as_offset(Koff, ikoffset(E2EC[1])))

z_dexner_dz_c1_0 = z_dexner_dz_c_1(as_offset(Koff, ikoffset(E2EC[0])))
z_dexner_dz_c1_1 = z_dexner_dz_c_1(as_offset(Koff, ikoffset(E2EC[1])))
z_dexner_dz_c1_0 = z_dexner_dz_c_1(E2C[0])(as_offset(Koff, ikoffset(E2EC[0])))
z_dexner_dz_c1_1 = z_dexner_dz_c_1(E2C[1])(as_offset(Koff, ikoffset(E2EC[1])))

z_dexner_dz_c2_0 = z_dexner_dz_c_2(as_offset(Koff, ikoffset(E2EC[0])))
z_dexner_dz_c2_1 = z_dexner_dz_c_2(as_offset(Koff, ikoffset(E2EC[1])))
z_dexner_dz_c2_0 = z_dexner_dz_c_2(E2C[0])(as_offset(Koff, ikoffset(E2EC[0])))
z_dexner_dz_c2_1 = z_dexner_dz_c_2(E2C[1])(as_offset(Koff, ikoffset(E2EC[1])))

z_gradh_exner_wp = inv_dual_edge_length * (
astype(
(
z_exner_ex_pr_1(E2C[1])
z_exner_ex_pr_1
+ zdiff_gradp(E2EC[1])
* (z_dexner_dz_c1_1(E2C[1]) + zdiff_gradp(E2EC[1]) * z_dexner_dz_c2_1(E2C[1]))
* (z_dexner_dz_c1_1 + zdiff_gradp(E2EC[1]) * z_dexner_dz_c2_1)
)
- (
z_exner_ex_pr_0(E2C[0])
z_exner_ex_pr_0
+ zdiff_gradp(E2EC[0])
* (z_dexner_dz_c1_0(E2C[0]) + zdiff_gradp(E2EC[0]) * z_dexner_dz_c2_0(E2C[0]))
* (z_dexner_dz_c1_0 + zdiff_gradp(E2EC[0]) * z_dexner_dz_c2_0)
),
wpfloat,
)
Expand Down
34 changes: 20 additions & 14 deletions ...osphere/dycore/src/icon4py/model/atmosphere/dycore/compute_hydrostatic_correction_term.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,30 @@ def _compute_hydrostatic_correction_term(
"""Formerly known as _mo_solve_nonhydro_stencil_21."""
zdiff_gradp_wp = astype(zdiff_gradp, wpfloat)

theta_v_0 = theta_v(as_offset(Koff, ikoffset(E2EC[0])))
theta_v_1 = theta_v(as_offset(Koff, ikoffset(E2EC[1])))
theta_v_0 = theta_v(E2C[0])(as_offset(Koff, ikoffset(E2EC[0])))
theta_v_1 = theta_v(E2C[1])(as_offset(Koff, ikoffset(E2EC[1])))

theta_v_ic_0 = theta_v_ic(as_offset(Koff, ikoffset(E2EC[0])))
theta_v_ic_1 = theta_v_ic(as_offset(Koff, ikoffset(E2EC[1])))
theta_v_ic_0 = theta_v_ic(E2C[0])(as_offset(Koff, ikoffset(E2EC[0])))
theta_v_ic_1 = theta_v_ic(E2C[1])(as_offset(Koff, ikoffset(E2EC[1])))

theta_v_ic_p1_0 = theta_v_ic(as_offset(Koff, ikoffset(E2EC[0]) + 1))
theta_v_ic_p1_1 = theta_v_ic(as_offset(Koff, ikoffset(E2EC[1]) + 1))
theta_v_ic_p1_0 = theta_v_ic(E2C[0])(as_offset(Koff, ikoffset(E2EC[0]) + 1))
theta_v_ic_p1_1 = theta_v_ic(E2C[1])(as_offset(Koff, ikoffset(E2EC[1]) + 1))

inv_ddqz_z_full_0_wp = astype(inv_ddqz_z_full(as_offset(Koff, ikoffset(E2EC[0]))), wpfloat)
inv_ddqz_z_full_1_wp = astype(inv_ddqz_z_full(as_offset(Koff, ikoffset(E2EC[1]))), wpfloat)
inv_ddqz_z_full_0_wp = astype(
inv_ddqz_z_full(E2C[0])(as_offset(Koff, ikoffset(E2EC[0]))), wpfloat
)
inv_ddqz_z_full_1_wp = astype(
inv_ddqz_z_full(E2C[1])(as_offset(Koff, ikoffset(E2EC[1]))), wpfloat
)

z_theta_0 = theta_v_0(E2C[0]) + zdiff_gradp_wp(E2EC[0]) * (
theta_v_ic_0(E2C[0]) - theta_v_ic_p1_0(E2C[0])
) * inv_ddqz_z_full_0_wp(E2C[0])
z_theta_1 = theta_v_1(E2C[1]) + zdiff_gradp_wp(E2EC[1]) * (
theta_v_ic_1(E2C[1]) - theta_v_ic_p1_1(E2C[1])
) * inv_ddqz_z_full_1_wp(E2C[1])
z_theta_0 = (
theta_v_0
+ zdiff_gradp_wp(E2EC[0]) * (theta_v_ic_0 - theta_v_ic_p1_0) * inv_ddqz_z_full_0_wp
)
z_theta_1 = (
theta_v_1
+ zdiff_gradp_wp(E2EC[1]) * (theta_v_ic_1 - theta_v_ic_p1_1) * inv_ddqz_z_full_1_wp
)
z_hydro_corr_wp = (
grav_o_cpd
* inv_dual_edge_length
Expand Down
Loading