merge main and correctly set on_gpu in pytest

C2SM · Nov 20, 2024 · d98b497 · d98b497
2 parents 9a21467 + bac96a5
commit d98b497
Show file tree

Hide file tree

Showing 202 changed files with 422 additions and 379 deletions.
diff --git a/...l/atmosphere/dycore/state_utils/states.py → .../model/atmosphere/dycore/dycore_states.py b/...l/atmosphere/dycore/state_utils/states.py → .../model/atmosphere/dycore/dycore_states.py
@@ -6,6 +6,7 @@
 # Please, refer to the LICENSE file in the root directory.
 # SPDX-License-Identifier: BSD-3-Clause
 import dataclasses
+from typing import Optional
 
 import gt4py.next as gtx
 
@@ -39,9 +40,9 @@ class DiagnosticStateNonHydro:
     ddt_w_adv_ntl2: fa.CellKField[float]
 
     # Analysis increments
-    rho_incr: fa.EdgeKField[float]  # moist density increment [kg/m^3]
-    vn_incr: fa.EdgeKField[float]  # normal velocity increment [m/s]
-    exner_incr: fa.EdgeKField[float]  # exner increment [- ]
+    rho_incr: Optional[fa.EdgeKField[float]]  # moist density increment [kg/m^3]
+    vn_incr: Optional[fa.EdgeKField[float]]  # normal velocity increment [m/s]
+    exner_incr: Optional[fa.EdgeKField[float]]  # exner increment [- ]
     exner_dyn_incr: fa.CellKField[float]  # exner pressure dynamics increment
 
     @property

diff --git a/...el/atmosphere/dycore/state_utils/utils.py → ...y/model/atmosphere/dycore/dycore_utils.py b/...el/atmosphere/dycore/state_utils/utils.py → ...y/model/atmosphere/dycore/dycore_utils.py
diff --git a/...osphere/dycore/nh_solve/solve_nonhydro.py → ...model/atmosphere/dycore/solve_nonhydro.py b/...osphere/dycore/nh_solve/solve_nonhydro.py → ...model/atmosphere/dycore/solve_nonhydro.py
diff --git a/...dycore/nh_solve/solve_nonhydro_program.py → ...osphere/dycore/solve_nonhydro_stencils.py b/...dycore/nh_solve/solve_nonhydro_program.py → ...osphere/dycore/solve_nonhydro_stencils.py
@@ -8,75 +8,75 @@
 import gt4py.next as gtx
 from gt4py.next.ffront.fbuiltins import where
 
