diff --git a/model/atmosphere/advection/src/icon4py/model/atmosphere/advection/set_zero_c.py b/model/atmosphere/advection/src/icon4py/model/atmosphere/advection/init_zero_c.py similarity index 87% rename from model/atmosphere/advection/src/icon4py/model/atmosphere/advection/set_zero_c.py rename to model/atmosphere/advection/src/icon4py/model/atmosphere/advection/init_zero_c.py index 93e2192..10fa5b4 100644 --- a/model/atmosphere/advection/src/icon4py/model/atmosphere/advection/set_zero_c.py +++ b/model/atmosphere/advection/src/icon4py/model/atmosphere/advection/init_zero_c.py @@ -19,10 +19,10 @@ @field_operator -def _set_zero_c() -> Field[[CellDim], float]: +def _init_zero_c() -> Field[[CellDim], float]: return broadcast(0.0, (CellDim,)) @program(grid_type=GridType.UNSTRUCTURED) -def set_zero_c(field: Field[[CellDim], float]): - _set_zero_c(out=field) +def init_zero_c(field: Field[[CellDim], float]): + _init_zero_c(out=field) diff --git a/model/atmosphere/advection/src/icon4py/model/atmosphere/advection/set_zero_c_k.py b/model/atmosphere/advection/src/icon4py/model/atmosphere/advection/init_zero_c_k.py similarity index 85% rename from model/atmosphere/advection/src/icon4py/model/atmosphere/advection/set_zero_c_k.py rename to model/atmosphere/advection/src/icon4py/model/atmosphere/advection/init_zero_c_k.py index a6b50d0..1db0d38 100644 --- a/model/atmosphere/advection/src/icon4py/model/atmosphere/advection/set_zero_c_k.py +++ b/model/atmosphere/advection/src/icon4py/model/atmosphere/advection/init_zero_c_k.py @@ -19,10 +19,10 @@ @field_operator -def _set_zero_c_k() -> Field[[CellDim, KDim], float]: +def _init_zero_c_k() -> Field[[CellDim, KDim], float]: return broadcast(0.0, (CellDim, KDim)) @program(grid_type=GridType.UNSTRUCTURED) -def set_zero_c_k(field: Field[[CellDim, KDim], float]): - _set_zero_c_k(out=field) +def init_zero_c_k(field: Field[[CellDim, KDim], float]): + _init_zero_c_k(out=field) diff --git a/model/atmosphere/advection/tests/stencil_tests/test_set_zero_c.py b/model/atmosphere/advection/tests/stencil_tests/test_init_zero_c.py similarity index 87% rename from model/atmosphere/advection/tests/stencil_tests/test_set_zero_c.py rename to model/atmosphere/advection/tests/stencil_tests/test_init_zero_c.py index f15449b..08da338 100644 --- a/model/atmosphere/advection/tests/stencil_tests/test_set_zero_c.py +++ b/model/atmosphere/advection/tests/stencil_tests/test_init_zero_c.py @@ -13,13 +13,13 @@ import pytest -from icon4py.model.atmosphere.advection.set_zero_c import set_zero_c +from icon4py.model.atmosphere.advection.init_zero_c import init_zero_c from icon4py.model.common.dimension import CellDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field, zero_field -class TestSetZeroCellK(StencilTest): - PROGRAM = set_zero_c +class TestInitZeroCellK(StencilTest): + PROGRAM = init_zero_c OUTPUTS = ("field",) @staticmethod diff --git a/model/atmosphere/advection/tests/stencil_tests/test_set_zero_c_k.py b/model/atmosphere/advection/tests/stencil_tests/test_init_zero_c_k.py similarity index 87% rename from model/atmosphere/advection/tests/stencil_tests/test_set_zero_c_k.py rename to model/atmosphere/advection/tests/stencil_tests/test_init_zero_c_k.py index f72a851..0f0e3f5 100644 --- a/model/atmosphere/advection/tests/stencil_tests/test_set_zero_c_k.py +++ b/model/atmosphere/advection/tests/stencil_tests/test_init_zero_c_k.py @@ -13,13 +13,13 @@ import pytest -from icon4py.model.atmosphere.advection.set_zero_c_k import set_zero_c_k +from icon4py.model.atmosphere.advection.init_zero_c_k import init_zero_c_k from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field, zero_field -class TestSetZeroCK(StencilTest): - PROGRAM = set_zero_c_k +class TestInitZeroCK(StencilTest): + PROGRAM = init_zero_c_k OUTPUTS = ("field",) @staticmethod diff --git a/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion_utils.py b/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion_utils.py index 94e23cc..e2ee130 100644 --- a/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion_utils.py +++ b/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion_utils.py @@ -54,13 +54,13 @@ def scale_k(field: Field[[KDim], float], factor: float, scaled_field: Field[[KDi @field_operator -def _set_zero_v_k() -> Field[[VertexDim, KDim], float]: +def _init_zero_v_k() -> Field[[VertexDim, KDim], float]: return broadcast(0.0, (VertexDim, KDim)) @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def set_zero_v_k(field: Field[[VertexDim, KDim], float]): - _set_zero_v_k(out=field) +def init_zero_v_k(field: Field[[VertexDim, KDim], float]): + _init_zero_v_k(out=field) @field_operator diff --git a/model/atmosphere/diffusion/tests/diffusion_tests/test_diffusion_utils.py b/model/atmosphere/diffusion/tests/diffusion_tests/test_diffusion_utils.py index e060efd..058b376 100644 --- a/model/atmosphere/diffusion/tests/diffusion_tests/test_diffusion_utils.py +++ b/model/atmosphere/diffusion/tests/diffusion_tests/test_diffusion_utils.py @@ -18,8 +18,8 @@ from icon4py.model.atmosphere.diffusion.diffusion_utils import ( _setup_runtime_diff_multfac_vn, _setup_smag_limit, + init_zero_v_k, scale_k, - set_zero_v_k, setup_fields_for_initial_step, ) from icon4py.model.common.dimension import KDim, VertexDim @@ -104,10 +104,10 @@ def test_diff_multfac_vn_smag_limit_for_loop_run_with_k4_substeps(backend): assert np.allclose(expected_smag_limit, smag_limit.asnumpy()) -def test_set_zero_vertex_k(backend): +def test_init_zero_vertex_k(backend): grid = SimpleGrid() f = random_field(grid, VertexDim, KDim) - set_zero_v_k(f, offset_provider={}) + init_zero_v_k(f, offset_provider={}) assert np.allclose(0.0, f.asnumpy()) diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/add_extra_diffusion_for_wn_approaching_cfl.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/add_extra_diffusion_for_normal_wind_tendency_approaching_cfl.py similarity index 91% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/add_extra_diffusion_for_wn_approaching_cfl.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/add_extra_diffusion_for_normal_wind_tendency_approaching_cfl.py index c86137e..74f0934 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/add_extra_diffusion_for_wn_approaching_cfl.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/add_extra_diffusion_for_normal_wind_tendency_approaching_cfl.py @@ -23,8 +23,8 @@ where, ) -from icon4py.model.atmosphere.dycore.set_two_edge_kdim_fields_to_zero_wp import ( - _set_two_edge_kdim_fields_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_two_edge_kdim_fields_with_zero_wp import ( + _init_two_edge_kdim_fields_with_zero_wp, ) from icon4py.model.common.dimension import ( E2C, @@ -43,7 +43,7 @@ @field_operator -def _add_extra_diffusion_for_wn_approaching_cfl( +def _add_extra_diffusion_for_normal_wind_tendency_approaching_cfl( levelmask: Field[[KDim], bool], c_lin_e: Field[[EdgeDim, E2CDim], wpfloat], z_w_con_c_full: Field[[CellDim, KDim], vpfloat], @@ -64,7 +64,7 @@ def _add_extra_diffusion_for_wn_approaching_cfl( (z_w_con_c_full, ddqz_z_full_e, ddt_vn_apc, cfl_w_limit), wpfloat ) - w_con_e, difcoef = _set_two_edge_kdim_fields_to_zero_wp() + w_con_e, difcoef = _init_two_edge_kdim_fields_with_zero_wp() w_con_e = where( levelmask | levelmask(Koff[1]), @@ -99,7 +99,7 @@ def _add_extra_diffusion_for_wn_approaching_cfl( @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def add_extra_diffusion_for_wn_approaching_cfl( +def add_extra_diffusion_for_normal_wind_tendency_approaching_cfl( levelmask: Field[[KDim], bool], c_lin_e: Field[[EdgeDim, E2CDim], wpfloat], z_w_con_c_full: Field[[CellDim, KDim], vpfloat], @@ -119,7 +119,7 @@ def add_extra_diffusion_for_wn_approaching_cfl( vertical_start: int32, vertical_end: int32, ): - _add_extra_diffusion_for_wn_approaching_cfl( + _add_extra_diffusion_for_normal_wind_tendency_approaching_cfl( levelmask, c_lin_e, z_w_con_c_full, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_horizontal_gradient_of_extner_pressure_for_multiple_levels.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py similarity index 93% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_horizontal_gradient_of_extner_pressure_for_multiple_levels.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py index 9ed0c65..74f7269 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_horizontal_gradient_of_extner_pressure_for_multiple_levels.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py @@ -22,7 +22,7 @@ @field_operator -def _compute_horizontal_gradient_of_extner_pressure_for_multiple_levels( +def _compute_horizontal_gradient_of_exner_pressure_for_multiple_levels( inv_dual_edge_length: Field[[EdgeDim], wpfloat], z_exner_ex_pr: Field[[CellDim, KDim], vpfloat], zdiff_gradp: Field[[ECDim, KDim], vpfloat], @@ -60,7 +60,7 @@ def _compute_horizontal_gradient_of_extner_pressure_for_multiple_levels( @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def compute_horizontal_gradient_of_extner_pressure_for_multiple_levels( +def compute_horizontal_gradient_of_exner_pressure_for_multiple_levels( inv_dual_edge_length: Field[[EdgeDim], wpfloat], z_exner_ex_pr: Field[[CellDim, KDim], vpfloat], zdiff_gradp: Field[[ECDim, KDim], vpfloat], @@ -73,7 +73,7 @@ def compute_horizontal_gradient_of_extner_pressure_for_multiple_levels( vertical_start: int32, vertical_end: int32, ): - _compute_horizontal_gradient_of_extner_pressure_for_multiple_levels( + _compute_horizontal_gradient_of_exner_pressure_for_multiple_levels( inv_dual_edge_length, z_exner_ex_pr, zdiff_gradp, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_pertubation_of_rho_and_theta.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_perturbation_of_rho_and_theta.py similarity index 94% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_pertubation_of_rho_and_theta.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_perturbation_of_rho_and_theta.py index ba1602c..79fc2d2 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_pertubation_of_rho_and_theta.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_perturbation_of_rho_and_theta.py @@ -21,7 +21,7 @@ @field_operator -def _compute_pertubation_of_rho_and_theta( +def _compute_perturbation_of_rho_and_theta( rho: Field[[CellDim, KDim], wpfloat], rho_ref_mc: Field[[CellDim, KDim], vpfloat], theta_v: Field[[CellDim, KDim], wpfloat], @@ -36,7 +36,7 @@ def _compute_pertubation_of_rho_and_theta( @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def compute_pertubation_of_rho_and_theta( +def compute_perturbation_of_rho_and_theta( rho: Field[[CellDim, KDim], wpfloat], rho_ref_mc: Field[[CellDim, KDim], vpfloat], theta_v: Field[[CellDim, KDim], wpfloat], @@ -48,7 +48,7 @@ def compute_pertubation_of_rho_and_theta( vertical_start: int32, vertical_end: int32, ): - _compute_pertubation_of_rho_and_theta( + _compute_perturbation_of_rho_and_theta( rho, rho_ref_mc, theta_v, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_pertubation_of_rho_and_theta_and_rho_at_ic.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers.py similarity index 85% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_pertubation_of_rho_and_theta_and_rho_at_ic.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers.py index 93b46ce..27b7274 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_pertubation_of_rho_and_theta_and_rho_at_ic.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers.py @@ -15,8 +15,8 @@ from gt4py.next.ffront.decorator import field_operator, program from gt4py.next.ffront.fbuiltins import Field, astype, int32 -from icon4py.model.atmosphere.dycore.compute_pertubation_of_rho_and_theta import ( - _compute_pertubation_of_rho_and_theta, +from icon4py.model.atmosphere.dycore.compute_perturbation_of_rho_and_theta import ( + _compute_perturbation_of_rho_and_theta, ) from icon4py.model.common.dimension import CellDim, KDim, Koff from icon4py.model.common.settings import backend @@ -24,7 +24,7 @@ @field_operator -def _compute_pertubation_of_rho_and_theta_and_rho_at_ic( +def _compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers( wgtfac_c: Field[[CellDim, KDim], vpfloat], rho: Field[[CellDim, KDim], wpfloat], rho_ref_mc: Field[[CellDim, KDim], vpfloat], @@ -39,14 +39,14 @@ def _compute_pertubation_of_rho_and_theta_and_rho_at_ic( wgtfac_c_wp = astype(wgtfac_c, wpfloat) rho_ic = wgtfac_c_wp * rho + (wpfloat("1.0") - wgtfac_c_wp) * rho(Koff[-1]) - z_rth_pr_1, z_rth_pr_2 = _compute_pertubation_of_rho_and_theta( + z_rth_pr_1, z_rth_pr_2 = _compute_perturbation_of_rho_and_theta( rho=rho, rho_ref_mc=rho_ref_mc, theta_v=theta_v, theta_ref_mc=theta_ref_mc ) return rho_ic, z_rth_pr_1, z_rth_pr_2 @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def compute_pertubation_of_rho_and_theta_and_rho_at_ic( +def compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers( wgtfac_c: Field[[CellDim, KDim], vpfloat], rho: Field[[CellDim, KDim], wpfloat], rho_ref_mc: Field[[CellDim, KDim], vpfloat], @@ -60,7 +60,7 @@ def compute_pertubation_of_rho_and_theta_and_rho_at_ic( vertical_start: int32, vertical_end: int32, ): - _compute_pertubation_of_rho_and_theta_and_rho_at_ic( + _compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers( wgtfac_c, rho, rho_ref_mc, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_15_to_18.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_15_to_18.py index deaa23b..76f0425 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_15_to_18.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_15_to_18.py @@ -23,8 +23,8 @@ from icon4py.model.atmosphere.dycore.compute_advective_vertical_wind_tendency import ( _compute_advective_vertical_wind_tendency, ) -from icon4py.model.atmosphere.dycore.interpolate_contravatiant_vertical_verlocity_to_full_levels import ( - _interpolate_contravatiant_vertical_verlocity_to_full_levels, +from icon4py.model.atmosphere.dycore.interpolate_contravariant_vertical_velocity_to_full_levels import ( + _interpolate_contravariant_vertical_velocity_to_full_levels, ) from icon4py.model.common.dimension import C2E2CODim, CEDim, CellDim, EdgeDim, KDim from icon4py.model.common.settings import backend @@ -123,7 +123,7 @@ def _fused_velocity_advection_stencil_15_to_18( lvn_only: bool, extra_diffu: bool, ) -> tuple[Field[[CellDim, KDim], vpfloat], Field[[CellDim, KDim], vpfloat]]: - z_w_con_c_full = _interpolate_contravatiant_vertical_verlocity_to_full_levels(z_w_con_c) + z_w_con_c_full = _interpolate_contravariant_vertical_velocity_to_full_levels(z_w_con_c) ddt_w_adv = ( _fused_velocity_advection_stencil_16_to_18( z_w_con_c, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_19_to_20.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_19_to_20.py index e7e450e..a53d1cc 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_19_to_20.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_19_to_20.py @@ -14,8 +14,8 @@ from gt4py.next.ffront.decorator import field_operator, program from gt4py.next.ffront.fbuiltins import int32, maximum, where -from icon4py.model.atmosphere.dycore.add_extra_diffusion_for_wn_approaching_cfl import ( - _add_extra_diffusion_for_wn_approaching_cfl, +from icon4py.model.atmosphere.dycore.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 ( _compute_advective_normal_wind_tendency, @@ -81,7 +81,7 @@ def _fused_velocity_advection_stencil_19_to_20( ddt_vn_apc = ( where( maximum(2, nrdmax - 2) <= k < nlev - 3, - _add_extra_diffusion_for_wn_approaching_cfl( + _add_extra_diffusion_for_normal_wind_tendency_approaching_cfl( levelmask, c_lin_e, z_w_con_c_full, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_1_to_7.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_1_to_7.py index 87303c3..9baf6d4 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_1_to_7.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_1_to_7.py @@ -28,7 +28,9 @@ from icon4py.model.atmosphere.dycore.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_ie import _interpolate_vt_to_ie +from icon4py.model.atmosphere.dycore.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 ( _mo_icon_interpolation_scalar_cells2verts_scalar_ri_dsl, ) @@ -63,7 +65,7 @@ def compute_interface_vt_vn_and_kinetic_energy( z_vt_ie = ( where( 1 <= k < nlev, - _interpolate_vt_to_ie(wgtfac_e, vt), + _interpolate_vt_to_interface_edges(wgtfac_e, vt), z_vt_ie, ) if not lvn_only diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_13.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_13.py index bb8da96..0fa13d7 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_13.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_13.py @@ -18,13 +18,13 @@ from icon4py.model.atmosphere.dycore.correct_contravariant_vertical_velocity import ( _correct_contravariant_vertical_velocity, ) +from icon4py.model.atmosphere.dycore.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 ( _interpolate_to_half_levels_vp, ) -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_vp import ( - _set_cell_kdim_field_to_zero_vp, -) from icon4py.model.common.dimension import CEDim, CellDim, EdgeDim, KDim from icon4py.model.common.settings import backend from icon4py.model.common.type_alias import vpfloat, wpfloat @@ -65,7 +65,7 @@ def _fused_velocity_advection_stencil_8_to_13_predictor( z_w_con_c = where( k < nlev, _copy_cell_kdim_field_to_vp(w), - _set_cell_kdim_field_to_zero_vp(), + _init_cell_kdim_field_with_zero_vp(), ) z_w_con_c = where( @@ -104,7 +104,7 @@ def _fused_velocity_advection_stencil_8_to_13_corrector( z_w_con_c = where( k < nlev, _copy_cell_kdim_field_to_vp(w), - _set_cell_kdim_field_to_zero_vp(), + _init_cell_kdim_field_with_zero_vp(), ) z_w_con_c = where( diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_14.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_14.py index ea0074e..61206da 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_14.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_14.py @@ -21,13 +21,13 @@ from icon4py.model.atmosphere.dycore.correct_contravariant_vertical_velocity import ( _correct_contravariant_vertical_velocity, ) +from icon4py.model.atmosphere.dycore.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 ( _interpolate_to_half_levels_vp, ) -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_vp import ( - _set_cell_kdim_field_to_zero_vp, -) from icon4py.model.common.dimension import CEDim, CellDim, EdgeDim, KDim from icon4py.model.common.settings import backend from icon4py.model.common.type_alias import vpfloat, wpfloat @@ -91,7 +91,7 @@ def _fused_velocity_advection_stencil_8_to_14( z_w_con_c = where( k < nlevp1, _copy_cell_kdim_field_to_vp(w), - _set_cell_kdim_field_to_zero_vp(), + _init_cell_kdim_field_with_zero_vp(), ) z_w_con_c = where( diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_cell_kdim_field_to_zero_vp.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_cell_kdim_field_with_zero_vp.py similarity index 85% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_cell_kdim_field_to_zero_vp.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_cell_kdim_field_with_zero_vp.py index ab45b2e..0d6d39e 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_cell_kdim_field_to_zero_vp.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_cell_kdim_field_with_zero_vp.py @@ -21,21 +21,21 @@ @field_operator -def _set_cell_kdim_field_to_zero_vp() -> Field[[CellDim, KDim], vpfloat]: +def _init_cell_kdim_field_with_zero_vp() -> Field[[CellDim, KDim], vpfloat]: """Formerly known as _mo_solve_nonhydro_stencil_03, _mo_solve_nonhydro_stencil_11_lower, _mo_solve_nonhydro_stencil_45, _mo_solve_nonhydro_stencil_45_b, or _mo_velocity_advection_stencil_12.""" return broadcast(vpfloat("0.0"), (CellDim, KDim)) @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def set_cell_kdim_field_to_zero_vp( - field_to_zero_vp: Field[[CellDim, KDim], vpfloat], +def init_cell_kdim_field_with_zero_vp( + field_with_zero_vp: Field[[CellDim, KDim], vpfloat], horizontal_start: int32, horizontal_end: int32, vertical_start: int32, vertical_end: int32, ): - _set_cell_kdim_field_to_zero_vp( - out=field_to_zero_vp, + _init_cell_kdim_field_with_zero_vp( + out=field_with_zero_vp, domain={ CellDim: (horizontal_start, horizontal_end), KDim: (vertical_start, vertical_end), diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_cell_kdim_field_to_zero_wp.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_cell_kdim_field_with_zero_wp.py similarity index 84% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_cell_kdim_field_to_zero_wp.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_cell_kdim_field_with_zero_wp.py index fb053af..319b9b9 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_cell_kdim_field_to_zero_wp.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_cell_kdim_field_with_zero_wp.py @@ -21,21 +21,21 @@ @field_operator -def _set_cell_kdim_field_to_zero_wp() -> Field[[CellDim, KDim], wpfloat]: +def _init_cell_kdim_field_with_zero_wp() -> Field[[CellDim, KDim], wpfloat]: """Formerly known as _mo_solve_nonhydro_stencil_57 or _mo_solve_nonhydro_stencil_64.""" return broadcast(wpfloat("0.0"), (CellDim, KDim)) @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def set_cell_kdim_field_to_zero_wp( - field_to_zero_wp: Field[[CellDim, KDim], wpfloat], +def init_cell_kdim_field_with_zero_wp( + field_with_zero_wp: Field[[CellDim, KDim], wpfloat], horizontal_start: int32, horizontal_end: int32, vertical_start: int32, vertical_end: int32, ): - _set_cell_kdim_field_to_zero_wp( - out=field_to_zero_wp, + _init_cell_kdim_field_with_zero_wp( + out=field_with_zero_wp, domain={ CellDim: (horizontal_start, horizontal_end), KDim: (vertical_start, vertical_end), diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_index_to_zero_vp.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_index_with_zero_vp.py similarity index 62% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_index_to_zero_vp.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_index_with_zero_vp.py index d4c8f0b..249eb5e 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_index_to_zero_vp.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_index_with_zero_vp.py @@ -15,8 +15,8 @@ from gt4py.next.ffront.decorator import field_operator, program from gt4py.next.ffront.fbuiltins import Field, broadcast, int32, where -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_vp import ( - _set_cell_kdim_field_to_zero_vp, +from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_vp import ( + _init_cell_kdim_field_with_zero_vp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.settings import backend @@ -24,9 +24,9 @@ @field_operator -def _set_two_cell_kdim_fields_index_to_zero_vp( - field_index_to_zero_1: Field[[CellDim, KDim], vpfloat], - field_index_to_zero_2: Field[[CellDim, KDim], vpfloat], +def _init_two_cell_kdim_fields_index_with_zero_vp( + field_index_with_zero_1: Field[[CellDim, KDim], vpfloat], + field_index_with_zero_2: Field[[CellDim, KDim], vpfloat], k: Field[[KDim], int32], k1: int32, k2: int32, @@ -34,20 +34,20 @@ def _set_two_cell_kdim_fields_index_to_zero_vp( """Formerly known as _mo_solve_nonhydro_stencil_45 and _mo_solve_nonhydro_stencil_45_b.""" k = broadcast(k, (CellDim, KDim)) - field_index_to_zero_1 = where( - (k == k1), _set_cell_kdim_field_to_zero_vp(), field_index_to_zero_1 + field_index_with_zero_1 = where( + (k == k1), _init_cell_kdim_field_with_zero_vp(), field_index_with_zero_1 ) - field_index_to_zero_2 = where( - (k == k2), _set_cell_kdim_field_to_zero_vp(), field_index_to_zero_2 + field_index_with_zero_2 = where( + (k == k2), _init_cell_kdim_field_with_zero_vp(), field_index_with_zero_2 ) - return field_index_to_zero_1, field_index_to_zero_2 + return field_index_with_zero_1, field_index_with_zero_2 @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def set_two_cell_kdim_fields_index_to_zero_vp( - field_index_to_zero_1: Field[[CellDim, KDim], vpfloat], - field_index_to_zero_2: Field[[CellDim, KDim], vpfloat], +def init_two_cell_kdim_fields_index_with_zero_vp( + field_index_with_zero_1: Field[[CellDim, KDim], vpfloat], + field_index_with_zero_2: Field[[CellDim, KDim], vpfloat], k: Field[[KDim], int32], k1: int32, k2: int32, @@ -56,13 +56,13 @@ def set_two_cell_kdim_fields_index_to_zero_vp( vertical_start: int32, vertical_end: int32, ): - _set_two_cell_kdim_fields_index_to_zero_vp( - field_index_to_zero_1, - field_index_to_zero_2, + _init_two_cell_kdim_fields_index_with_zero_vp( + field_index_with_zero_1, + field_index_with_zero_2, k, k1, k2, - out=(field_index_to_zero_1, field_index_to_zero_2), + out=(field_index_with_zero_1, field_index_with_zero_2), domain={ CellDim: (horizontal_start, horizontal_end), KDim: (vertical_start, vertical_end), diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_to_zero_vp.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_with_zero_vp.py similarity index 70% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_to_zero_vp.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_with_zero_vp.py index a315f4b..429f883 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_to_zero_vp.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_with_zero_vp.py @@ -15,8 +15,8 @@ from gt4py.next.ffront.decorator import field_operator, program from gt4py.next.ffront.fbuiltins import Field, int32 -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_vp import ( - _set_cell_kdim_field_to_zero_vp, +from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_vp import ( + _init_cell_kdim_field_with_zero_vp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.settings import backend @@ -24,24 +24,24 @@ @field_operator -def _set_two_cell_kdim_fields_to_zero_vp() -> ( +def _init_two_cell_kdim_fields_with_zero_vp() -> ( tuple[Field[[CellDim, KDim], vpfloat], Field[[CellDim, KDim], vpfloat]] ): """Formerly known as _mo_solve_nonhydro_stencil_01.""" - return _set_cell_kdim_field_to_zero_vp(), _set_cell_kdim_field_to_zero_vp() + return _init_cell_kdim_field_with_zero_vp(), _init_cell_kdim_field_with_zero_vp() @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def set_two_cell_kdim_fields_to_zero_vp( - cell_kdim_field_to_zero_vp_1: Field[[CellDim, KDim], vpfloat], - cell_kdim_field_to_zero_vp_2: Field[[CellDim, KDim], vpfloat], +def init_two_cell_kdim_fields_with_zero_vp( + cell_kdim_field_with_zero_vp_1: Field[[CellDim, KDim], vpfloat], + cell_kdim_field_with_zero_vp_2: Field[[CellDim, KDim], vpfloat], horizontal_start: int32, horizontal_end: int32, vertical_start: int32, vertical_end: int32, ): - _set_two_cell_kdim_fields_to_zero_vp( - out=(cell_kdim_field_to_zero_vp_1, cell_kdim_field_to_zero_vp_2), + _init_two_cell_kdim_fields_with_zero_vp( + out=(cell_kdim_field_with_zero_vp_1, cell_kdim_field_with_zero_vp_2), domain={ CellDim: (horizontal_start, horizontal_end), KDim: (vertical_start, vertical_end), diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_to_zero_wp.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_with_zero_wp.py similarity index 70% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_to_zero_wp.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_with_zero_wp.py index 990cc67..7c02bb7 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_cell_kdim_fields_to_zero_wp.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_cell_kdim_fields_with_zero_wp.py @@ -15,8 +15,8 @@ from gt4py.next.ffront.decorator import field_operator, program from gt4py.next.ffront.fbuiltins import Field, int32 -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_wp import ( - _set_cell_kdim_field_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_wp import ( + _init_cell_kdim_field_with_zero_wp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.settings import backend @@ -24,24 +24,24 @@ @field_operator -def _set_two_cell_kdim_fields_to_zero_wp() -> ( +def _init_two_cell_kdim_fields_with_zero_wp() -> ( tuple[Field[[CellDim, KDim], wpfloat], Field[[CellDim, KDim], wpfloat]] ): """Formerly known as _mo_solve_nonhydro_stencil_46.""" - return _set_cell_kdim_field_to_zero_wp(), _set_cell_kdim_field_to_zero_wp() + return _init_cell_kdim_field_with_zero_wp(), _init_cell_kdim_field_with_zero_wp() @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def set_two_cell_kdim_fields_to_zero_wp( - cell_kdim_field_to_zero_wp_1: Field[[CellDim, KDim], wpfloat], - cell_kdim_field_to_zero_wp_2: Field[[CellDim, KDim], wpfloat], +def init_two_cell_kdim_fields_with_zero_wp( + cell_kdim_field_with_zero_wp_1: Field[[CellDim, KDim], wpfloat], + cell_kdim_field_with_zero_wp_2: Field[[CellDim, KDim], wpfloat], horizontal_start: int32, horizontal_end: int32, vertical_start: int32, vertical_end: int32, ): - _set_two_cell_kdim_fields_to_zero_wp( - out=(cell_kdim_field_to_zero_wp_1, cell_kdim_field_to_zero_wp_2), + _init_two_cell_kdim_fields_with_zero_wp( + out=(cell_kdim_field_with_zero_wp_1, cell_kdim_field_with_zero_wp_2), domain={ CellDim: (horizontal_start, horizontal_end), KDim: (vertical_start, vertical_end), diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_edge_kdim_fields_to_zero_wp.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_edge_kdim_fields_with_zero_wp.py similarity index 80% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_edge_kdim_fields_to_zero_wp.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_edge_kdim_fields_with_zero_wp.py index 0094f5a..a9043ad 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_two_edge_kdim_fields_to_zero_wp.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/init_two_edge_kdim_fields_with_zero_wp.py @@ -21,7 +21,7 @@ @field_operator -def _set_two_edge_kdim_fields_to_zero_wp() -> ( +def _init_two_edge_kdim_fields_with_zero_wp() -> ( tuple[Field[[EdgeDim, KDim], wpfloat], Field[[EdgeDim, KDim], wpfloat]] ): """Formerly know as _mo_solve_nonhydro_stencil_14, _mo_solve_nonhydro_stencil_15, or _mo_solve_nonhydro_stencil_33.""" @@ -29,16 +29,16 @@ def _set_two_edge_kdim_fields_to_zero_wp() -> ( @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def set_two_edge_kdim_fields_to_zero_wp( - edge_kdim_field_to_zero_wp_1: Field[[EdgeDim, KDim], wpfloat], - edge_kdim_field_to_zero_wp_2: Field[[EdgeDim, KDim], wpfloat], +def init_two_edge_kdim_fields_with_zero_wp( + edge_kdim_field_with_zero_wp_1: Field[[EdgeDim, KDim], wpfloat], + edge_kdim_field_with_zero_wp_2: Field[[EdgeDim, KDim], wpfloat], horizontal_start: int32, horizontal_end: int32, vertical_start: int32, vertical_end: int32, ): - _set_two_edge_kdim_fields_to_zero_wp( - out=(edge_kdim_field_to_zero_wp_1, edge_kdim_field_to_zero_wp_2), + _init_two_edge_kdim_fields_with_zero_wp( + out=(edge_kdim_field_with_zero_wp_1, edge_kdim_field_with_zero_wp_2), domain={ EdgeDim: (horizontal_start, horizontal_end), KDim: (vertical_start, vertical_end), diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_contravatiant_vertical_verlocity_to_full_levels.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_contravariant_vertical_velocity_to_full_levels.py similarity index 89% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_contravatiant_vertical_verlocity_to_full_levels.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_contravariant_vertical_velocity_to_full_levels.py index 29a8527..adaa902 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_contravatiant_vertical_verlocity_to_full_levels.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_contravariant_vertical_velocity_to_full_levels.py @@ -21,7 +21,7 @@ @field_operator -def _interpolate_contravatiant_vertical_verlocity_to_full_levels( +def _interpolate_contravariant_vertical_velocity_to_full_levels( z_w_con_c: Field[[CellDim, KDim], vpfloat], ) -> Field[[CellDim, KDim], vpfloat]: """Formerly know as _mo_velocity_advection_stencil_15.""" @@ -30,7 +30,7 @@ def _interpolate_contravatiant_vertical_verlocity_to_full_levels( @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def interpolate_contravatiant_vertical_verlocity_to_full_levels( +def interpolate_contravariant_vertical_velocity_to_full_levels( z_w_con_c: Field[[CellDim, KDim], vpfloat], z_w_con_c_full: Field[[CellDim, KDim], vpfloat], horizontal_start: int32, @@ -38,7 +38,7 @@ def interpolate_contravatiant_vertical_verlocity_to_full_levels( vertical_start: int32, vertical_end: int32, ): - _interpolate_contravatiant_vertical_verlocity_to_full_levels( + _interpolate_contravariant_vertical_velocity_to_full_levels( z_w_con_c, out=z_w_con_c_full, domain={ diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges.py index b33ed00..1924e82 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges.py @@ -18,7 +18,9 @@ from icon4py.model.atmosphere.dycore.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_ie import _interpolate_vt_to_ie +from icon4py.model.atmosphere.dycore.interpolate_vt_to_interface_edges import ( + _interpolate_vt_to_interface_edges, +) from icon4py.model.common.dimension import EdgeDim, KDim from icon4py.model.common.settings import backend from icon4py.model.common.type_alias import vpfloat, wpfloat @@ -35,7 +37,7 @@ def _interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges( Field[[EdgeDim, KDim], vpfloat], ]: """Formerly known as _mo_solve_nonhydro_stencil_36.""" - z_vt_ie = _interpolate_vt_to_ie(wgtfac_e=wgtfac_e, vt=vt) + z_vt_ie = _interpolate_vt_to_interface_edges(wgtfac_e=wgtfac_e, vt=vt) vn_ie, z_kin_hor_e = _interpolate_vn_to_ie_and_compute_ekin_on_edges( wgtfac_e=wgtfac_e, vn=vn, vt=vt ) diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vt_to_ie.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vt_to_interface_edges.py similarity index 93% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vt_to_ie.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vt_to_interface_edges.py index 3a93051..2bf1415 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vt_to_ie.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/interpolate_vt_to_interface_edges.py @@ -21,7 +21,7 @@ @field_operator -def _interpolate_vt_to_ie( +def _interpolate_vt_to_interface_edges( wgtfac_e: Field[[EdgeDim, KDim], vpfloat], vt: Field[[EdgeDim, KDim], vpfloat], ) -> Field[[EdgeDim, KDim], vpfloat]: @@ -34,7 +34,7 @@ def _interpolate_vt_to_ie( @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def interpolate_vt_to_ie( +def interpolate_vt_to_interface_edges( wgtfac_e: Field[[EdgeDim, KDim], vpfloat], vt: Field[[EdgeDim, KDim], vpfloat], z_vt_ie: Field[[EdgeDim, KDim], vpfloat], @@ -43,7 +43,7 @@ def interpolate_vt_to_ie( vertical_start: int32, vertical_end: int32, ): - _interpolate_vt_to_ie( + _interpolate_vt_to_interface_edges( wgtfac_e, vt, out=z_vt_ie, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro.py index 4b802d3..9799c54 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro.py @@ -20,8 +20,8 @@ import icon4py.model.atmosphere.dycore.nh_solve.solve_nonhydro_program as nhsolve_prog import icon4py.model.common.constants as constants -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_wp import ( - set_cell_kdim_field_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_wp import ( + init_cell_kdim_field_with_zero_wp, ) from icon4py.model.atmosphere.dycore.accumulate_prep_adv_fields import ( @@ -82,15 +82,15 @@ from icon4py.model.atmosphere.dycore.compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates import ( compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates, ) -from icon4py.model.atmosphere.dycore.compute_horizontal_gradient_of_extner_pressure_for_multiple_levels import ( - compute_horizontal_gradient_of_extner_pressure_for_multiple_levels, +from icon4py.model.atmosphere.dycore.compute_horizontal_gradient_of_exner_pressure_for_multiple_levels import ( + compute_horizontal_gradient_of_exner_pressure_for_multiple_levels, ) from icon4py.model.atmosphere.dycore.compute_hydrostatic_correction_term import ( compute_hydrostatic_correction_term, ) from icon4py.model.atmosphere.dycore.compute_mass_flux import compute_mass_flux -from icon4py.model.atmosphere.dycore.compute_pertubation_of_rho_and_theta import ( - compute_pertubation_of_rho_and_theta, +from icon4py.model.atmosphere.dycore.compute_perturbation_of_rho_and_theta import ( + compute_perturbation_of_rho_and_theta, ) from icon4py.model.atmosphere.dycore.compute_results_for_thermodynamic_variables import ( compute_results_for_thermodynamic_variables, @@ -113,14 +113,14 @@ from icon4py.model.atmosphere.dycore.mo_math_gradients_grad_green_gauss_cell_dsl import ( mo_math_gradients_grad_green_gauss_cell_dsl, ) -from icon4py.model.atmosphere.dycore.set_two_cell_kdim_fields_to_zero_vp import ( - set_two_cell_kdim_fields_to_zero_vp, +from icon4py.model.atmosphere.dycore.init_two_cell_kdim_fields_with_zero_vp import ( + init_two_cell_kdim_fields_with_zero_vp, ) -from icon4py.model.atmosphere.dycore.set_two_cell_kdim_fields_to_zero_wp import ( - set_two_cell_kdim_fields_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_two_cell_kdim_fields_with_zero_wp import ( + init_two_cell_kdim_fields_with_zero_wp, ) -from icon4py.model.atmosphere.dycore.set_two_edge_kdim_fields_to_zero_wp import ( - set_two_edge_kdim_fields_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_two_edge_kdim_fields_with_zero_wp import ( + init_two_edge_kdim_fields_with_zero_wp, ) from icon4py.model.atmosphere.dycore.solve_tridiagonal_matrix_for_w_back_substitution import ( solve_tridiagonal_matrix_for_w_back_substitution, @@ -725,9 +725,9 @@ def run_predictor_step( # initialize nest boundary points of z_rth_pr with zero if self.grid.limited_area: - set_two_cell_kdim_fields_to_zero_vp( - cell_kdim_field_to_zero_vp_1=self.z_rth_pr_1, - cell_kdim_field_to_zero_vp_2=self.z_rth_pr_2, + init_two_cell_kdim_fields_with_zero_vp( + cell_kdim_field_with_zero_vp_1=self.z_rth_pr_1, + cell_kdim_field_with_zero_vp_2=self.z_rth_pr_2, horizontal_start=start_cell_lb, horizontal_end=end_cell_end, vertical_start=0, @@ -830,7 +830,7 @@ def run_predictor_step( # Add computation of z_grad_rth (perturbation density and virtual potential temperature at main levels) # at outer halo points: needed for correct calculation of the upwind gradients for Miura scheme - compute_pertubation_of_rho_and_theta( + compute_perturbation_of_rho_and_theta( rho=prognostic_state[nnow].rho, rho_ref_mc=self.metric_state_nonhydro.rho_ref_mc, theta_v=prognostic_state[nnow].theta_v, @@ -884,9 +884,9 @@ def run_predictor_step( offset_provider=self.grid.offset_providers, ) if self.config.iadv_rhotheta <= 2: - set_two_edge_kdim_fields_to_zero_wp( - edge_kdim_field_to_zero_wp_1=z_fields.z_rho_e, - edge_kdim_field_to_zero_wp_2=z_fields.z_theta_v_e, + init_two_edge_kdim_fields_with_zero_wp( + edge_kdim_field_with_zero_wp_1=z_fields.z_rho_e, + edge_kdim_field_with_zero_wp_2=z_fields.z_theta_v_e, horizontal_start=start_edge_local_minus2, horizontal_end=end_edge_local_minus2, vertical_start=0, @@ -895,9 +895,9 @@ def run_predictor_step( ) # initialize also nest boundary points with zero if self.grid.limited_area: - set_two_edge_kdim_fields_to_zero_wp( - edge_kdim_field_to_zero_wp_1=z_fields.z_rho_e, - edge_kdim_field_to_zero_wp_2=z_fields.z_theta_v_e, + init_two_edge_kdim_fields_with_zero_wp( + edge_kdim_field_with_zero_wp_1=z_fields.z_rho_e, + edge_kdim_field_with_zero_wp_2=z_fields.z_theta_v_e, horizontal_start=start_edge_lb, horizontal_end=end_edge_local_minus1, vertical_start=0, @@ -966,7 +966,7 @@ def run_predictor_step( offset_provider=self.grid.offset_providers, ) - compute_horizontal_gradient_of_extner_pressure_for_multiple_levels( + compute_horizontal_gradient_of_exner_pressure_for_multiple_levels( inv_dual_edge_length=self.edge_geometry.inverse_dual_edge_lengths, z_exner_ex_pr=self.z_exner_ex_pr, zdiff_gradp=self.metric_state_nonhydro.zdiff_gradp, @@ -1181,9 +1181,9 @@ def run_predictor_step( ) if not self.l_vert_nested: - set_two_cell_kdim_fields_to_zero_wp( - cell_kdim_field_to_zero_wp_1=prognostic_state[nnew].w, - cell_kdim_field_to_zero_wp_2=z_fields.z_contr_w_fl_l, + init_two_cell_kdim_fields_with_zero_wp( + cell_kdim_field_with_zero_wp_1=prognostic_state[nnew].w, + cell_kdim_field_with_zero_wp_2=z_fields.z_contr_w_fl_l, horizontal_start=start_cell_nudging, horizontal_end=end_cell_local, vertical_start=0, @@ -1621,9 +1621,9 @@ def run_corrector_step( log.debug("corrector: doing prep advection") if lclean_mflx: log.debug("corrector: start stencil 33") - set_two_edge_kdim_fields_to_zero_wp( - edge_kdim_field_to_zero_wp_1=prep_adv.vn_traj, - edge_kdim_field_to_zero_wp_2=prep_adv.mass_flx_me, + init_two_edge_kdim_fields_with_zero_wp( + edge_kdim_field_with_zero_wp_1=prep_adv.vn_traj, + edge_kdim_field_with_zero_wp_2=prep_adv.mass_flx_me, horizontal_start=start_edge_lb, horizontal_end=end_edge_end, vertical_start=0, @@ -1727,9 +1727,9 @@ def run_corrector_step( offset_provider={}, ) if not self.l_vert_nested: - set_two_cell_kdim_fields_to_zero_wp( - cell_kdim_field_to_zero_wp_1=prognostic_state[nnew].w, - cell_kdim_field_to_zero_wp_2=z_fields.z_contr_w_fl_l, + init_two_cell_kdim_fields_with_zero_wp( + cell_kdim_field_with_zero_wp_1=prognostic_state[nnew].w, + cell_kdim_field_with_zero_wp_2=z_fields.z_contr_w_fl_l, horizontal_start=start_cell_nudging, horizontal_end=end_cell_local, vertical_start=0, @@ -1850,7 +1850,7 @@ def run_corrector_step( if lprep_adv: if lclean_mflx: log.debug(f"corrector set prep_adv.mass_flx_ic to zero") - set_two_cell_kdim_fields_to_zero_wp( + init_two_cell_kdim_fields_with_zero_wp( prep_adv.mass_flx_ic, prep_adv.vol_flx_ic, horizontal_start=start_cell_nudging, @@ -1891,8 +1891,8 @@ def run_corrector_step( if lprep_adv: if lclean_mflx: log.debug(f"corrector set prep_adv.mass_flx_ic to zero") - set_cell_kdim_field_to_zero_wp( - field_to_zero_wp=prep_adv.mass_flx_ic, + init_cell_kdim_field_with_zero_wp( + field_with_zero_wp=prep_adv.mass_flx_ic, horizontal_start=start_cell_lb, horizontal_end=end_cell_nudging, vertical_start=0, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro_program.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro_program.py index c51edcc..2fb74f7 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro_program.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/nh_solve/solve_nonhydro_program.py @@ -41,11 +41,11 @@ from icon4py.model.atmosphere.dycore.compute_horizontal_kinetic_energy import ( _compute_horizontal_kinetic_energy, ) -from icon4py.model.atmosphere.dycore.compute_pertubation_of_rho_and_theta import ( - _compute_pertubation_of_rho_and_theta, +from icon4py.model.atmosphere.dycore.compute_perturbation_of_rho_and_theta import ( + _compute_perturbation_of_rho_and_theta, ) -from icon4py.model.atmosphere.dycore.compute_pertubation_of_rho_and_theta_and_rho_at_ic import ( - _compute_pertubation_of_rho_and_theta_and_rho_at_ic, +from icon4py.model.atmosphere.dycore.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 ( _compute_solver_coefficients_matrix, @@ -57,6 +57,12 @@ from icon4py.model.atmosphere.dycore.extrapolate_temporally_exner_pressure import ( _extrapolate_temporally_exner_pressure, ) +from icon4py.model.atmosphere.dycore.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 ( + _init_cell_kdim_field_with_zero_wp, +) from icon4py.model.atmosphere.dycore.interpolate_to_half_levels_vp import ( _interpolate_to_half_levels_vp, ) @@ -64,12 +70,6 @@ from icon4py.model.atmosphere.dycore.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_cell_kdim_field_to_zero_vp import ( - _set_cell_kdim_field_to_zero_vp, -) -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_wp import ( - _set_cell_kdim_field_to_zero_wp, -) from icon4py.model.atmosphere.dycore.set_lower_boundary_condition_for_w_and_contravariant_correction import ( _set_lower_boundary_condition_for_w_and_contravariant_correction, ) @@ -79,7 +79,7 @@ from icon4py.model.atmosphere.dycore.state_utils.utils import ( _broadcast_zero_to_three_edge_kdim_fields_wp, ) -from icon4py.model.atmosphere.dycore.update_densety_exener_wind import _update_densety_exener_wind +from icon4py.model.atmosphere.dycore.update_density_exner_wind import _update_density_exner_wind from icon4py.model.atmosphere.dycore.update_wind import _update_wind from icon4py.model.common.dimension import CEDim, CellDim, ECDim, EdgeDim, KDim from icon4py.model.common.settings import backend @@ -102,8 +102,7 @@ def init_test_fields( out=(z_rho_e, z_theta_v_e, z_graddiv_vn), domain={EdgeDim: (indices_edges_1, indices_edges_2), KDim: (0, nlev)}, ) - - _set_cell_kdim_field_to_zero_wp( + _init_cell_kdim_field_with_zero_wp( out=z_dwdz_dd, domain={CellDim: (indices_cells_1, indices_cells_2), KDim: (0, nlev)}, ) @@ -124,7 +123,7 @@ def _predictor_stencils_2_3( _extrapolate_temporally_exner_pressure(exner_exfac, exner, exner_ref_mc, exner_pr), (z_exner_ex_pr, exner_pr), ) - z_exner_ex_pr = where(k_field == nlev, _set_cell_kdim_field_to_zero_wp(), z_exner_ex_pr) + z_exner_ex_pr = where(k_field == nlev, _init_cell_kdim_field_with_zero_wp(), z_exner_ex_pr) return z_exner_ex_pr, exner_pr @@ -255,13 +254,13 @@ def _predictor_stencils_7_8_9( ]: (z_rth_pr_1, z_rth_pr_2) = where( k_field == int32(0), - _compute_pertubation_of_rho_and_theta(rho, rho_ref_mc, theta_v, theta_ref_mc), + _compute_perturbation_of_rho_and_theta(rho, rho_ref_mc, theta_v, theta_ref_mc), (z_rth_pr_1, z_rth_pr_2), ) (rho_ic, z_rth_pr_1, z_rth_pr_2) = where( k_field >= int32(1), - _compute_pertubation_of_rho_and_theta_and_rho_at_ic( + _compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers( wgtfac_c, rho, rho_ref_mc, theta_v, theta_ref_mc ), (rho_ic, z_rth_pr_1, z_rth_pr_2), @@ -351,7 +350,9 @@ def _predictor_stencils_11_lower_upper( k_field: Field[[KDim], int32], nlev: int32, ) -> tuple[Field[[CellDim, KDim], float], Field[[CellDim, KDim], float]]: - z_theta_v_pr_ic = where(k_field == int32(0), _set_cell_kdim_field_to_zero_vp(), z_theta_v_pr_ic) + z_theta_v_pr_ic = where( + k_field == int32(0), _init_cell_kdim_field_with_zero_vp(), z_theta_v_pr_ic + ) (z_theta_v_pr_ic, theta_v_ic) = where( k_field == nlev, @@ -675,9 +676,9 @@ def _stencils_42_44_45_45b( ), (z_beta, z_alpha), ) - z_alpha = where(k_field == nlev, _set_cell_kdim_field_to_zero_vp(), z_alpha) + z_alpha = where(k_field == nlev, _init_cell_kdim_field_with_zero_vp(), z_alpha) - z_q = where(k_field == int32(0), _set_cell_kdim_field_to_zero_vp(), z_q) + z_q = where(k_field == int32(0), _init_cell_kdim_field_with_zero_vp(), z_q) return z_w_expl, z_contr_w_fl_l, z_beta, z_alpha, z_q @@ -811,8 +812,8 @@ def _stencils_43_44_45_45b( ), (z_beta, z_alpha), ) - z_alpha = where(k_field == nlev, _set_cell_kdim_field_to_zero_vp(), z_alpha) - z_q = where(k_field == int32(0), _set_cell_kdim_field_to_zero_vp(), z_q) + z_alpha = where(k_field == nlev, _init_cell_kdim_field_with_zero_vp(), z_alpha) + z_q = where(k_field == int32(0), _init_cell_kdim_field_with_zero_vp(), z_q) return z_w_expl, z_contr_w_fl_l, z_beta, z_alpha, z_q @@ -997,7 +998,7 @@ def _stencils_61_62( ]: (rho_new, exner_new, w_new) = where( (k_field >= int32(0)) & (k_field < nlev), - _update_densety_exener_wind( + _update_density_exner_wind( rho_now, grf_tend_rho, theta_v_now, grf_tend_thv, w_now, grf_tend_w, dtime ), (rho_new, exner_new, w_new), diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_lower_boundary_condition_for_w_and_contravariant_correction.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_lower_boundary_condition_for_w_and_contravariant_correction.py index d4bf7ad..de21ebe 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_lower_boundary_condition_for_w_and_contravariant_correction.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/set_lower_boundary_condition_for_w_and_contravariant_correction.py @@ -15,8 +15,8 @@ from gt4py.next.ffront.decorator import field_operator, program from gt4py.next.ffront.fbuiltins import Field, astype, int32 -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_wp import ( - _set_cell_kdim_field_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_wp import ( + _init_cell_kdim_field_with_zero_wp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.settings import backend @@ -31,7 +31,7 @@ def _set_lower_boundary_condition_for_w_and_contravariant_correction( w_concorr_c_wp = astype(w_concorr_c, wpfloat) w_nnew_wp = w_concorr_c_wp - z_contr_w_fl_l_wp = _set_cell_kdim_field_to_zero_wp() + z_contr_w_fl_l_wp = _init_cell_kdim_field_with_zero_wp() return w_nnew_wp, z_contr_w_fl_l_wp diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/update_densety_exener_wind.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/update_density_exner_wind.py similarity index 96% rename from model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/update_densety_exener_wind.py rename to model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/update_density_exner_wind.py index ab9c46d..f9da895 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/update_densety_exener_wind.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/update_density_exner_wind.py @@ -22,7 +22,7 @@ @field_operator -def _update_densety_exener_wind( +def _update_density_exner_wind( rho_now: Field[[CellDim, KDim], wpfloat], grf_tend_rho: Field[[CellDim, KDim], wpfloat], theta_v_now: Field[[CellDim, KDim], wpfloat], @@ -43,7 +43,7 @@ def _update_densety_exener_wind( @program(grid_type=GridType.UNSTRUCTURED, backend=backend) -def update_densety_exener_wind( +def update_density_exner_wind( rho_now: Field[[CellDim, KDim], wpfloat], grf_tend_rho: Field[[CellDim, KDim], wpfloat], theta_v_now: Field[[CellDim, KDim], wpfloat], @@ -59,7 +59,7 @@ def update_densety_exener_wind( vertical_start: int32, vertical_end: int32, ): - _update_densety_exener_wind( + _update_density_exner_wind( rho_now, grf_tend_rho, theta_v_now, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/velocity/velocity_advection.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/velocity/velocity_advection.py index 721e816..c52f455 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/velocity/velocity_advection.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/velocity/velocity_advection.py @@ -17,12 +17,12 @@ from gt4py.next.iterator.builtins import int32 import icon4py.model.atmosphere.dycore.velocity.velocity_advection_program as velocity_prog +from icon4py.model.atmosphere.dycore.add_extra_diffusion_for_normal_wind_tendency_approaching_cfl import ( + add_extra_diffusion_for_normal_wind_tendency_approaching_cfl, +) from icon4py.model.atmosphere.dycore.add_extra_diffusion_for_w_con_approaching_cfl import ( add_extra_diffusion_for_w_con_approaching_cfl, ) -from icon4py.model.atmosphere.dycore.add_extra_diffusion_for_wn_approaching_cfl import ( - add_extra_diffusion_for_wn_approaching_cfl, -) from icon4py.model.atmosphere.dycore.compute_advective_normal_wind_tendency import ( compute_advective_normal_wind_tendency, ) @@ -30,14 +30,16 @@ compute_horizontal_advection_term_for_vertical_velocity, ) from icon4py.model.atmosphere.dycore.compute_tangential_wind import compute_tangential_wind -from icon4py.model.atmosphere.dycore.interpolate_contravatiant_vertical_verlocity_to_full_levels import ( - interpolate_contravatiant_vertical_verlocity_to_full_levels, +from icon4py.model.atmosphere.dycore.interpolate_contravariant_vertical_velocity_to_full_levels import ( + interpolate_contravariant_vertical_velocity_to_full_levels, ) from icon4py.model.atmosphere.dycore.interpolate_to_cell_center import interpolate_to_cell_center from icon4py.model.atmosphere.dycore.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_ie import interpolate_vt_to_ie +from icon4py.model.atmosphere.dycore.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 ( mo_icon_interpolation_scalar_cells2verts_scalar_ri_dsl, ) @@ -196,7 +198,7 @@ def run_predictor_step( ) if not vn_only: - interpolate_vt_to_ie( + interpolate_vt_to_interface_edges( wgtfac_e=self.metric_state.wgtfac_e, vt=diagnostic_state.vt, z_vt_ie=z_vt_ie, @@ -310,7 +312,7 @@ def run_predictor_step( self._update_levmask_from_cfl_clipping() - interpolate_contravatiant_vertical_verlocity_to_full_levels( + interpolate_contravariant_vertical_velocity_to_full_levels( z_w_con_c=self.z_w_con_c, z_w_con_c_full=self.z_w_con_c_full, horizontal_start=start_cell_lb_plus3, @@ -377,7 +379,7 @@ def run_predictor_step( offset_provider=self.grid.offset_providers, ) - add_extra_diffusion_for_wn_approaching_cfl( + add_extra_diffusion_for_normal_wind_tendency_approaching_cfl( levelmask=self.levelmask, c_lin_e=self.interpolation_state.c_lin_e, z_w_con_c_full=self.z_w_con_c_full, @@ -532,7 +534,7 @@ def run_corrector_step( self._update_levmask_from_cfl_clipping() - interpolate_contravatiant_vertical_verlocity_to_full_levels( + interpolate_contravariant_vertical_velocity_to_full_levels( z_w_con_c=self.z_w_con_c, z_w_con_c_full=self.z_w_con_c_full, horizontal_start=start_cell_lb_plus3, @@ -599,7 +601,7 @@ def run_corrector_step( offset_provider=self.grid.offset_providers, ) - add_extra_diffusion_for_wn_approaching_cfl( + add_extra_diffusion_for_normal_wind_tendency_approaching_cfl( levelmask=self.levelmask, c_lin_e=self.interpolation_state.c_lin_e, z_w_con_c_full=self.z_w_con_c_full, diff --git a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/velocity/velocity_advection_program.py b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/velocity/velocity_advection_program.py index 386a365..a3751ee 100644 --- a/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/velocity/velocity_advection_program.py +++ b/model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/velocity/velocity_advection_program.py @@ -34,13 +34,13 @@ _correct_contravariant_vertical_velocity, ) from icon4py.model.atmosphere.dycore.extrapolate_at_top import _extrapolate_at_top +from icon4py.model.atmosphere.dycore.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 ( _interpolate_to_half_levels_vp, ) -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_vp import ( - _set_cell_kdim_field_to_zero_vp, -) from icon4py.model.common.dimension import CEDim, CellDim, EdgeDim, KDim from icon4py.model.common.settings import backend @@ -211,7 +211,7 @@ def _fused_stencils_11_to_13( local_z_w_con_c, ) - local_z_w_con_c = where(k_field == nlev, _set_cell_kdim_field_to_zero_vp(), local_z_w_con_c) + local_z_w_con_c = where(k_field == nlev, _init_cell_kdim_field_with_zero_vp(), local_z_w_con_c) local_z_w_con_c = where( (k_field >= (nflatlev_startindex + int32(1))) & (k_field < nlev), diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_accumulate_prep_adv_fields.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_accumulate_prep_adv_fields.py index 82db2bf..fd62b0e 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_accumulate_prep_adv_fields.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_accumulate_prep_adv_fields.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil34(StencilTest): +class TestAccumulatePrepAdvFields(StencilTest): PROGRAM = accumulate_prep_adv_fields OUTPUTS = ("vn_traj", "mass_flx_me") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_analysis_increments_from_data_assimilation.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_analysis_increments_from_data_assimilation.py index 0fcf919..96066be 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_analysis_increments_from_data_assimilation.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_analysis_increments_from_data_assimilation.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil50(StencilTest): +class TestAddAnalysisIncrementsFromDataAssimilation(StencilTest): PROGRAM = add_analysis_increments_from_data_assimilation OUTPUTS = ("z_rho_expl", "z_exner_expl") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_analysis_increments_to_vn.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_analysis_increments_to_vn.py index ecea026..533ac55 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_analysis_increments_to_vn.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_analysis_increments_to_vn.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil28(StencilTest): +class TestAddAnalysisIncrementsToVn(StencilTest): PROGRAM = add_analysis_increments_to_vn OUTPUTS = ("vn",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_wn_approaching_cfl.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_normal_wind_tendency_approaching_cfl.py similarity index 92% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_wn_approaching_cfl.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_normal_wind_tendency_approaching_cfl.py index f06de67..e6266ec 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_wn_approaching_cfl.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_normal_wind_tendency_approaching_cfl.py @@ -15,8 +15,8 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.add_extra_diffusion_for_wn_approaching_cfl import ( - add_extra_diffusion_for_wn_approaching_cfl, +from icon4py.model.atmosphere.dycore.add_extra_diffusion_for_normal_wind_tendency_approaching_cfl import ( + add_extra_diffusion_for_normal_wind_tendency_approaching_cfl, ) from icon4py.model.common.dimension import ( CellDim, @@ -31,7 +31,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -def add_extra_diffusion_for_wn_approaching_cfl_numpy( +def add_extra_diffusion_for_normal_wind_tendency_approaching_cfl_numpy( grid, levelmask: np.array, c_lin_e: np.array, @@ -106,8 +106,8 @@ def add_extra_diffusion_for_wn_approaching_cfl_numpy( return ddt_vn_apc -class TestMoVelocityAdvectionStencil20(StencilTest): - PROGRAM = add_extra_diffusion_for_wn_approaching_cfl +class TestAddExtraDiffusionForNormalWindTendencyApproachingCfl(StencilTest): + PROGRAM = add_extra_diffusion_for_normal_wind_tendency_approaching_cfl OUTPUTS = ("ddt_vn_apc",) @pytest.fixture @@ -166,7 +166,7 @@ def reference( dtime, **kwargs, ) -> dict: - ddt_vn_apc = add_extra_diffusion_for_wn_approaching_cfl_numpy( + ddt_vn_apc = add_extra_diffusion_for_normal_wind_tendency_approaching_cfl_numpy( grid, levelmask, c_lin_e, diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_w_con_approaching_cfl.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_w_con_approaching_cfl.py index efef8b3..ab1dfe5 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_w_con_approaching_cfl.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_extra_diffusion_for_w_con_approaching_cfl.py @@ -71,7 +71,7 @@ def add_extra_diffusion_for_w_con_approaching_cfl_numpy( return ddt_w_adv -class TestMoVelocityAdvectionStencil18(StencilTest): +class TestAddExtraDiffusionForWConApproachingCfl(StencilTest): PROGRAM = add_extra_diffusion_for_w_con_approaching_cfl OUTPUTS = ("ddt_w_adv",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_interpolated_horizontal_advection_of_w.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_interpolated_horizontal_advection_of_w.py index 24aace1..a8ae9fc 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_interpolated_horizontal_advection_of_w.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_interpolated_horizontal_advection_of_w.py @@ -34,7 +34,7 @@ def add_interpolated_horizontal_advection_of_w_numpy( return ddt_w_adv -class TestMoVelocityAdvectionStencil17(StencilTest): +class TestAddInterpolatedHorizontalAdvectionOfW(StencilTest): PROGRAM = add_interpolated_horizontal_advection_of_w OUTPUTS = ("ddt_w_adv",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_temporal_tendencies_to_vn.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_temporal_tendencies_to_vn.py index 12760c2..5e80f37 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_temporal_tendencies_to_vn.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_temporal_tendencies_to_vn.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil24(StencilTest): +class TestAddTemporalTendenciesToVn(StencilTest): PROGRAM = add_temporal_tendencies_to_vn OUTPUTS = ("vn_nnew",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_temporal_tendencies_to_vn_by_interpolating_between_time_levels.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_temporal_tendencies_to_vn_by_interpolating_between_time_levels.py index b9a0c32..de9359d 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_temporal_tendencies_to_vn_by_interpolating_between_time_levels.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_temporal_tendencies_to_vn_by_interpolating_between_time_levels.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil23(StencilTest): +class TestAddTemporalTendenciesToVnByInterpolatingBetweenTimeLevels(StencilTest): PROGRAM = add_temporal_tendencies_to_vn_by_interpolating_between_time_levels OUTPUTS = ("vn_nnew",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_vertical_wind_derivative_to_divergence_damping.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_vertical_wind_derivative_to_divergence_damping.py index 71812c8..1448236 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_vertical_wind_derivative_to_divergence_damping.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_vertical_wind_derivative_to_divergence_damping.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil17(StencilTest): +class TestAddVerticalWindDerivativeToDivergenceDamping(StencilTest): PROGRAM = add_vertical_wind_derivative_to_divergence_damping OUTPUTS = ("z_graddiv_vn",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_2nd_order_divergence_damping.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_2nd_order_divergence_damping.py index 2823dc9..3e10b25 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_2nd_order_divergence_damping.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_2nd_order_divergence_damping.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil26(StencilTest): +class TestApply2ndOrderDivergenceDamping(StencilTest): PROGRAM = apply_2nd_order_divergence_damping OUTPUTS = ("vn",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_4th_order_divergence_damping.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_4th_order_divergence_damping.py index 8a173ff..72caaed 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_4th_order_divergence_damping.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_4th_order_divergence_damping.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydro4thOrderDivdamp(StencilTest): +class TestApply4thOrderDivergenceDamping(StencilTest): PROGRAM = apply_4th_order_divergence_damping OUTPUTS = ("vn",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_hydrostatic_correction_to_horizontal_gradient_of_exner_pressure.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_hydrostatic_correction_to_horizontal_gradient_of_exner_pressure.py index 6b88ac6..26e48e1 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_hydrostatic_correction_to_horizontal_gradient_of_exner_pressure.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_hydrostatic_correction_to_horizontal_gradient_of_exner_pressure.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat -class TestMoSolveNonhydroStencil22(StencilTest): +class TestApplyHydrostaticCorrectionToHorizontalGradientOfExnerPressure(StencilTest): PROGRAM = apply_hydrostatic_correction_to_horizontal_gradient_of_exner_pressure OUTPUTS = ("z_gradh_exner",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_rayleigh_damping_mechanism.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_rayleigh_damping_mechanism.py index c6fd9f9..fb0cf09 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_rayleigh_damping_mechanism.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_rayleigh_damping_mechanism.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil54(StencilTest): +class TestApplyRayleighDampingMechanism(StencilTest): PROGRAM = apply_rayleigh_damping_mechanism OUTPUTS = ("w",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_weighted_2nd_and_4th_order_divergence_damping.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_weighted_2nd_and_4th_order_divergence_damping.py index cfce66f..2e66c0c 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_weighted_2nd_and_4th_order_divergence_damping.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_apply_weighted_2nd_and_4th_order_divergence_damping.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil27(StencilTest): +class TestApplyWeighted2ndAnd4thOrderDivergenceDamping(StencilTest): PROGRAM = apply_weighted_2nd_and_4th_order_divergence_damping OUTPUTS = ("vn",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_normal_wind_tendency.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_normal_wind_tendency.py index 479e904..3b21e8b 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_normal_wind_tendency.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_normal_wind_tendency.py @@ -59,7 +59,7 @@ def compute_advective_normal_wind_tendency_numpy( return ddt_vn_apc -class TestMoVelocityAdvectionStencil19(StencilTest): +class TestComputeAdvectiveNormalWindTendency(StencilTest): PROGRAM = compute_advective_normal_wind_tendency OUTPUTS = ("ddt_vn_apc",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_vertical_wind_tendency.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_vertical_wind_tendency.py index d4e8a44..6c93461 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_vertical_wind_tendency.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_vertical_wind_tendency.py @@ -39,7 +39,7 @@ def compute_advective_vertical_wind_tendency_numpy( return ddt_w_adv -class TestMoVelocityAdvectionStencil16(StencilTest): +class TestComputeAdvectiveVerticalWindTendency(StencilTest): PROGRAM = compute_advective_vertical_wind_tendency OUTPUTS = ("ddt_w_adv",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_approx_of_2nd_vertical_derivative_of_exner.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_approx_of_2nd_vertical_derivative_of_exner.py index ce87426..83e0e14 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_approx_of_2nd_vertical_derivative_of_exner.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_approx_of_2nd_vertical_derivative_of_exner.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat -class TestMoSolveNonhydroStencil12(StencilTest): +class TestComputeApproxOf2ndVerticalDerivativeOfExner(StencilTest): PROGRAM = compute_approx_of_2nd_vertical_derivative_of_exner OUTPUTS = ("z_dexner_dz_c_2",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_avg_vn.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_avg_vn.py index 065b7c5..03645a5 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_avg_vn.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_avg_vn.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil31(StencilTest): +class TestComputeAvgVn(StencilTest): PROGRAM = compute_avg_vn OUTPUTS = ("z_vn_avg",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_avg_vn_and_graddiv_vn_and_vt.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_avg_vn_and_graddiv_vn_and_vt.py index 8af31a0..3887347 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_avg_vn_and_graddiv_vn_and_vt.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_avg_vn_and_graddiv_vn_and_vt.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil30(StencilTest): +class TestComputeAvgVnAndGraddivVnAndVt(StencilTest): PROGRAM = compute_avg_vn_and_graddiv_vn_and_vt OUTPUTS = ("z_vn_avg", "z_graddiv_vn", "vt") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction.py index d9fb9a0..d6f29df 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction.py @@ -30,7 +30,7 @@ def compute_contravariant_correction_numpy( return z_w_concorr_me -class TestMoSolveNonhydroStencil35(StencilTest): +class TestComputeContravariantCorrection(StencilTest): PROGRAM = compute_contravariant_correction OUTPUTS = ("z_w_concorr_me",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction_of_w.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction_of_w.py index cffb524..c69993b 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction_of_w.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction_of_w.py @@ -39,7 +39,7 @@ def compute_contravariant_correction_of_w_numpy( return w_concorr_c -class TestMoSolveNonhydroStencil39(StencilTest): +class TestComputeContravariantCorrectionOfW(StencilTest): PROGRAM = compute_contravariant_correction_of_w OUTPUTS = ("w_concorr_c",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction_of_w_for_lower_boundary.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction_of_w_for_lower_boundary.py index 940abe2..d3a6953 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction_of_w_for_lower_boundary.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_contravariant_correction_of_w_for_lower_boundary.py @@ -49,7 +49,7 @@ def compute_contravariant_correction_of_w_for_lower_boundary_numpy( return w_concorr_c -class TestMoSolveNonhydroStencil40(StencilTest): +class TestComputeContravariantCorrectionOfWForLowerBoundary(StencilTest): PROGRAM = compute_contravariant_correction_of_w_for_lower_boundary OUTPUTS = ("w_concorr_c",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_dwdz_for_divergence_damping.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_dwdz_for_divergence_damping.py index 7c7e70a..33a0025 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_dwdz_for_divergence_damping.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_dwdz_for_divergence_damping.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil5663(StencilTest): +class TestComputeDwdzForDivergenceDamping(StencilTest): PROGRAM = compute_dwdz_for_divergence_damping OUTPUTS = ("z_dwdz_dd",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_exner_from_rhotheta.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_exner_from_rhotheta.py index 9eebc5d..4a106dd 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_exner_from_rhotheta.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_exner_from_rhotheta.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil67(StencilTest): +class TestComputeExnerFromRhotheta(StencilTest): PROGRAM = compute_exner_from_rhotheta OUTPUTS = ("theta_v", "exner") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_part_for_rho_and_exner.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_part_for_rho_and_exner.py index 03a2f97..54d3972 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_part_for_rho_and_exner.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_part_for_rho_and_exner.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil48(StencilTest): +class TestComputeExplicitPartForRhoAndExner(StencilTest): PROGRAM = compute_explicit_part_for_rho_and_exner OUTPUTS = ("z_rho_expl", "z_exner_expl") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_vertical_wind_from_advection_and_vertical_wind_density.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_vertical_wind_from_advection_and_vertical_wind_density.py index f7aa8d7..7069073 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_vertical_wind_from_advection_and_vertical_wind_density.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_vertical_wind_from_advection_and_vertical_wind_density.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil42(StencilTest): +class TestComputeExplicitVerticalWindFromAdvectionAndVerticalWindDensity(StencilTest): PROGRAM = compute_explicit_vertical_wind_from_advection_and_vertical_wind_density OUTPUTS = ("z_w_expl", "z_contr_w_fl_l") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_vertical_wind_speed_and_vertical_wind_times_density.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_vertical_wind_speed_and_vertical_wind_times_density.py index 5614807..5436690 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_vertical_wind_speed_and_vertical_wind_times_density.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_explicit_vertical_wind_speed_and_vertical_wind_times_density.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil43(StencilTest): +class TestComputeExplicitVerticalWindSpeedAndVerticalWindTimesDensity(StencilTest): PROGRAM = compute_explicit_vertical_wind_speed_and_vertical_wind_times_density OUTPUTS = ("z_w_expl", "z_contr_w_fl_l") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_first_vertical_derivative.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_first_vertical_derivative.py index f0d4165..5fa2888 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_first_vertical_derivative.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_first_vertical_derivative.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat -class TestMoSolveNonhydroStencil06(StencilTest): +class TestComputeFirstVerticalDerivative(StencilTest): PROGRAM = compute_first_vertical_derivative OUTPUTS = ("z_dexner_dz_c_1",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_graddiv2_of_vn.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_graddiv2_of_vn.py index 4a685ff..2a4e9c0 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_graddiv2_of_vn.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_graddiv2_of_vn.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil25(StencilTest): +class TestComputeGraddiv2OfVn(StencilTest): PROGRAM = compute_graddiv2_of_vn OUTPUTS = ("z_graddiv2_vn",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_advection_term_for_vertical_velocity.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_advection_term_for_vertical_velocity.py index 6c59db2..9323095 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_advection_term_for_vertical_velocity.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_advection_term_for_vertical_velocity.py @@ -50,7 +50,7 @@ def compute_horizontal_advection_term_for_vertical_velocity_numpy( return z_v_grad_w -class TestMoVelocityAdvectionStencil07(StencilTest): +class TestComputeHorizontalAdvectionTermForVerticalVelocity(StencilTest): PROGRAM = compute_horizontal_advection_term_for_vertical_velocity OUTPUTS = ("z_v_grad_w",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py index a9d3974..d994f9b 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil18(StencilTest): +class TestComputeHorizontalGradientOfExnerPressureForFlatCoordinates(StencilTest): PROGRAM = compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates OUTPUTS = ("z_gradh_exner",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_extner_pressure_for_multiple_levels.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py similarity index 94% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_extner_pressure_for_multiple_levels.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py index f45ba1f..0186ec3 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_extner_pressure_for_multiple_levels.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py @@ -15,8 +15,8 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.compute_horizontal_gradient_of_extner_pressure_for_multiple_levels import ( - compute_horizontal_gradient_of_extner_pressure_for_multiple_levels, +from icon4py.model.atmosphere.dycore.compute_horizontal_gradient_of_exner_pressure_for_multiple_levels import ( + compute_horizontal_gradient_of_exner_pressure_for_multiple_levels, ) from icon4py.model.common.dimension import CellDim, E2CDim, ECDim, EdgeDim, KDim from icon4py.model.common.test_utils.helpers import ( @@ -28,8 +28,8 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonHydroStencil20(StencilTest): - PROGRAM = compute_horizontal_gradient_of_extner_pressure_for_multiple_levels +class TestComputeHorizontalGradientOfExnerPressureForMultipleLevels(StencilTest): + PROGRAM = compute_horizontal_gradient_of_exner_pressure_for_multiple_levels OUTPUTS = ("z_gradh_exner",) @staticmethod diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates.py index 9e869aa..a487242 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil19(StencilTest): +class TestComputeHorizontalGradientOfExnerPressureForNonflatCoordinates(StencilTest): PROGRAM = compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates OUTPUTS = ("z_gradh_exner",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_kinetic_energy.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_kinetic_energy.py index b9b6a75..59e04a8 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_kinetic_energy.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_kinetic_energy.py @@ -30,7 +30,7 @@ def compute_horizontal_kinetic_energy_numpy(vn: np.array, vt: np.array) -> tuple return vn_ie, z_vt_ie, z_kin_hor_e -class TestMoVelocityAdvectionStencil05(StencilTest): +class TestComputeHorizontalKineticEnergy(StencilTest): PROGRAM = compute_horizontal_kinetic_energy OUTPUTS = ("vn_ie", "z_vt_ie", "z_kin_hor_e") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_hydrostatic_correction_term.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_hydrostatic_correction_term.py index 656b6ea..a2dcd26 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_hydrostatic_correction_term.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_hydrostatic_correction_term.py @@ -28,7 +28,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonHydroStencil21(StencilTest): +class TestComputeHydrostaticCorrectionTerm(StencilTest): OUTPUTS = ("z_hydro_corr",) PROGRAM = compute_hydrostatic_correction_term diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_mass_flux.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_mass_flux.py index 8482ee2..0f9fb7f 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_mass_flux.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_mass_flux.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil32(StencilTest): +class TestComputeMassFlux(StencilTest): PROGRAM = compute_mass_flux OUTPUTS = ("mass_fl_e", "z_theta_v_fl_e") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_maximum_cfl_and_clip_contravariant_vertical_velocity.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_maximum_cfl_and_clip_contravariant_vertical_velocity.py index 8e66384..940b8bf 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_maximum_cfl_and_clip_contravariant_vertical_velocity.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_maximum_cfl_and_clip_contravariant_vertical_velocity.py @@ -51,7 +51,7 @@ def compute_maximum_cfl_and_clip_contravariant_vertical_velocity_numpy( return cfl_clipping, vcfl, z_w_con_c -class TestMoVelocityAdvectionStencil14(StencilTest): +class TestComputeMaximumCflAndClipContravariantVerticalVelocity(StencilTest): PROGRAM = compute_maximum_cfl_and_clip_contravariant_vertical_velocity OUTPUTS = ("cfl_clipping", "vcfl", "z_w_con_c") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_pertubation_of_rho_and_theta.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_perturbation_of_rho_and_theta.py similarity index 89% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_pertubation_of_rho_and_theta.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_perturbation_of_rho_and_theta.py index 189851e..c82bedd 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_pertubation_of_rho_and_theta.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_perturbation_of_rho_and_theta.py @@ -15,16 +15,16 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.compute_pertubation_of_rho_and_theta import ( - compute_pertubation_of_rho_and_theta, +from icon4py.model.atmosphere.dycore.compute_perturbation_of_rho_and_theta import ( + compute_perturbation_of_rho_and_theta, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field, zero_field from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil07(StencilTest): - PROGRAM = compute_pertubation_of_rho_and_theta +class TestComputePerturbationOfRhoAndTheta(StencilTest): + PROGRAM = compute_perturbation_of_rho_and_theta OUTPUTS = ("z_rth_pr_1", "z_rth_pr_2") @staticmethod diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_pertubation_of_rho_and_theta_and_rho_at_ic.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers.py similarity index 87% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_pertubation_of_rho_and_theta_and_rho_at_ic.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers.py index c11063b..0fd1de6 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_pertubation_of_rho_and_theta_and_rho_at_ic.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers.py @@ -15,16 +15,16 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.compute_pertubation_of_rho_and_theta_and_rho_at_ic import ( - compute_pertubation_of_rho_and_theta_and_rho_at_ic, +from icon4py.model.atmosphere.dycore.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.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field, zero_field from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil08(StencilTest): - PROGRAM = compute_pertubation_of_rho_and_theta_and_rho_at_ic +class TestComputePerturbationOfRhoAndThetaAndRhoInterfaceCellCenters(StencilTest): + PROGRAM = compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers OUTPUTS = ("rho_ic", "z_rth_pr_1", "z_rth_pr_2") @pytest.fixture diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_results_for_thermodynamic_variables.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_results_for_thermodynamic_variables.py index df0d871..e3c97e6 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_results_for_thermodynamic_variables.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_results_for_thermodynamic_variables.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil55(StencilTest): +class TestComputeResultsForThermodynamicVariables(StencilTest): PROGRAM = compute_results_for_thermodynamic_variables OUTPUTS = ("rho_new", "exner_new", "theta_v_new") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_rho_virtual_potential_temperatures_and_pressure_gradient.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_rho_virtual_potential_temperatures_and_pressure_gradient.py index b1ac5b1..1695400 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_rho_virtual_potential_temperatures_and_pressure_gradient.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_rho_virtual_potential_temperatures_and_pressure_gradient.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil10(StencilTest): +class TestComputeRhoVirtualPotentialTemperaturesAndPressureGradient(StencilTest): PROGRAM = compute_rho_virtual_potential_temperatures_and_pressure_gradient OUTPUTS = ("rho_ic", "z_theta_v_pr_ic", "theta_v_ic", "z_th_ddz_exner_c") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_solver_coefficients_matrix.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_solver_coefficients_matrix.py index d501fa1..f303d1a 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_solver_coefficients_matrix.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_solver_coefficients_matrix.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil44(StencilTest): +class TestComputeSolverCoefficientsMatrix(StencilTest): PROGRAM = compute_solver_coefficients_matrix OUTPUTS = ("z_beta", "z_alpha") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_tangential_wind.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_tangential_wind.py index b8d88c8..1fc2e57 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_tangential_wind.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_tangential_wind.py @@ -28,7 +28,7 @@ def compute_tangential_wind_numpy(grid, vn: np.array, rbf_vec_coeff_e: np.array) return vt -class TestMoVelocityAdvectionStencil01(StencilTest): +class TestComputeTangentialWind(StencilTest): PROGRAM = compute_tangential_wind OUTPUTS = ("vt",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_theta_and_exner.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_theta_and_exner.py index 4edb90a..bfd08ca 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_theta_and_exner.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_theta_and_exner.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil66(StencilTest): +class TestComputeThetaAndExner(StencilTest): PROGRAM = compute_theta_and_exner OUTPUTS = ("theta_v", "exner") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_virtual_potential_temperatures_and_pressure_gradient.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_virtual_potential_temperatures_and_pressure_gradient.py index 5a7045c..6e530ec 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_virtual_potential_temperatures_and_pressure_gradient.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_virtual_potential_temperatures_and_pressure_gradient.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil09(StencilTest): +class TestComputeVirtualPotentialTemperaturesAndPressureGradient(StencilTest): PROGRAM = compute_virtual_potential_temperatures_and_pressure_gradient OUTPUTS = ("z_theta_v_pr_ic", "theta_v_ic", "z_th_ddz_exner_c") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_vn_on_lateral_boundary.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_vn_on_lateral_boundary.py index 77bdf95..db7df4e 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_vn_on_lateral_boundary.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_vn_on_lateral_boundary.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil29(StencilTest): +class TestComputeVnOnLateralBoundary(StencilTest): PROGRAM = compute_vn_on_lateral_boundary OUTPUTS = ("vn_new",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_copy_cell_kdim_field_to_vp.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_copy_cell_kdim_field_to_vp.py index 75cfcf5..fb7cdcc 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_copy_cell_kdim_field_to_vp.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_copy_cell_kdim_field_to_vp.py @@ -26,7 +26,7 @@ def copy_cell_kdim_field_to_vp_numpy(field: np.array) -> np.array: return field_copy -class TestMoVelocityAdvectionStencil11(StencilTest): +class TestCopyCellKdimFieldToVp(StencilTest): PROGRAM = copy_cell_kdim_field_to_vp OUTPUTS = ("field_copy",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_correct_contravariant_vertical_velocity.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_correct_contravariant_vertical_velocity.py index 983d438..208af69 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_correct_contravariant_vertical_velocity.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_correct_contravariant_vertical_velocity.py @@ -30,7 +30,7 @@ def correct_contravariant_vertical_velocity_numpy( return z_w_con_c -class TestMoVelocityAdvectionStencil13(StencilTest): +class TestCorrectContravariantVerticalVelocity(StencilTest): PROGRAM = correct_contravariant_vertical_velocity OUTPUTS = ("z_w_con_c",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_extrapolate_temporally_exner_pressure.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_extrapolate_temporally_exner_pressure.py index fb49617..6022827 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_extrapolate_temporally_exner_pressure.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_extrapolate_temporally_exner_pressure.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil02(StencilTest): +class TestExtrapolateTemporallyExnerPressure(StencilTest): PROGRAM = extrapolate_temporally_exner_pressure OUTPUTS = ("z_exner_ex_pr", "exner_pr") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_15_to_18.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_15_to_18.py index 0063218..d8475be 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_15_to_18.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_15_to_18.py @@ -36,8 +36,8 @@ from .test_compute_advective_vertical_wind_tendency import ( compute_advective_vertical_wind_tendency_numpy, ) -from .test_interpolate_contravatiant_vertical_verlocity_to_full_levels import ( - interpolate_contravatiant_vertical_verlocity_to_full_levels_numpy, +from .test_interpolate_contravariant_vertical_velocity_to_full_levels import ( + interpolate_contravariant_vertical_velocity_to_full_levels_numpy, ) @@ -155,7 +155,7 @@ def reference( extra_diffu, **kwargs, ): - z_w_con_c_full = interpolate_contravatiant_vertical_verlocity_to_full_levels_numpy( + z_w_con_c_full = interpolate_contravariant_vertical_velocity_to_full_levels_numpy( grid, z_w_con_c ) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_19_to_20.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_19_to_20.py index 4e61e84..591de0d 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_19_to_20.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_19_to_20.py @@ -37,8 +37,8 @@ zero_field, ) -from .test_add_extra_diffusion_for_wn_approaching_cfl import ( - add_extra_diffusion_for_wn_approaching_cfl_numpy, +from .test_add_extra_diffusion_for_normal_wind_tendency_approaching_cfl import ( + add_extra_diffusion_for_normal_wind_tendency_approaching_cfl_numpy, ) from .test_compute_advective_normal_wind_tendency import ( compute_advective_normal_wind_tendency_numpy, @@ -98,7 +98,7 @@ def reference( condition = (np.maximum(2, nrdmax - 2) <= k) & (k < nlev - 3) - ddt_vn_apc_extra_diffu = add_extra_diffusion_for_wn_approaching_cfl_numpy( + ddt_vn_apc_extra_diffu = add_extra_diffusion_for_normal_wind_tendency_approaching_cfl_numpy( grid, levelmask, c_lin_e, diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_1_to_7.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_1_to_7.py index e8e1ec0..3a91074 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_1_to_7.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_1_to_7.py @@ -33,7 +33,7 @@ from .test_interpolate_vn_to_ie_and_compute_ekin_on_edges import ( interpolate_vn_to_ie_and_compute_ekin_on_edges_numpy, ) -from .test_interpolate_vt_to_ie import interpolate_vt_to_ie_numpy +from .test_interpolate_vt_to_interface_edges import interpolate_vt_to_interface_edges_numpy from .test_mo_icon_interpolation_scalar_cells2verts_scalar_ri_dsl import ( mo_icon_interpolation_scalar_cells2verts_scalar_ri_dsl_numpy, ) @@ -88,7 +88,7 @@ def _fused_velocity_advection_stencil_1_to_6_numpy( if not lvn_only: z_vt_ie = np.where( condition2, - interpolate_vt_to_ie_numpy(grid, wgtfac_e, vt), + interpolate_vt_to_interface_edges_numpy(grid, wgtfac_e, vt), z_vt_ie, ) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py index a17f28d..7b637db 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py @@ -31,9 +31,9 @@ from .test_correct_contravariant_vertical_velocity import ( correct_contravariant_vertical_velocity_numpy, ) +from .test_init_cell_kdim_field_with_zero_vp import init_cell_kdim_field_with_zero_vp_numpy from .test_interpolate_to_cell_center import interpolate_to_cell_center_numpy from .test_interpolate_to_half_levels_vp import interpolate_to_half_levels_vp_numpy -from .test_set_cell_kdim_field_to_zero_vp import set_cell_kdim_field_to_zero_vp_numpy class TestFusedVelocityAdvectionStencil8To13(StencilTest): @@ -86,7 +86,7 @@ def reference( z_w_con_c = np.where( k < nlev, copy_cell_kdim_field_to_vp_numpy(w), - set_cell_kdim_field_to_zero_vp_numpy(z_w_con_c), + init_cell_kdim_field_with_zero_vp_numpy(z_w_con_c), ) z_w_con_c[:, :-1] = np.where( diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_cell_kdim_field_to_zero_vp.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_cell_kdim_field_with_zero_vp.py similarity index 57% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_cell_kdim_field_to_zero_vp.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_cell_kdim_field_with_zero_vp.py index e411b14..94bf715 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_cell_kdim_field_to_zero_vp.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_cell_kdim_field_with_zero_vp.py @@ -15,34 +15,36 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_vp import ( - set_cell_kdim_field_to_zero_vp, +from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_vp import ( + init_cell_kdim_field_with_zero_vp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field from icon4py.model.common.type_alias import vpfloat -def set_cell_kdim_field_to_zero_vp_numpy(field_to_zero_vp: np.array) -> np.array: - field_to_zero_vp = np.zeros_like(field_to_zero_vp) - return field_to_zero_vp +def init_cell_kdim_field_with_zero_vp_numpy(field_with_zero_vp: np.array) -> np.array: + field_with_zero_vp = np.zeros_like(field_with_zero_vp) + return field_with_zero_vp -class TestMoSolveNonhydroStencil03(StencilTest): - PROGRAM = set_cell_kdim_field_to_zero_vp - OUTPUTS = ("field_to_zero_vp",) +class TestInitCellKdimFieldWithZeroVp(StencilTest): + PROGRAM = init_cell_kdim_field_with_zero_vp + OUTPUTS = ("field_with_zero_vp",) @staticmethod - def reference(grid, field_to_zero_vp: np.array, **kwargs) -> dict: - field_to_zero_vp = set_cell_kdim_field_to_zero_vp_numpy(field_to_zero_vp=field_to_zero_vp) - return dict(field_to_zero_vp=field_to_zero_vp) + def reference(grid, field_with_zero_vp: np.array, **kwargs) -> dict: + field_with_zero_vp = init_cell_kdim_field_with_zero_vp_numpy( + field_with_zero_vp=field_with_zero_vp + ) + return dict(field_with_zero_vp=field_with_zero_vp) @pytest.fixture def input_data(self, grid): - field_to_zero_vp = random_field(grid, CellDim, KDim, dtype=vpfloat) + field_with_zero_vp = random_field(grid, CellDim, KDim, dtype=vpfloat) return dict( - field_to_zero_vp=field_to_zero_vp, + field_with_zero_vp=field_with_zero_vp, horizontal_start=int32(0), horizontal_end=int32(grid.num_cells), vertical_start=int32(0), diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_cell_kdim_field_to_zero_wp.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_cell_kdim_field_with_zero_wp.py similarity index 65% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_cell_kdim_field_to_zero_wp.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_cell_kdim_field_with_zero_wp.py index db85b9f..1df0516 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_cell_kdim_field_to_zero_wp.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_cell_kdim_field_with_zero_wp.py @@ -15,29 +15,29 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.set_cell_kdim_field_to_zero_wp import ( - set_cell_kdim_field_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_cell_kdim_field_with_zero_wp import ( + init_cell_kdim_field_with_zero_wp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, zero_field from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil64(StencilTest): - PROGRAM = set_cell_kdim_field_to_zero_wp - OUTPUTS = ("field_to_zero_wp",) +class TestInitCellKdimFieldWithZeroWp(StencilTest): + PROGRAM = init_cell_kdim_field_with_zero_wp + OUTPUTS = ("field_with_zero_wp",) @staticmethod - def reference(grid, field_to_zero_wp: np.array, **kwargs) -> dict: - field_to_zero_wp = np.zeros_like(field_to_zero_wp) - return dict(field_to_zero_wp=field_to_zero_wp) + def reference(grid, field_with_zero_wp: np.array, **kwargs) -> dict: + field_with_zero_wp = np.zeros_like(field_with_zero_wp) + return dict(field_with_zero_wp=field_with_zero_wp) @pytest.fixture def input_data(self, grid): - field_to_zero_wp = zero_field(grid, CellDim, KDim, dtype=wpfloat) + field_with_zero_wp = zero_field(grid, CellDim, KDim, dtype=wpfloat) return dict( - field_to_zero_wp=field_to_zero_wp, + field_with_zero_wp=field_with_zero_wp, horizontal_start=int32(0), horizontal_end=int32(grid.num_cells), vertical_start=int32(0), diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_index_to_zero_vp.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_index_with_zero_vp.py similarity index 58% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_index_to_zero_vp.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_index_with_zero_vp.py index f5a6eb0..fb432f1 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_index_to_zero_vp.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_index_with_zero_vp.py @@ -16,50 +16,51 @@ from gt4py.next import as_field from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.set_two_cell_kdim_fields_index_to_zero_vp import ( - set_two_cell_kdim_fields_index_to_zero_vp, +from icon4py.model.atmosphere.dycore.init_two_cell_kdim_fields_index_with_zero_vp import ( + init_two_cell_kdim_fields_index_with_zero_vp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, _shape, random_field from icon4py.model.common.type_alias import vpfloat -class TestMoSolveNonhydroStencil01(StencilTest): - PROGRAM = set_two_cell_kdim_fields_index_to_zero_vp - OUTPUTS = ("field_index_to_zero_1", "field_index_to_zero_2") +class TestInitTwoCellKdimFieldsIndexWithZeroVp(StencilTest): + PROGRAM = init_two_cell_kdim_fields_index_with_zero_vp + OUTPUTS = ("field_index_with_zero_1", "field_index_with_zero_2") @staticmethod def reference( grid, - field_index_to_zero_1: np.array, - field_index_to_zero_2: np.array, + field_index_with_zero_1: np.array, + field_index_with_zero_2: np.array, k: np.array, k1: int32, k2: int32, **kwargs, ) -> tuple[np.array]: - field_index_to_zero_1 = np.where( - k == k1, np.zeros_like(field_index_to_zero_1), field_index_to_zero_1 + field_index_with_zero_1 = np.where( + k == k1, np.zeros_like(field_index_with_zero_1), field_index_with_zero_1 ) - field_index_to_zero_2 = np.where( - k == k2, np.zeros_like(field_index_to_zero_2), field_index_to_zero_2 + field_index_with_zero_2 = np.where( + k == k2, np.zeros_like(field_index_with_zero_2), field_index_with_zero_2 ) return dict( - field_index_to_zero_1=field_index_to_zero_1, field_index_to_zero_2=field_index_to_zero_2 + field_index_with_zero_1=field_index_with_zero_1, + field_index_with_zero_2=field_index_with_zero_2, ) @pytest.fixture def input_data(self, grid): - field_index_to_zero_1 = random_field(grid, CellDim, KDim, dtype=vpfloat) - field_index_to_zero_2 = random_field(grid, CellDim, KDim, dtype=vpfloat) + field_index_with_zero_1 = random_field(grid, CellDim, KDim, dtype=vpfloat) + field_index_with_zero_2 = random_field(grid, CellDim, KDim, dtype=vpfloat) k = as_field((KDim,), np.arange(0, _shape(grid, KDim)[0], dtype=int32)) k1 = int32(1) k2 = int32(grid.num_levels) return dict( - field_index_to_zero_1=field_index_to_zero_1, - field_index_to_zero_2=field_index_to_zero_2, + field_index_with_zero_1=field_index_with_zero_1, + field_index_with_zero_2=field_index_with_zero_2, k=k, k1=k1, k2=k2, diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_to_zero_vp.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_with_zero_vp.py similarity index 52% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_to_zero_vp.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_with_zero_vp.py index ddd4825..0fc8327 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_to_zero_vp.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_with_zero_vp.py @@ -15,40 +15,40 @@ import pytest as pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.set_two_cell_kdim_fields_to_zero_vp import ( - set_two_cell_kdim_fields_to_zero_vp, +from icon4py.model.atmosphere.dycore.init_two_cell_kdim_fields_with_zero_vp import ( + init_two_cell_kdim_fields_with_zero_vp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field from icon4py.model.common.type_alias import vpfloat -class TestMoSolveNonhydroStencil01(StencilTest): - PROGRAM = set_two_cell_kdim_fields_to_zero_vp - OUTPUTS = ("cell_kdim_field_to_zero_vp_1", "cell_kdim_field_to_zero_vp_2") +class TestInitTwoCellKdimFieldsWithZeroVp(StencilTest): + PROGRAM = init_two_cell_kdim_fields_with_zero_vp + OUTPUTS = ("cell_kdim_field_with_zero_vp_1", "cell_kdim_field_with_zero_vp_2") @staticmethod def reference( grid, - cell_kdim_field_to_zero_vp_1: np.array, - cell_kdim_field_to_zero_vp_2: np.array, + cell_kdim_field_with_zero_vp_1: np.array, + cell_kdim_field_with_zero_vp_2: np.array, **kwargs, ) -> tuple[np.array]: - cell_kdim_field_to_zero_vp_1 = np.zeros_like(cell_kdim_field_to_zero_vp_1) - cell_kdim_field_to_zero_vp_2 = np.zeros_like(cell_kdim_field_to_zero_vp_2) + cell_kdim_field_with_zero_vp_1 = np.zeros_like(cell_kdim_field_with_zero_vp_1) + cell_kdim_field_with_zero_vp_2 = np.zeros_like(cell_kdim_field_with_zero_vp_2) return dict( - cell_kdim_field_to_zero_vp_1=cell_kdim_field_to_zero_vp_1, - cell_kdim_field_to_zero_vp_2=cell_kdim_field_to_zero_vp_2, + cell_kdim_field_with_zero_vp_1=cell_kdim_field_with_zero_vp_1, + cell_kdim_field_with_zero_vp_2=cell_kdim_field_with_zero_vp_2, ) @pytest.fixture def input_data(self, grid): - cell_kdim_field_to_zero_vp_1 = random_field(grid, CellDim, KDim, dtype=vpfloat) - cell_kdim_field_to_zero_vp_2 = random_field(grid, CellDim, KDim, dtype=vpfloat) + cell_kdim_field_with_zero_vp_1 = random_field(grid, CellDim, KDim, dtype=vpfloat) + cell_kdim_field_with_zero_vp_2 = random_field(grid, CellDim, KDim, dtype=vpfloat) return dict( - cell_kdim_field_to_zero_vp_1=cell_kdim_field_to_zero_vp_1, - cell_kdim_field_to_zero_vp_2=cell_kdim_field_to_zero_vp_2, + cell_kdim_field_with_zero_vp_1=cell_kdim_field_with_zero_vp_1, + cell_kdim_field_with_zero_vp_2=cell_kdim_field_with_zero_vp_2, horizontal_start=int32(0), horizontal_end=int32(grid.num_cells), vertical_start=int32(0), diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_to_zero_wp.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_with_zero_wp.py similarity index 52% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_to_zero_wp.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_with_zero_wp.py index 71de349..e9e0abe 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_cell_kdim_fields_to_zero_wp.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_cell_kdim_fields_with_zero_wp.py @@ -15,40 +15,40 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.set_two_cell_kdim_fields_to_zero_wp import ( - set_two_cell_kdim_fields_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_two_cell_kdim_fields_with_zero_wp import ( + init_two_cell_kdim_fields_with_zero_wp, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, zero_field from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil46(StencilTest): - PROGRAM = set_two_cell_kdim_fields_to_zero_wp - OUTPUTS = ("cell_kdim_field_to_zero_wp_1", "cell_kdim_field_to_zero_wp_2") +class TestInitTwoCellKdimFieldsWithZeroWp(StencilTest): + PROGRAM = init_two_cell_kdim_fields_with_zero_wp + OUTPUTS = ("cell_kdim_field_with_zero_wp_1", "cell_kdim_field_with_zero_wp_2") @staticmethod def reference( grid, - cell_kdim_field_to_zero_wp_1: np.array, - cell_kdim_field_to_zero_wp_2: np.array, + cell_kdim_field_with_zero_wp_1: np.array, + cell_kdim_field_with_zero_wp_2: np.array, **kwargs, ) -> dict: - cell_kdim_field_to_zero_wp_1 = np.zeros_like(cell_kdim_field_to_zero_wp_1) - cell_kdim_field_to_zero_wp_2 = np.zeros_like(cell_kdim_field_to_zero_wp_2) + cell_kdim_field_with_zero_wp_1 = np.zeros_like(cell_kdim_field_with_zero_wp_1) + cell_kdim_field_with_zero_wp_2 = np.zeros_like(cell_kdim_field_with_zero_wp_2) return dict( - cell_kdim_field_to_zero_wp_1=cell_kdim_field_to_zero_wp_1, - cell_kdim_field_to_zero_wp_2=cell_kdim_field_to_zero_wp_2, + cell_kdim_field_with_zero_wp_1=cell_kdim_field_with_zero_wp_1, + cell_kdim_field_with_zero_wp_2=cell_kdim_field_with_zero_wp_2, ) @pytest.fixture def input_data(self, grid): - cell_kdim_field_to_zero_wp_1 = zero_field(grid, CellDim, KDim, dtype=wpfloat) - cell_kdim_field_to_zero_wp_2 = zero_field(grid, CellDim, KDim, dtype=wpfloat) + cell_kdim_field_with_zero_wp_1 = zero_field(grid, CellDim, KDim, dtype=wpfloat) + cell_kdim_field_with_zero_wp_2 = zero_field(grid, CellDim, KDim, dtype=wpfloat) return dict( - cell_kdim_field_to_zero_wp_1=cell_kdim_field_to_zero_wp_1, - cell_kdim_field_to_zero_wp_2=cell_kdim_field_to_zero_wp_2, + cell_kdim_field_with_zero_wp_1=cell_kdim_field_with_zero_wp_1, + cell_kdim_field_with_zero_wp_2=cell_kdim_field_with_zero_wp_2, horizontal_start=int32(0), horizontal_end=int32(grid.num_cells), vertical_start=int32(0), diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_edge_kdim_fields_to_zero_wp.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_edge_kdim_fields_with_zero_wp.py similarity index 52% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_edge_kdim_fields_to_zero_wp.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_edge_kdim_fields_with_zero_wp.py index 2e45aad..571d5ec 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_two_edge_kdim_fields_to_zero_wp.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_init_two_edge_kdim_fields_with_zero_wp.py @@ -15,40 +15,40 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.set_two_edge_kdim_fields_to_zero_wp import ( - set_two_edge_kdim_fields_to_zero_wp, +from icon4py.model.atmosphere.dycore.init_two_edge_kdim_fields_with_zero_wp import ( + init_two_edge_kdim_fields_with_zero_wp, ) from icon4py.model.common.dimension import EdgeDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, zero_field from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil14(StencilTest): - PROGRAM = set_two_edge_kdim_fields_to_zero_wp - OUTPUTS = ("edge_kdim_field_to_zero_wp_1", "edge_kdim_field_to_zero_wp_2") +class TestInitTwoEdgeKdimFieldsWithZeroWp(StencilTest): + PROGRAM = init_two_edge_kdim_fields_with_zero_wp + OUTPUTS = ("edge_kdim_field_with_zero_wp_1", "edge_kdim_field_with_zero_wp_2") @staticmethod def reference( grid, - edge_kdim_field_to_zero_wp_1: np.array, - edge_kdim_field_to_zero_wp_2: np.array, + edge_kdim_field_with_zero_wp_1: np.array, + edge_kdim_field_with_zero_wp_2: np.array, **kwargs, ) -> dict: - edge_kdim_field_to_zero_wp_1 = np.zeros_like(edge_kdim_field_to_zero_wp_1) - edge_kdim_field_to_zero_wp_2 = np.zeros_like(edge_kdim_field_to_zero_wp_2) + edge_kdim_field_with_zero_wp_1 = np.zeros_like(edge_kdim_field_with_zero_wp_1) + edge_kdim_field_with_zero_wp_2 = np.zeros_like(edge_kdim_field_with_zero_wp_2) return dict( - edge_kdim_field_to_zero_wp_1=edge_kdim_field_to_zero_wp_1, - edge_kdim_field_to_zero_wp_2=edge_kdim_field_to_zero_wp_2, + edge_kdim_field_with_zero_wp_1=edge_kdim_field_with_zero_wp_1, + edge_kdim_field_with_zero_wp_2=edge_kdim_field_with_zero_wp_2, ) @pytest.fixture def input_data(self, grid): - edge_kdim_field_to_zero_wp_1 = zero_field(grid, EdgeDim, KDim, dtype=wpfloat) - edge_kdim_field_to_zero_wp_2 = zero_field(grid, EdgeDim, KDim, dtype=wpfloat) + edge_kdim_field_with_zero_wp_1 = zero_field(grid, EdgeDim, KDim, dtype=wpfloat) + edge_kdim_field_with_zero_wp_2 = zero_field(grid, EdgeDim, KDim, dtype=wpfloat) return dict( - edge_kdim_field_to_zero_wp_1=edge_kdim_field_to_zero_wp_1, - edge_kdim_field_to_zero_wp_2=edge_kdim_field_to_zero_wp_2, + edge_kdim_field_with_zero_wp_1=edge_kdim_field_with_zero_wp_1, + edge_kdim_field_with_zero_wp_2=edge_kdim_field_with_zero_wp_2, horizontal_start=int32(0), horizontal_end=int32(grid.num_edges), vertical_start=int32(0), diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_contravatiant_vertical_verlocity_to_full_levels.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_contravariant_vertical_velocity_to_full_levels.py similarity index 76% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_contravatiant_vertical_verlocity_to_full_levels.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_contravariant_vertical_velocity_to_full_levels.py index faec742..9572582 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_contravatiant_vertical_verlocity_to_full_levels.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_contravariant_vertical_velocity_to_full_levels.py @@ -15,26 +15,26 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.interpolate_contravatiant_vertical_verlocity_to_full_levels import ( - interpolate_contravatiant_vertical_verlocity_to_full_levels, +from icon4py.model.atmosphere.dycore.interpolate_contravariant_vertical_velocity_to_full_levels import ( + interpolate_contravariant_vertical_velocity_to_full_levels, ) from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field, zero_field from icon4py.model.common.type_alias import vpfloat -def interpolate_contravatiant_vertical_verlocity_to_full_levels_numpy(grid, z_w_con_c: np.array): +def interpolate_contravariant_vertical_velocity_to_full_levels_numpy(grid, z_w_con_c: np.array): z_w_con_c_full = 0.5 * (z_w_con_c[:, :-1] + z_w_con_c[:, 1:]) return z_w_con_c_full -class TestMoVelocityAdvectionStencil15(StencilTest): - PROGRAM = interpolate_contravatiant_vertical_verlocity_to_full_levels +class TestInterpolateContravariantVerticalVelocityToFullLevels(StencilTest): + PROGRAM = interpolate_contravariant_vertical_velocity_to_full_levels OUTPUTS = ("z_w_con_c_full",) @staticmethod def reference(grid, z_w_con_c: np.array, **kwargs) -> dict: - z_w_con_c_full = interpolate_contravatiant_vertical_verlocity_to_full_levels_numpy( + z_w_con_c_full = interpolate_contravariant_vertical_velocity_to_full_levels_numpy( grid, z_w_con_c ) return dict(z_w_con_c_full=z_w_con_c_full) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_cell_center.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_cell_center.py index 683d9dc..f9778c4 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_cell_center.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_cell_center.py @@ -38,7 +38,7 @@ def interpolate_to_cell_center_numpy( return interpolation -class TestMoVelocityAdvectionStencil09(StencilTest): +class TestInterpolateToCellCenter(StencilTest): PROGRAM = interpolate_to_cell_center OUTPUTS = ("interpolation",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_half_levels_vp.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_half_levels_vp.py index 9d589e5..62d61ef 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_half_levels_vp.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_half_levels_vp.py @@ -35,7 +35,7 @@ def interpolate_to_half_levels_vp_numpy( return interpolation_to_half_levels_vp -class TestMoSolveNonhydroStencil05(StencilTest): +class TestInterpolateToHalfLevelsVp(StencilTest): PROGRAM = interpolate_to_half_levels_vp OUTPUTS = ("interpolation_to_half_levels_vp",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_surface.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_surface.py index bd65740..6239080 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_surface.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_to_surface.py @@ -32,7 +32,7 @@ def interpolate_to_surface_numpy( return interpolation_to_surface -class TestMoSolveNonhydroStencil04(StencilTest): +class TestInterpolateToSurface(StencilTest): PROGRAM = interpolate_to_surface OUTPUTS = ("interpolation_to_surface",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vn_to_ie_and_compute_ekin_on_edges.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vn_to_ie_and_compute_ekin_on_edges.py index 93b4b82..6edf7ff 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vn_to_ie_and_compute_ekin_on_edges.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vn_to_ie_and_compute_ekin_on_edges.py @@ -51,7 +51,7 @@ def interpolate_vn_to_ie_and_compute_ekin_on_edges_numpy( ) -class TestMoVelocityAdvectionStencil02VnIe(StencilTest): +class TestInterpolateVnToIeAndComputeEkinOnEdges(StencilTest): PROGRAM = interpolate_vn_to_ie_and_compute_ekin_on_edges OUTPUTS = ("vn_ie", "z_kin_hor_e") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vt_to_ie.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vt_to_interface_edges.py similarity index 82% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vt_to_ie.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vt_to_interface_edges.py index 75b24fa..ffa3b69 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vt_to_ie.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_interpolate_vt_to_interface_edges.py @@ -15,21 +15,25 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.interpolate_vt_to_ie import interpolate_vt_to_ie +from icon4py.model.atmosphere.dycore.interpolate_vt_to_interface_edges import ( + interpolate_vt_to_interface_edges, +) from icon4py.model.common.dimension import EdgeDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field from icon4py.model.common.type_alias import vpfloat -def interpolate_vt_to_ie_numpy(grid, wgtfac_e: np.array, vt: np.array, **kwargs) -> np.array: +def interpolate_vt_to_interface_edges_numpy( + grid, wgtfac_e: np.array, vt: np.array, **kwargs +) -> np.array: vt_k_minus_1 = np.roll(vt, shift=1, axis=1) z_vt_ie = wgtfac_e * vt + (1.0 - wgtfac_e) * vt_k_minus_1 z_vt_ie[:, 0] = 0 return z_vt_ie -class TestMoVelocityAdvectionStencil03(StencilTest): - PROGRAM = interpolate_vt_to_ie +class TestInterpolateVtToInterfaceEdges(StencilTest): + PROGRAM = interpolate_vt_to_interface_edges OUTPUTS = ("z_vt_ie",) @staticmethod @@ -45,7 +49,7 @@ def reference( ) -> dict: subset = (slice(horizontal_start, horizontal_end), slice(vertical_start, vertical_end)) z_vt_ie = z_vt_ie.copy() - z_vt_ie[subset] = interpolate_vt_to_ie_numpy(grid, wgtfac_e, vt)[subset] + z_vt_ie[subset] = interpolate_vt_to_interface_edges_numpy(grid, wgtfac_e, vt)[subset] return dict(z_vt_ie=z_vt_ie) @pytest.fixture diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_mcompute_divergence_of_fluxes_of_rho_and_theta.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_mcompute_divergence_of_fluxes_of_rho_and_theta.py index c71ae9e..5998e4b 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_mcompute_divergence_of_fluxes_of_rho_and_theta.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_mcompute_divergence_of_fluxes_of_rho_and_theta.py @@ -28,7 +28,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil41(StencilTest): +class TestComputeDivergenceOfFluxesOfRhoAndTheta(StencilTest): PROGRAM = compute_divergence_of_fluxes_of_rho_and_theta OUTPUTS = ("z_flxdiv_mass", "z_flxdiv_theta") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_lower_boundary_condition_for_w_and_contravariant_correction.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_lower_boundary_condition_for_w_and_contravariant_correction.py index b833b63..3b5250b 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_lower_boundary_condition_for_w_and_contravariant_correction.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_lower_boundary_condition_for_w_and_contravariant_correction.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil47(StencilTest): +class TestInitLowerBoundaryConditionForWAndContravariantCorrection(StencilTest): PROGRAM = set_lower_boundary_condition_for_w_and_contravariant_correction OUTPUTS = ("w_nnew", "z_contr_w_fl_l") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_theta_v_prime_ic_at_lower_boundary.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_theta_v_prime_ic_at_lower_boundary.py index 284b941..3454376 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_theta_v_prime_ic_at_lower_boundary.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_set_theta_v_prime_ic_at_lower_boundary.py @@ -25,7 +25,7 @@ from .test_interpolate_to_surface import interpolate_to_surface_numpy -class TestMoSolveNonhydroStencil11Upper(StencilTest): +class TestInitThetaVPrimeIcAtLowerBoundary(StencilTest): PROGRAM = set_theta_v_prime_ic_at_lower_boundary OUTPUTS = ("z_theta_v_pr_ic", "theta_v_ic") diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_solve_tridiagonal_matrix_for_w_back_substitution.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_solve_tridiagonal_matrix_for_w_back_substitution.py index 92d6250..04986df 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_solve_tridiagonal_matrix_for_w_back_substitution.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_solve_tridiagonal_matrix_for_w_back_substitution.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil53(StencilTest): +class TestSolveTridiagonalMatrixForWBackSubstitution(StencilTest): PROGRAM = solve_tridiagonal_matrix_for_w_back_substitution OUTPUTS = ("w",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_densety_exener_wind.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_density_exner_wind.py similarity index 93% rename from model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_densety_exener_wind.py rename to model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_density_exner_wind.py index e925d9f..21b4e87 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_densety_exener_wind.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_density_exner_wind.py @@ -15,14 +15,14 @@ import pytest from gt4py.next.ffront.fbuiltins import int32 -from icon4py.model.atmosphere.dycore.update_densety_exener_wind import update_densety_exener_wind +from icon4py.model.atmosphere.dycore.update_density_exner_wind import update_density_exner_wind from icon4py.model.common.dimension import CellDim, KDim from icon4py.model.common.test_utils.helpers import StencilTest, random_field, zero_field from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil61(StencilTest): - PROGRAM = update_densety_exener_wind +class TestUpdateDensityExnerWind(StencilTest): + PROGRAM = update_density_exner_wind OUTPUTS = ("rho_new", "exner_new", "w_new") @staticmethod diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_dynamical_exner_time_increment.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_dynamical_exner_time_increment.py index e4f0b44..a976063 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_dynamical_exner_time_increment.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_dynamical_exner_time_increment.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil60(StencilTest): +class TestUpdateDynamicalExnerTimeIncrement(StencilTest): PROGRAM = update_dynamical_exner_time_increment OUTPUTS = ("exner_dyn_incr",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_mass_flux_weighted.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_mass_flux_weighted.py index 4216be6..c6b2bd6 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_mass_flux_weighted.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_mass_flux_weighted.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil65(StencilTest): +class TestUpdateMassFluxWeighted(StencilTest): PROGRAM = update_mass_flux_weighted OUTPUTS = ("mass_flx_ic",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_mass_volume_flux.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_mass_volume_flux.py index f0084ac..a414a05 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_mass_volume_flux.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_mass_volume_flux.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil58(StencilTest): +class TestUpdateMassVolumeFlux(StencilTest): PROGRAM = update_mass_volume_flux OUTPUTS = ( "mass_flx_ic", diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_theta_v.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_theta_v.py index 88e1d28..8e861b2 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_theta_v.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_theta_v.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil68(StencilTest): +class TestUpdateThetaV(StencilTest): PROGRAM = update_theta_v OUTPUTS = ("theta_v_new",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_wind.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_wind.py index 9bde15f..6644e77 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_wind.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_update_wind.py @@ -21,7 +21,7 @@ from icon4py.model.common.type_alias import wpfloat -class TestMoSolveNonhydroStencil62(StencilTest): +class TestUpdateWind(StencilTest): PROGRAM = update_wind OUTPUTS = ("w_new",) diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/testinterpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/testinterpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges.py index b04c7ed..f03a0d0 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/testinterpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/testinterpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges.py @@ -23,7 +23,7 @@ from icon4py.model.common.type_alias import vpfloat, wpfloat -class TestMoSolveNonhydroStencil36(StencilTest): +class TestInterpolateVnAndVtToIeAndComputeEkinOnEdges(StencilTest): PROGRAM = interpolate_vn_and_vt_to_ie_and_compute_ekin_on_edges OUTPUTS = ("vn_ie", "z_vt_ie", "z_kin_hor_e") diff --git a/model/docs/stencil_naming_convention.md b/model/docs/stencil_naming_convention.md new file mode 100644 index 0000000..ad13d09 --- /dev/null +++ b/model/docs/stencil_naming_convention.md @@ -0,0 +1,29 @@ +# Naming convection of stencils in ICON4Py + +This naming convection should help to have a common style for stencil names. +It should help to read and understand stencil code. + +## Multiple-word identifier format +The stencils should should flow snake case. + +## Length of name +The program name of the stencil needs to have less then 70 characters. + +## Structure of name +The `field_operator` name should start with an underscore character. +The `program` name should be the same as for the field_operator without the underscore. +The `program` name should start with a verb. +Commonly used verbs are accumulate, add, apply, compute, copy, correct, extrapolate, interpolate, return, set, and +solve. +The verb can be followed by more describing words. +If possible one should not use the names of variables that are part of the signature already as describing words. + +## Example +A good example for a stencil name is for the `field_operator name`: +``` +_interpolate_to_cell_center +``` +and for the program +``` +interpolate_to_cell_center +``` \ No newline at end of file diff --git a/tools/tests/liskov/fortran_samples.py b/tools/tests/liskov/fortran_samples.py index d5bbf99..b75af02 100644 --- a/tools/tests/liskov/fortran_samples.py +++ b/tools/tests/liskov/fortran_samples.py @@ -128,7 +128,7 @@ !$DSL z_rth_pr_1=nproma,p_patch%nlev,p_patch%nblks_c; z_rth_pr_2=nproma,p_patch%nlev,p_patch%nblks_c; & !$DSL rho_ic=nproma,p_patch%nlev,p_patch%nblks_c) - !$DSL START STENCIL(name=compute_pertubation_of_rho_and_theta_and_rho_at_ic; wgtfac_c=p_nh%metrics%wgtfac_c(:,:,1); rho=p_nh%prog(nnow)%rho(:,:,1); rho_ref_mc=p_nh%metrics%rho_ref_mc(:,:,1); & + !$DSL START STENCIL(name=compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers; wgtfac_c=p_nh%metrics%wgtfac_c(:,:,1); rho=p_nh%prog(nnow)%rho(:,:,1); rho_ref_mc=p_nh%metrics%rho_ref_mc(:,:,1); & !$DSL theta_v=p_nh%prog(nnow)%theta_v(:,:,1); theta_ref_mc=p_nh%metrics%theta_ref_mc(:,:,1); rho_ic=p_nh%diag%rho_ic(:,:,1); z_rth_pr_1=z_rth_pr(:,:,1,1); & !$DSL z_rth_pr_2=z_rth_pr(:,:,1,2); vertical_lower=2; vertical_upper=nlev; horizontal_lower=i_startidx; horizontal_upper=i_endidx) !$ACC PARALLEL IF(i_am_accel_node) DEFAULT(NONE) ASYNC(1) @@ -155,7 +155,7 @@ !$ACC END PARALLEL #endif - !$DSL END STENCIL(name=compute_pertubation_of_rho_and_theta_and_rho_at_ic) + !$DSL END STENCIL(name=compute_perturbation_of_rho_and_theta_and_rho_interface_cell_centers) !$DSL START STENCIL(name=apply_nabla2_to_vn_in_lateral_boundary; & @@ -232,12 +232,12 @@ !$DSL START CREATE() - !$DSL DECLARE(z_q=nproma,p_patch%nlev; field=nproma,p_patch%nlev; field_to_zero_vp=nproma,p_patch%nlev) + !$DSL DECLARE(z_q=nproma,p_patch%nlev; field=nproma,p_patch%nlev; field_with_zero_vp=nproma,p_patch%nlev) - !$DSL START STENCIL(name=set_cell_kdim_field_to_zero_vp; field_to_zero_vp=z_alpha(:,:); vertical_lower=nlevp1; & + !$DSL START STENCIL(name=init_cell_kdim_field_with_zero_vp; field_with_zero_vp=z_alpha(:,:); vertical_lower=nlevp1; & !$DSL vertical_upper=nlevp1; horizontal_lower=i_startidx; horizontal_upper=i_endidx; mergecopy=true) - !$DSL START STENCIL(name=set_cell_kdim_field_to_zero_vp; field_to_zero_vp=z_q(:,:); vertical_lower=1; vertical_upper=1; & + !$DSL START STENCIL(name=init_cell_kdim_field_with_zero_vp; field_with_zero_vp=z_q(:,:); vertical_lower=1; vertical_upper=1; & !$DSL horizontal_lower=i_startidx; horizontal_upper=i_endidx; mergecopy=true) !$ACC PARALLEL IF(i_am_accel_node) DEFAULT(NONE) ASYNC(1) @@ -254,8 +254,8 @@ !$DSL END PROFILE() !$DSL ENDIF() - !$DSL END STENCIL(name=set_cell_kdim_field_to_zero_vp; noendif=true; noprofile=true) - !$DSL END STENCIL(name=set_cell_kdim_field_to_zero_vp; noendif=true; noprofile=true) + !$DSL END STENCIL(name=init_cell_kdim_field_with_zero_vp; noendif=true; noprofile=true) + !$DSL END STENCIL(name=init_cell_kdim_field_with_zero_vp; noendif=true; noprofile=true) !$DSL END CREATE() """ @@ -452,11 +452,11 @@ !$DSL START CREATE() - !$DSL DECLARE(z_q=nproma,p_patch%nlev; field_to_zero_vp=nproma,p_patch%nlev) + !$DSL DECLARE(z_q=nproma,p_patch%nlev; field_with_zero_vp=nproma,p_patch%nlev) !$DSL INSERT(some custom fields go here) - !$DSL START STENCIL(name=set_cell_kdim_field_to_zero_vp; field_to_zero_vp=z_alpha(:,:); vertical_lower=nlevp1; & + !$DSL START STENCIL(name=init_cell_kdim_field_with_zero_vp; field_with_zero_vp=z_alpha(:,:); vertical_lower=nlevp1; & !$DSL vertical_upper=nlevp1; horizontal_lower=i_startidx; horizontal_upper=i_endidx) !$ACC PARALLEL IF(i_am_accel_node) DEFAULT(NONE) ASYNC(1) @@ -473,7 +473,7 @@ !$DSL INSERT(some custom code goes here) - !$DSL END STENCIL(name=set_cell_kdim_field_to_zero_vp) + !$DSL END STENCIL(name=init_cell_kdim_field_with_zero_vp) !$DSL END CREATE() """