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.

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

Solve nonhydro backend edits #567

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from gt4py.next.ffront.decorator import field_operator, program

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import wpfloat


Expand All @@ -28,7 +27,7 @@ def _accumulate_prep_adv_fields(
return vn_traj_wp, mass_flx_me_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def accumulate_prep_adv_fields(
z_vn_avg: fa.EdgeKField[wpfloat],
mass_fl_e: fa.EdgeKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import astype

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -31,7 +30,7 @@ def _add_analysis_increments_from_data_assimilation(
return z_rho_expl_wp, z_exner_expl_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def add_analysis_increments_from_data_assimilation(
z_rho_expl: fa.CellKField[wpfloat],
z_exner_expl: fa.CellKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import astype

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -28,7 +27,7 @@ def _add_analysis_increments_to_vn(
return vn_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def add_analysis_increments_to_vn(
vn_incr: fa.EdgeKField[vpfloat],
vn: fa.EdgeKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
E2CDim,
Koff,
)
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand Down Expand Up @@ -88,7 +87,7 @@ def _add_extra_diffusion_for_normal_wind_tendency_approaching_cfl(
return astype(ddt_vn_apc_wp, vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def add_extra_diffusion_for_normal_wind_tendency_approaching_cfl(
levelmask: gtx.Field[gtx.Dims[dims.KDim], bool],
c_lin_e: gtx.Field[gtx.Dims[dims.EdgeDim, E2CDim], wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import C2E2CO, C2E2CODim
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand Down Expand Up @@ -61,7 +60,7 @@ def _add_extra_diffusion_for_w_con_approaching_cfl(
return astype(ddt_w_adv_wp, vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def add_extra_diffusion_for_w_con_approaching_cfl(
levmask: gtx.Field[gtx.Dims[dims.KDim], bool],
cfl_clipping: fa.CellKField[bool],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import astype

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -36,7 +35,7 @@ def _add_temporal_tendencies_to_vn(
return vn_nnew_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def add_temporal_tendencies_to_vn(
vn_nnow: fa.EdgeKField[wpfloat],
ddt_vn_apc_ntl1: fa.EdgeKField[vpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import astype

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand Down Expand Up @@ -42,7 +41,7 @@ def _add_temporal_tendencies_to_vn_by_interpolating_between_time_levels(
return vn_nnew_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def add_temporal_tendencies_to_vn_by_interpolating_between_time_levels(
vn_nnow: fa.EdgeKField[wpfloat],
ddt_vn_apc_ntl1: fa.EdgeKField[vpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from icon4py.model.common import field_type_aliases as fa
from icon4py.model.common.dimension import E2C, EdgeDim, KDim
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -37,7 +36,7 @@ def _add_vertical_wind_derivative_to_divergence_damping(
return astype(z_graddiv_vn_wp, vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def add_vertical_wind_derivative_to_divergence_damping(
hmask_dd3d: fa.EdgeField[wpfloat],
scalfac_dd3d: fa.KField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import astype

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -28,7 +27,7 @@ def _apply_2nd_order_divergence_damping(
return vn_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def apply_2nd_order_divergence_damping(
z_graddiv_vn: fa.EdgeKField[vpfloat],
vn: fa.EdgeKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from icon4py.model.common import field_type_aliases as fa
from icon4py.model.common.dimension import EdgeDim, KDim
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -29,7 +28,7 @@ def _apply_4th_order_divergence_damping(
return vn_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def apply_4th_order_divergence_damping(
scal_divdamp: fa.KField[wpfloat],
z_graddiv2_vn: fa.EdgeKField[vpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import where

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat


Expand All @@ -27,7 +26,7 @@ def _apply_hydrostatic_correction_to_horizontal_gradient_of_exner_pressure(
return z_gradh_exner_vp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def apply_hydrostatic_correction_to_horizontal_gradient_of_exner_pressure(
ipeidx_dsl: fa.EdgeKField[bool],
pg_exdist: fa.EdgeKField[vpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import broadcast

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import wpfloat


Expand All @@ -27,7 +26,7 @@ def _apply_rayleigh_damping_mechanism(
return w_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def apply_rayleigh_damping_mechanism(
z_raylfac: fa.KField[wpfloat],
w_1: fa.CellField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import astype, broadcast

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -32,7 +31,7 @@ def _apply_weighted_2nd_and_4th_order_divergence_damping(
return vn_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def apply_weighted_2nd_and_4th_order_divergence_damping(
scal_divdamp: fa.KField[wpfloat],
bdy_divdamp: fa.KField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
E2VDim,
Koff,
)
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand Down Expand Up @@ -57,7 +56,7 @@ def _compute_advective_normal_wind_tendency(
return astype(ddt_vn_apc_wp, vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_advective_normal_wind_tendency(
z_kin_hor_e: fa.EdgeKField[vpfloat],
coeff_gradekin: gtx.Field[gtx.Dims[dims.ECDim], vpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import Koff
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat


Expand All @@ -30,7 +29,7 @@ def _compute_approx_of_2nd_vertical_derivative_of_exner(
return z_dexner_dz_c_2_vp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_approx_of_2nd_vertical_derivative_of_exner(
z_theta_v_pr_ic: fa.CellKField[vpfloat],
d2dexdz2_fac1_mc: fa.CellKField[vpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import E2C2EO, E2C2EODim
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import wpfloat


Expand All @@ -26,7 +25,7 @@ def _compute_avg_vn(
return z_vn_avg_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_avg_vn(
e_flx_avg: gtx.Field[gtx.Dims[dims.EdgeDim, E2C2EODim], wpfloat],
vn: fa.EdgeKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from icon4py.model.atmosphere.dycore.compute_tangential_wind import _compute_tangential_wind
from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import E2C2EO, E2C2EODim
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -36,7 +35,7 @@ def _compute_avg_vn_and_graddiv_vn_and_vt(
return z_vn_avg_wp, z_graddiv_vn_vp, vt_vp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_avg_vn_and_graddiv_vn_and_vt(
e_flx_avg: gtx.Field[gtx.Dims[dims.EdgeDim, dims.E2C2EODim], wpfloat],
vn: fa.EdgeKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import C2CE, C2E, C2EDim
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -28,7 +27,7 @@ def _compute_divergence_of_fluxes_of_rho_and_theta(
return astype((z_flxdiv_mass_wp, z_flxdiv_theta_wp), vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_divergence_of_fluxes_of_rho_and_theta(
geofac_div: gtx.Field[gtx.Dims[dims.CEDim], wpfloat],
mass_fl_e: fa.EdgeKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import Koff
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -31,7 +30,7 @@ def _compute_dwdz_for_divergence_damping(
return astype(z_dwdz_dd_wp, vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_dwdz_for_divergence_damping(
inv_ddqz_z_full: fa.CellKField[vpfloat],
w: fa.CellKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from gt4py.next.ffront.fbuiltins import exp, log

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import wpfloat


Expand All @@ -29,7 +28,7 @@ def _compute_exner_from_rhotheta(
return theta_v_wp, exner_wp


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_exner_from_rhotheta(
rho: fa.CellKField[wpfloat],
theta_v: fa.CellKField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import E2C2EO, E2C2EODim
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -28,7 +27,7 @@ def _compute_graddiv2_of_vn(
return astype(z_graddiv2_vn_wp, vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_graddiv2_of_vn(
geofac_grdiv: gtx.Field[gtx.Dims[dims.EdgeDim, E2C2EODim], wpfloat],
z_graddiv_vn: fa.EdgeKField[vpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import E2C, E2V
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -37,7 +36,7 @@ def _compute_horizontal_advection_term_for_vertical_velocity(
return astype(z_v_grad_w_wp, vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_horizontal_advection_term_for_vertical_velocity(
vn_ie: fa.EdgeKField[vpfloat],
inv_dual_edge_length: fa.EdgeField[wpfloat],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from icon4py.model.common import dimension as dims, field_type_aliases as fa
from icon4py.model.common.dimension import E2C
from icon4py.model.common.settings import backend
from icon4py.model.common.type_alias import vpfloat, wpfloat


Expand All @@ -28,7 +27,7 @@ def _compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates(
return astype(z_gradh_exner_wp, vpfloat)


@program(grid_type=GridType.UNSTRUCTURED, backend=backend)
@program(grid_type=GridType.UNSTRUCTURED)
def compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates(
inv_dual_edge_length: fa.EdgeField[wpfloat],
z_exner_ex_pr: fa.CellKField[vpfloat],
Expand Down
Loading
Loading