-from icon4py.model.atmosphere.dycore.compute_contravariant_correction import (
+from icon4py.model.atmosphere.dycore.dycore_utils import (
+    _broadcast_zero_to_three_edge_kdim_fields_wp,
+)
+from icon4py.model.atmosphere.dycore.stencils.compute_contravariant_correction import (
     _compute_contravariant_correction,
 )
-from icon4py.model.atmosphere.dycore.compute_contravariant_correction_of_w import (
+from icon4py.model.atmosphere.dycore.stencils.compute_contravariant_correction_of_w import (
     _compute_contravariant_correction_of_w,
 )
-from icon4py.model.atmosphere.dycore.compute_contravariant_correction_of_w_for_lower_boundary import (
+from icon4py.model.atmosphere.dycore.stencils.compute_contravariant_correction_of_w_for_lower_boundary import (
     _compute_contravariant_correction_of_w_for_lower_boundary,
 )
-from icon4py.model.atmosphere.dycore.compute_explicit_part_for_rho_and_exner import (
+from icon4py.model.atmosphere.dycore.stencils.compute_explicit_part_for_rho_and_exner import (
     _compute_explicit_part_for_rho_and_exner,
 )
-from icon4py.model.atmosphere.dycore.compute_explicit_vertical_wind_from_advection_and_vertical_wind_density import (
+from icon4py.model.atmosphere.dycore.stencils.compute_explicit_vertical_wind_from_advection_and_vertical_wind_density import (
     _compute_explicit_vertical_wind_from_advection_and_vertical_wind_density,
 )
-from icon4py.model.atmosphere.dycore.compute_explicit_vertical_wind_speed_and_vertical_wind_times_density import (
+from icon4py.model.atmosphere.dycore.stencils.compute_explicit_vertical_wind_speed_and_vertical_wind_times_density import (
     _compute_explicit_vertical_wind_speed_and_vertical_wind_times_density,
 )
-from icon4py.model.atmosphere.dycore.compute_first_vertical_derivative import (
+from icon4py.model.atmosphere.dycore.stencils.compute_first_vertical_derivative import (
     _compute_first_vertical_derivative,
 )
-from icon4py.model.atmosphere.dycore.compute_horizontal_advection_of_rho_and_theta import (
+from icon4py.model.atmosphere.dycore.stencils.compute_horizontal_advection_of_rho_and_theta import (
     _compute_horizontal_advection_of_rho_and_theta,
 )
-from icon4py.model.atmosphere.dycore.compute_horizontal_kinetic_energy import (
+from icon4py.model.atmosphere.dycore.stencils.compute_horizontal_kinetic_energy import (
     _compute_horizontal_kinetic_energy,
 )
-from icon4py.model.atmosphere.dycore.compute_perturbation_of_rho_and_theta import (
+from icon4py.model.atmosphere.dycore.stencils.compute_perturbation_of_rho_and_theta import (
     _compute_perturbation_of_rho_and_theta,
 )
-from icon4py.model.atmosphere.dycore.compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers import (
+from icon4py.model.atmosphere.dycore.stencils.compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers import (
     _compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers,
 )
-from icon4py.model.atmosphere.dycore.compute_solver_coefficients_matrix import (
+from icon4py.model.atmosphere.dycore.stencils.compute_solver_coefficients_matrix import (
     _compute_solver_coefficients_matrix,
 )
-from icon4py.model.atmosphere.dycore.compute_virtual_potential_temperatures_and_pressure_gradient import (
+from icon4py.model.atmosphere.dycore.stencils.compute_virtual_potential_temperatures_and_pressure_gradient import (
     _compute_virtual_potential_temperatures_and_pressure_gradient,
 )
-from icon4py.model.atmosphere.dycore.extrapolate_at_top import _extrapolate_at_top
-from icon4py.model.atmosphere.dycore.extrapolate_temporally_exner_pressure import (
+from icon4py.model.atmosphere.dycore.stencils.extrapolate_at_top import _extrapolate_at_top
+from icon4py.model.atmosphere.dycore.stencils.extrapolate_temporally_exner_pressure import (
     _extrapolate_temporally_exner_pressure,
 )
-from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_vp import (
+from icon4py.model.atmosphere.dycore.stencils.init_cell_kdim_field_with_zero_vp import (
     _init_cell_kdim_field_with_zero_vp,
 )
-from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_wp import (
+from icon4py.model.atmosphere.dycore.stencils.init_cell_kdim_field_with_zero_wp import (
     _init_cell_kdim_field_with_zero_wp,
 )
-from icon4py.model.atmosphere.dycore.interpolate_to_half_levels_vp import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_to_half_levels_vp import (
     _interpolate_to_half_levels_vp,
 )
-from icon4py.model.atmosphere.dycore.interpolate_to_surface import _interpolate_to_surface
-from icon4py.model.atmosphere.dycore.interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_to_surface import _interpolate_to_surface
+from icon4py.model.atmosphere.dycore.stencils.interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges import (
     _interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges,
 )
-from icon4py.model.atmosphere.dycore.set_lower_boundary_condition_for_w_and_contravariant_correction import (
+from icon4py.model.atmosphere.dycore.stencils.set_lower_boundary_condition_for_w_and_contravariant_correction import (
     _set_lower_boundary_condition_for_w_and_contravariant_correction,
 )
-from icon4py.model.atmosphere.dycore.set_theta_v_prime_ic_at_lower_boundary import (
+from icon4py.model.atmosphere.dycore.stencils.set_theta_v_prime_ic_at_lower_boundary import (
     _set_theta_v_prime_ic_at_lower_boundary,
 )
-from icon4py.model.atmosphere.dycore.state_utils.utils import (
-    _broadcast_zero_to_three_edge_kdim_fields_wp,
-)
-from icon4py.model.atmosphere.dycore.update_density_exner_wind import (
+from icon4py.model.atmosphere.dycore.stencils.update_density_exner_wind import (
     _update_density_exner_wind,
 )
-from icon4py.model.atmosphere.dycore.update_wind import _update_wind
+from icon4py.model.atmosphere.dycore.stencils.update_wind import _update_wind
 from icon4py.model.common import dimension as dims, field_type_aliases as fa
 
 

diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/stencils/__init__.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/stencils/__init__.py
@@ -0,0 +1,8 @@
+# ICON4Py - ICON inspired code in Python and GT4Py
+#
+# Copyright (c) 2022-2024, ETH Zurich and MeteoSwiss
+# All rights reserved.
+#
+# Please, refer to the LICENSE file in the root directory.
+# SPDX-License-Identifier: BSD-3-Clause
+
diff --git a/...here/dycore/accumulate_prep_adv_fields.py → ...re/stencils/accumulate_prep_adv_fields.py b/...here/dycore/accumulate_prep_adv_fields.py → ...re/stencils/accumulate_prep_adv_fields.py
diff --git a/...ysis_increments_from_data_assimilation.py → ...ysis_increments_from_data_assimilation.py b/...ysis_increments_from_data_assimilation.py → ...ysis_increments_from_data_assimilation.py
diff --git a/...e/dycore/add_analysis_increments_to_vn.py → ...stencils/add_analysis_increments_to_vn.py b/...e/dycore/add_analysis_increments_to_vn.py → ...stencils/add_analysis_increments_to_vn.py
diff --git a/...r_normal_wind_tendency_approaching_cfl.py → ...r_normal_wind_tendency_approaching_cfl.py b/...r_normal_wind_tendency_approaching_cfl.py → ...r_normal_wind_tendency_approaching_cfl.py
@@ -16,7 +16,7 @@
     where,
 )
 
-from icon4py.model.atmosphere.dycore.init_two_edge_kdim_fields_with_zero_wp import (
+from icon4py.model.atmosphere.dycore.stencils.init_two_edge_kdim_fields_with_zero_wp import (
     _init_two_edge_kdim_fields_with_zero_wp,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...ra_diffusion_for_w_con_approaching_cfl.py → ...ra_diffusion_for_w_con_approaching_cfl.py b/...ra_diffusion_for_w_con_approaching_cfl.py → ...ra_diffusion_for_w_con_approaching_cfl.py
diff --git a/...interpolated_horizontal_advection_of_w.py → ...interpolated_horizontal_advection_of_w.py b/...interpolated_horizontal_advection_of_w.py → ...interpolated_horizontal_advection_of_w.py
diff --git a/...e/dycore/add_temporal_tendencies_to_vn.py → ...stencils/add_temporal_tendencies_to_vn.py b/...e/dycore/add_temporal_tendencies_to_vn.py → ...stencils/add_temporal_tendencies_to_vn.py
diff --git a/...n_by_interpolating_between_time_levels.py → ...n_by_interpolating_between_time_levels.py b/...n_by_interpolating_between_time_levels.py → ...n_by_interpolating_between_time_levels.py
diff --git a/..._wind_derivative_to_divergence_damping.py → ..._wind_derivative_to_divergence_damping.py b/..._wind_derivative_to_divergence_damping.py → ..._wind_derivative_to_divergence_damping.py
diff --git a/...ore/apply_2nd_order_divergence_damping.py → ...ils/apply_2nd_order_divergence_damping.py b/...ore/apply_2nd_order_divergence_damping.py → ...ils/apply_2nd_order_divergence_damping.py
diff --git a/...ore/apply_4th_order_divergence_damping.py → ...ils/apply_4th_order_divergence_damping.py b/...ore/apply_4th_order_divergence_damping.py → ...ils/apply_4th_order_divergence_damping.py
diff --git a/..._horizontal_gradient_of_exner_pressure.py → ..._horizontal_gradient_of_exner_pressure.py b/..._horizontal_gradient_of_exner_pressure.py → ..._horizontal_gradient_of_exner_pressure.py
diff --git a/...ycore/apply_rayleigh_damping_mechanism.py → ...ncils/apply_rayleigh_damping_mechanism.py b/...ycore/apply_rayleigh_damping_mechanism.py → ...ncils/apply_rayleigh_damping_mechanism.py
diff --git a/...d_2nd_and_4th_order_divergence_damping.py → ...d_2nd_and_4th_order_divergence_damping.py b/...d_2nd_and_4th_order_divergence_damping.py → ...d_2nd_and_4th_order_divergence_damping.py
diff --git a/...compute_advective_normal_wind_tendency.py → ...compute_advective_normal_wind_tendency.py b/...compute_advective_normal_wind_tendency.py → ...compute_advective_normal_wind_tendency.py
diff --git a/...mpute_advective_vertical_wind_tendency.py → ...mpute_advective_vertical_wind_tendency.py b/...mpute_advective_vertical_wind_tendency.py → ...mpute_advective_vertical_wind_tendency.py
diff --git a/...odel/atmosphere/dycore/compute_airmass.py → ...sphere/dycore/stencils/compute_airmass.py b/...odel/atmosphere/dycore/compute_airmass.py → ...sphere/dycore/stencils/compute_airmass.py
diff --git a/...ox_of_2nd_vertical_derivative_of_exner.py → ...ox_of_2nd_vertical_derivative_of_exner.py b/...ox_of_2nd_vertical_derivative_of_exner.py → ...ox_of_2nd_vertical_derivative_of_exner.py
diff --git a/...model/atmosphere/dycore/compute_avg_vn.py → ...osphere/dycore/stencils/compute_avg_vn.py b/...model/atmosphere/dycore/compute_avg_vn.py → ...osphere/dycore/stencils/compute_avg_vn.py
diff --git a/...e/compute_avg_vn_and_graddiv_vn_and_vt.py → ...s/compute_avg_vn_and_graddiv_vn_and_vt.py b/...e/compute_avg_vn_and_graddiv_vn_and_vt.py → ...s/compute_avg_vn_and_graddiv_vn_and_vt.py
@@ -10,8 +10,10 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import astype, neighbor_sum
 
-from icon4py.model.atmosphere.dycore.compute_avg_vn import _compute_avg_vn
-from icon4py.model.atmosphere.dycore.compute_tangential_wind import _compute_tangential_wind
+from icon4py.model.atmosphere.dycore.stencils.compute_avg_vn import _compute_avg_vn
+from icon4py.model.atmosphere.dycore.stencils.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.type_alias import vpfloat, wpfloat

diff --git a/...ycore/compute_contravariant_correction.py → ...ncils/compute_contravariant_correction.py b/...ycore/compute_contravariant_correction.py → ...ncils/compute_contravariant_correction.py
diff --git a/.../compute_contravariant_correction_of_w.py → .../compute_contravariant_correction_of_w.py b/.../compute_contravariant_correction_of_w.py → .../compute_contravariant_correction_of_w.py
diff --git a/...ant_correction_of_w_for_lower_boundary.py → ...ant_correction_of_w_for_lower_boundary.py b/...ant_correction_of_w_for_lower_boundary.py → ...ant_correction_of_w_for_lower_boundary.py
diff --git a/..._divergence_of_fluxes_of_rho_and_theta.py → ..._divergence_of_fluxes_of_rho_and_theta.py b/..._divergence_of_fluxes_of_rho_and_theta.py → ..._divergence_of_fluxes_of_rho_and_theta.py
diff --git a/...re/compute_dwdz_for_divergence_damping.py → ...ls/compute_dwdz_for_divergence_damping.py b/...re/compute_dwdz_for_divergence_damping.py → ...ls/compute_dwdz_for_divergence_damping.py
diff --git a/...ere/dycore/compute_exner_from_rhotheta.py → ...e/stencils/compute_exner_from_rhotheta.py b/...ere/dycore/compute_exner_from_rhotheta.py → ...e/stencils/compute_exner_from_rhotheta.py
diff --git a/...ompute_explicit_part_for_rho_and_exner.py → ...ompute_explicit_part_for_rho_and_exner.py b/...ompute_explicit_part_for_rho_and_exner.py → ...ompute_explicit_part_for_rho_and_exner.py
diff --git a/...om_advection_and_vertical_wind_density.py → ...om_advection_and_vertical_wind_density.py b/...om_advection_and_vertical_wind_density.py → ...om_advection_and_vertical_wind_density.py
diff --git a/..._speed_and_vertical_wind_times_density.py → ..._speed_and_vertical_wind_times_density.py b/..._speed_and_vertical_wind_times_density.py → ..._speed_and_vertical_wind_times_density.py
diff --git a/...core/compute_first_vertical_derivative.py → ...cils/compute_first_vertical_derivative.py b/...core/compute_first_vertical_derivative.py → ...cils/compute_first_vertical_derivative.py
diff --git a/...mosphere/dycore/compute_graddiv2_of_vn.py → ...dycore/stencils/compute_graddiv2_of_vn.py b/...mosphere/dycore/compute_graddiv2_of_vn.py → ...dycore/stencils/compute_graddiv2_of_vn.py
diff --git a/..._horizontal_advection_of_rho_and_theta.py → ..._horizontal_advection_of_rho_and_theta.py b/..._horizontal_advection_of_rho_and_theta.py → ..._horizontal_advection_of_rho_and_theta.py
diff --git a/...l_advection_term_for_vertical_velocity.py → ...l_advection_term_for_vertical_velocity.py b/...l_advection_term_for_vertical_velocity.py → ...l_advection_term_for_vertical_velocity.py
diff --git a/...of_exner_pressure_for_flat_coordinates.py → ...of_exner_pressure_for_flat_coordinates.py b/...of_exner_pressure_for_flat_coordinates.py → ...of_exner_pressure_for_flat_coordinates.py
diff --git a/..._of_exner_pressure_for_multiple_levels.py → ..._of_exner_pressure_for_multiple_levels.py b/..._of_exner_pressure_for_multiple_levels.py → ..._of_exner_pressure_for_multiple_levels.py
diff --git a/...exner_pressure_for_nonflat_coordinates.py → ...exner_pressure_for_nonflat_coordinates.py b/...exner_pressure_for_nonflat_coordinates.py → ...exner_pressure_for_nonflat_coordinates.py
diff --git a/...core/compute_horizontal_kinetic_energy.py → ...cils/compute_horizontal_kinetic_energy.py b/...core/compute_horizontal_kinetic_energy.py → ...cils/compute_horizontal_kinetic_energy.py
diff --git a/...re/compute_hydrostatic_correction_term.py → ...ls/compute_hydrostatic_correction_term.py b/...re/compute_hydrostatic_correction_term.py → ...ls/compute_hydrostatic_correction_term.py
diff --git a/...el/atmosphere/dycore/compute_mass_flux.py → ...here/dycore/stencils/compute_mass_flux.py b/...el/atmosphere/dycore/compute_mass_flux.py → ...here/dycore/stencils/compute_mass_flux.py
diff --git a/...d_clip_contravariant_vertical_velocity.py → ...d_clip_contravariant_vertical_velocity.py b/...d_clip_contravariant_vertical_velocity.py → ...d_clip_contravariant_vertical_velocity.py
diff --git a/.../compute_perturbation_of_rho_and_theta.py → .../compute_perturbation_of_rho_and_theta.py b/.../compute_perturbation_of_rho_and_theta.py → .../compute_perturbation_of_rho_and_theta.py
diff --git a/...d_theta_and_rho_interface_cell_centers.py → ...d_theta_and_rho_interface_cell_centers.py b/...d_theta_and_rho_interface_cell_centers.py → ...d_theta_and_rho_interface_cell_centers.py
@@ -10,7 +10,7 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import astype
 
-from icon4py.model.atmosphere.dycore.compute_perturbation_of_rho_and_theta import (
+from icon4py.model.atmosphere.dycore.stencils.compute_perturbation_of_rho_and_theta import (
     _compute_perturbation_of_rho_and_theta,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...te_results_for_thermodynamic_variables.py → ...te_results_for_thermodynamic_variables.py b/...te_results_for_thermodynamic_variables.py → ...te_results_for_thermodynamic_variables.py
diff --git a/...ial_temperatures_and_pressure_gradient.py → ...ial_temperatures_and_pressure_gradient.py b/...ial_temperatures_and_pressure_gradient.py → ...ial_temperatures_and_pressure_gradient.py
diff --git a/...ore/compute_solver_coefficients_matrix.py → ...ils/compute_solver_coefficients_matrix.py b/...ore/compute_solver_coefficients_matrix.py → ...ils/compute_solver_coefficients_matrix.py
diff --git a/...osphere/dycore/compute_tangential_wind.py → ...ycore/stencils/compute_tangential_wind.py b/...osphere/dycore/compute_tangential_wind.py → ...ycore/stencils/compute_tangential_wind.py
diff --git a/...osphere/dycore/compute_theta_and_exner.py → ...ycore/stencils/compute_theta_and_exner.py b/...osphere/dycore/compute_theta_and_exner.py → ...ycore/stencils/compute_theta_and_exner.py
diff --git a/...ial_temperatures_and_pressure_gradient.py → ...ial_temperatures_and_pressure_gradient.py b/...ial_temperatures_and_pressure_gradient.py → ...ial_temperatures_and_pressure_gradient.py
@@ -10,7 +10,7 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import astype
 
-from icon4py.model.atmosphere.dycore.interpolate_to_half_levels_vp import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_to_half_levels_vp import (
     _interpolate_to_half_levels_vp,
 )
 from icon4py.model.atmosphere.dycore.interpolate_to_half_levels_wp import (

diff --git a/.../dycore/compute_vn_on_lateral_boundary.py → ...tencils/compute_vn_on_lateral_boundary.py b/.../dycore/compute_vn_on_lateral_boundary.py → ...tencils/compute_vn_on_lateral_boundary.py
diff --git a/...here/dycore/copy_cell_kdim_field_to_vp.py → ...re/stencils/copy_cell_kdim_field_to_vp.py b/...here/dycore/copy_cell_kdim_field_to_vp.py → ...re/stencils/copy_cell_kdim_field_to_vp.py
diff --git a/...orrect_contravariant_vertical_velocity.py → ...orrect_contravariant_vertical_velocity.py b/...orrect_contravariant_vertical_velocity.py → ...orrect_contravariant_vertical_velocity.py
diff --git a/...l/atmosphere/dycore/extrapolate_at_top.py → ...ere/dycore/stencils/extrapolate_at_top.py b/...l/atmosphere/dycore/extrapolate_at_top.py → ...ere/dycore/stencils/extrapolate_at_top.py
diff --git a/.../extrapolate_temporally_exner_pressure.py → .../extrapolate_temporally_exner_pressure.py b/.../extrapolate_temporally_exner_pressure.py → .../extrapolate_temporally_exner_pressure.py
diff --git a/...ore/fused_solve_nonhydro_stencil_39_40.py → ...ils/fused_solve_nonhydro_stencil_39_40.py b/...ore/fused_solve_nonhydro_stencil_39_40.py → ...ils/fused_solve_nonhydro_stencil_39_40.py
@@ -9,10 +9,10 @@
 from gt4py.next.ffront.decorator import GridType, field_operator, program
 from gt4py.next.ffront.fbuiltins import where
 
-from icon4py.model.atmosphere.dycore.compute_contravariant_correction_of_w import (
+from icon4py.model.atmosphere.dycore.stencils.compute_contravariant_correction_of_w import (
     _compute_contravariant_correction_of_w,
 )
-from icon4py.model.atmosphere.dycore.compute_contravariant_correction_of_w_for_lower_boundary import (
+from icon4py.model.atmosphere.dycore.stencils.compute_contravariant_correction_of_w_for_lower_boundary import (
     _compute_contravariant_correction_of_w_for_lower_boundary,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...ed_velocity_advection_stencil_15_to_18.py → ...ed_velocity_advection_stencil_15_to_18.py b/...ed_velocity_advection_stencil_15_to_18.py → ...ed_velocity_advection_stencil_15_to_18.py
@@ -10,16 +10,16 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import broadcast, maximum, where
 
-from icon4py.model.atmosphere.dycore.add_extra_diffusion_for_w_con_approaching_cfl import (
+from icon4py.model.atmosphere.dycore.stencils.add_extra_diffusion_for_w_con_approaching_cfl import (
     _add_extra_diffusion_for_w_con_approaching_cfl,
 )
-from icon4py.model.atmosphere.dycore.add_interpolated_horizontal_advection_of_w import (
+from icon4py.model.atmosphere.dycore.stencils.add_interpolated_horizontal_advection_of_w import (
     _add_interpolated_horizontal_advection_of_w,
 )
-from icon4py.model.atmosphere.dycore.compute_advective_vertical_wind_tendency import (
+from icon4py.model.atmosphere.dycore.stencils.compute_advective_vertical_wind_tendency import (
     _compute_advective_vertical_wind_tendency,
 )
-from icon4py.model.atmosphere.dycore.interpolate_contravariant_vertical_velocity_to_full_levels import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_contravariant_vertical_velocity_to_full_levels import (
     _interpolate_contravariant_vertical_velocity_to_full_levels,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...ed_velocity_advection_stencil_19_to_20.py → ...ed_velocity_advection_stencil_19_to_20.py b/...ed_velocity_advection_stencil_19_to_20.py → ...ed_velocity_advection_stencil_19_to_20.py
@@ -10,13 +10,13 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import maximum, where
 
-from icon4py.model.atmosphere.dycore.add_extra_diffusion_for_normal_wind_tendency_approaching_cfl import (
+from icon4py.model.atmosphere.dycore.stencils.add_extra_diffusion_for_normal_wind_tendency_approaching_cfl import (
     _add_extra_diffusion_for_normal_wind_tendency_approaching_cfl,
 )
-from icon4py.model.atmosphere.dycore.compute_advective_normal_wind_tendency import (
+from icon4py.model.atmosphere.dycore.stencils.compute_advective_normal_wind_tendency import (
     _compute_advective_normal_wind_tendency,
 )
-from icon4py.model.atmosphere.dycore.mo_math_divrot_rot_vertex_ri_dsl import (
+from icon4py.model.atmosphere.dycore.stencils.mo_math_divrot_rot_vertex_ri_dsl import (
     _mo_math_divrot_rot_vertex_ri_dsl,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...used_velocity_advection_stencil_1_to_7.py → ...used_velocity_advection_stencil_1_to_7.py b/...used_velocity_advection_stencil_1_to_7.py → ...used_velocity_advection_stencil_1_to_7.py
@@ -10,24 +10,26 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import broadcast, where
 
-from icon4py.model.atmosphere.dycore.compute_contravariant_correction import (
+from icon4py.model.atmosphere.dycore.stencils.compute_contravariant_correction import (
     _compute_contravariant_correction,
 )
-from icon4py.model.atmosphere.dycore.compute_horizontal_advection_term_for_vertical_velocity import (
+from icon4py.model.atmosphere.dycore.stencils.compute_horizontal_advection_term_for_vertical_velocity import (
     _compute_horizontal_advection_term_for_vertical_velocity,
 )
-from icon4py.model.atmosphere.dycore.compute_horizontal_kinetic_energy import (
+from icon4py.model.atmosphere.dycore.stencils.compute_horizontal_kinetic_energy import (
     _compute_horizontal_kinetic_energy,
 )
-from icon4py.model.atmosphere.dycore.compute_tangential_wind import _compute_tangential_wind
-from icon4py.model.atmosphere.dycore.extrapolate_at_top import _extrapolate_at_top
-from icon4py.model.atmosphere.dycore.interpolate_vn_to_ie_and_compute_ekin_on_edges import (
+from icon4py.model.atmosphere.dycore.stencils.compute_tangential_wind import (
+    _compute_tangential_wind,
+)
+from icon4py.model.atmosphere.dycore.stencils.extrapolate_at_top import _extrapolate_at_top
+from icon4py.model.atmosphere.dycore.stencils.interpolate_vn_to_ie_and_compute_ekin_on_edges import (
     _interpolate_vn_to_ie_and_compute_ekin_on_edges,
 )
-from icon4py.model.atmosphere.dycore.interpolate_vt_to_interface_edges import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_vt_to_interface_edges import (
     _interpolate_vt_to_interface_edges,
 )
-from icon4py.model.atmosphere.dycore.mo_icon_interpolation_scalar_cells2verts_scalar_ri_dsl import (
+from icon4py.model.atmosphere.dycore.stencils.mo_icon_interpolation_scalar_cells2verts_scalar_ri_dsl import (
     _mo_icon_interpolation_scalar_cells2verts_scalar_ri_dsl,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...sed_velocity_advection_stencil_8_to_13.py → ...sed_velocity_advection_stencil_8_to_13.py b/...sed_velocity_advection_stencil_8_to_13.py → ...sed_velocity_advection_stencil_8_to_13.py
@@ -10,15 +10,19 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import where
 
-from icon4py.model.atmosphere.dycore.copy_cell_kdim_field_to_vp import _copy_cell_kdim_field_to_vp
-from icon4py.model.atmosphere.dycore.correct_contravariant_vertical_velocity import (
+from icon4py.model.atmosphere.dycore.stencils.copy_cell_kdim_field_to_vp import (
+    _copy_cell_kdim_field_to_vp,
+)
+from icon4py.model.atmosphere.dycore.stencils.correct_contravariant_vertical_velocity import (
     _correct_contravariant_vertical_velocity,
 )
-from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_vp import (
+from icon4py.model.atmosphere.dycore.stencils.init_cell_kdim_field_with_zero_vp import (
     _init_cell_kdim_field_with_zero_vp,
 )
-from icon4py.model.atmosphere.dycore.interpolate_to_cell_center import _interpolate_to_cell_center
-from icon4py.model.atmosphere.dycore.interpolate_to_half_levels_vp import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_to_cell_center import (
+    _interpolate_to_cell_center,
+)
+from icon4py.model.atmosphere.dycore.stencils.interpolate_to_half_levels_vp import (
     _interpolate_to_half_levels_vp,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...sed_velocity_advection_stencil_8_to_14.py → ...sed_velocity_advection_stencil_8_to_14.py b/...sed_velocity_advection_stencil_8_to_14.py → ...sed_velocity_advection_stencil_8_to_14.py
@@ -10,25 +10,30 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import maximum, where
 
-from icon4py.model.atmosphere.dycore.compute_maximum_cfl_and_clip_contravariant_vertical_velocity import (
+from icon4py.model.atmosphere.dycore.stencils.compute_maximum_cfl_and_clip_contravariant_vertical_velocity import (
     _compute_maximum_cfl_and_clip_contravariant_vertical_velocity,
 )
-from icon4py.model.atmosphere.dycore.copy_cell_kdim_field_to_vp import _copy_cell_kdim_field_to_vp
-from icon4py.model.atmosphere.dycore.correct_contravariant_vertical_velocity import (
+from icon4py.model.atmosphere.dycore.stencils.copy_cell_kdim_field_to_vp import (
+    _copy_cell_kdim_field_to_vp,
+)
+from icon4py.model.atmosphere.dycore.stencils.correct_contravariant_vertical_velocity import (
     _correct_contravariant_vertical_velocity,
 )
-from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_vp import (
+from icon4py.model.atmosphere.dycore.stencils.init_cell_kdim_field_with_zero_vp import (
     _init_cell_kdim_field_with_zero_vp,
 )
-from icon4py.model.atmosphere.dycore.interpolate_to_cell_center import _interpolate_to_cell_center
-from icon4py.model.atmosphere.dycore.interpolate_to_half_levels_vp import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_to_cell_center import (
+    _interpolate_to_cell_center,
+)
+from icon4py.model.atmosphere.dycore.stencils.interpolate_to_half_levels_vp import (
     _interpolate_to_half_levels_vp,
 )
 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
 
 
+# TODO (magdalena) this stencils has no StencilTest,  (numpy) reference
 @field_operator
 def _fused_velocity_advection_stencil_8_to_14(
     z_kin_hor_e: fa.EdgeKField[vpfloat],

diff --git a/...core/init_cell_kdim_field_with_zero_vp.py → ...cils/init_cell_kdim_field_with_zero_vp.py b/...core/init_cell_kdim_field_with_zero_vp.py → ...cils/init_cell_kdim_field_with_zero_vp.py
diff --git a/...core/init_cell_kdim_field_with_zero_wp.py → ...cils/init_cell_kdim_field_with_zero_wp.py b/...core/init_cell_kdim_field_with_zero_wp.py → ...cils/init_cell_kdim_field_with_zero_wp.py
diff --git a/...wo_cell_kdim_fields_index_with_zero_vp.py → ...wo_cell_kdim_fields_index_with_zero_vp.py b/...wo_cell_kdim_fields_index_with_zero_vp.py → ...wo_cell_kdim_fields_index_with_zero_vp.py
@@ -10,7 +10,7 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import broadcast, where
 
-from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_vp import (
+from icon4py.model.atmosphere.dycore.stencils.init_cell_kdim_field_with_zero_vp import (
     _init_cell_kdim_field_with_zero_vp,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...init_two_cell_kdim_fields_with_zero_vp.py → ...init_two_cell_kdim_fields_with_zero_vp.py b/...init_two_cell_kdim_fields_with_zero_vp.py → ...init_two_cell_kdim_fields_with_zero_vp.py
@@ -9,7 +9,7 @@
 from gt4py.next.common import GridType
 from gt4py.next.ffront.decorator import field_operator, program
 
-from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_vp import (
+from icon4py.model.atmosphere.dycore.stencils.init_cell_kdim_field_with_zero_vp import (
     _init_cell_kdim_field_with_zero_vp,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...init_two_cell_kdim_fields_with_zero_wp.py → ...init_two_cell_kdim_fields_with_zero_wp.py b/...init_two_cell_kdim_fields_with_zero_wp.py → ...init_two_cell_kdim_fields_with_zero_wp.py
@@ -9,7 +9,7 @@
 from gt4py.next.common import GridType
 from gt4py.next.ffront.decorator import field_operator, program
 
-from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_wp import (
+from icon4py.model.atmosphere.dycore.stencils.init_cell_kdim_field_with_zero_wp import (
     _init_cell_kdim_field_with_zero_wp,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...init_two_edge_kdim_fields_with_zero_wp.py → ...init_two_edge_kdim_fields_with_zero_wp.py b/...init_two_edge_kdim_fields_with_zero_wp.py → ...init_two_edge_kdim_fields_with_zero_wp.py
diff --git a/...riant_vertical_velocity_to_full_levels.py → ...riant_vertical_velocity_to_full_levels.py b/...riant_vertical_velocity_to_full_levels.py → ...riant_vertical_velocity_to_full_levels.py
diff --git a/...here/dycore/interpolate_to_cell_center.py → ...re/stencils/interpolate_to_cell_center.py b/...here/dycore/interpolate_to_cell_center.py → ...re/stencils/interpolate_to_cell_center.py
diff --git a/...e/dycore/interpolate_to_half_levels_vp.py → ...stencils/interpolate_to_half_levels_vp.py b/...e/dycore/interpolate_to_half_levels_vp.py → ...stencils/interpolate_to_half_levels_vp.py
diff --git a/...mosphere/dycore/interpolate_to_surface.py → ...dycore/stencils/interpolate_to_surface.py b/...mosphere/dycore/interpolate_to_surface.py → ...dycore/stencils/interpolate_to_surface.py
diff --git a/...and_vt_to_ie_and_compute_ekin_on_edges.py → ...and_vt_to_ie_and_compute_ekin_on_edges.py b/...and_vt_to_ie_and_compute_ekin_on_edges.py → ...and_vt_to_ie_and_compute_ekin_on_edges.py
@@ -9,10 +9,10 @@
 from gt4py.next.common import GridType
 from gt4py.next.ffront.decorator import field_operator, program
 
-from icon4py.model.atmosphere.dycore.interpolate_vn_to_ie_and_compute_ekin_on_edges import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_vn_to_ie_and_compute_ekin_on_edges import (
     _interpolate_vn_to_ie_and_compute_ekin_on_edges,
 )
-from icon4py.model.atmosphere.dycore.interpolate_vt_to_interface_edges import (
+from icon4py.model.atmosphere.dycore.stencils.interpolate_vt_to_interface_edges import (
     _interpolate_vt_to_interface_edges,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...ate_vn_to_ie_and_compute_ekin_on_edges.py → ...ate_vn_to_ie_and_compute_ekin_on_edges.py b/...ate_vn_to_ie_and_compute_ekin_on_edges.py → ...ate_vn_to_ie_and_compute_ekin_on_edges.py
@@ -10,7 +10,7 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import astype
 
-from icon4py.model.atmosphere.dycore.compute_horizontal_kinetic_energy import (
+from icon4py.model.atmosphere.dycore.stencils.compute_horizontal_kinetic_energy import (
     _compute_horizontal_kinetic_energy,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa

diff --git a/...core/interpolate_vt_to_interface_edges.py → ...cils/interpolate_vt_to_interface_edges.py b/...core/interpolate_vt_to_interface_edges.py → ...cils/interpolate_vt_to_interface_edges.py
diff --git a/...ation_scalar_cells2verts_scalar_ri_dsl.py → ...ation_scalar_cells2verts_scalar_ri_dsl.py b/...ation_scalar_cells2verts_scalar_ri_dsl.py → ...ation_scalar_cells2verts_scalar_ri_dsl.py
diff --git a/...ycore/mo_math_divrot_rot_vertex_ri_dsl.py → ...ncils/mo_math_divrot_rot_vertex_ri_dsl.py b/...ycore/mo_math_divrot_rot_vertex_ri_dsl.py → ...ncils/mo_math_divrot_rot_vertex_ri_dsl.py
diff --git a/...th_gradients_grad_green_gauss_cell_dsl.py → ...th_gradients_grad_green_gauss_cell_dsl.py b/...th_gradients_grad_green_gauss_cell_dsl.py → ...th_gradients_grad_green_gauss_cell_dsl.py
diff --git a/...re/dycore/mo_solve_nonhydro_stencil_51.py → .../stencils/mo_solve_nonhydro_stencil_51.py b/...re/dycore/mo_solve_nonhydro_stencil_51.py → .../stencils/mo_solve_nonhydro_stencil_51.py
diff --git a/.../icon4py/model/atmosphere/dycore/py.typed → ...model/atmosphere/dycore/stencils/py.typed b/.../icon4py/model/atmosphere/dycore/py.typed → ...model/atmosphere/dycore/stencils/py.typed
diff --git a/...ion_for_w_and_contravariant_correction.py → ...ion_for_w_and_contravariant_correction.py b/...ion_for_w_and_contravariant_correction.py → ...ion_for_w_and_contravariant_correction.py
@@ -10,7 +10,7 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import astype
 
-from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_wp import (
+from icon4py.model.atmosphere.dycore.stencils.init_cell_kdim_field_with_zero_wp import (
     _init_cell_kdim_field_with_zero_wp,
 )
 from icon4py.model.common import dimension as dims, field_type_aliases as fa