Rename set and copy stencils

model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/mo_solve_nonhydro_stencil_59.py → model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/copy_cell_kdim_field_to_vp.py

@@ -20,25 +20,26 @@
 
 
 @field_operator
-def _mo_solve_nonhydro_stencil_59(
-    exner: Field[[CellDim, KDim], wpfloat],
+def _copy_cell_kdim_field_to_vp(
+    field: Field[[CellDim, KDim], wpfloat]
 ) -> Field[[CellDim, KDim], vpfloat]:
-    exner_dyn_incr_wp = exner
-    return astype(exner_dyn_incr_wp, vpfloat)
+    """Formerly known as _mo_velocity_advection_stencil_11 or _mo_solve_nonhydro_stencil_59."""
+    field_copy = astype(field, vpfloat)
+    return field_copy
 
 
 @program(grid_type=GridType.UNSTRUCTURED)
-def mo_solve_nonhydro_stencil_59(
-    exner: Field[[CellDim, KDim], wpfloat],
-    exner_dyn_incr: Field[[CellDim, KDim], vpfloat],
+def copy_cell_kdim_field_to_vp(
+    field: Field[[CellDim, KDim], wpfloat],
+    field_copy: Field[[CellDim, KDim], vpfloat],
     horizontal_start: int32,
     horizontal_end: int32,
     vertical_start: int32,
     vertical_end: int32,
 ):
-    _mo_solve_nonhydro_stencil_59(
-        exner,
-        out=exner_dyn_incr,
+    _copy_cell_kdim_field_to_vp(
+        field,
+        out=field_copy,
         domain={
             CellDim: (horizontal_start, horizontal_end),
             KDim: (vertical_start, vertical_end),

model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/fused_velocity_advection_stencil_8_to_14.py

@@ -14,22 +14,20 @@
 from gt4py.next.ffront.decorator import field_operator, program
 from gt4py.next.ffront.fbuiltins import int32, maximum, where
 
+from icon4py.model.atmosphere.dycore.copy_cell_kdim_field_to_vp import _copy_cell_kdim_field_to_vp
 from icon4py.model.atmosphere.dycore.interpolate_to_cell_center import _interpolate_to_cell_center
 from icon4py.model.atmosphere.dycore.mo_velocity_advection_stencil_10 import (
     _mo_velocity_advection_stencil_10,
 )
-from icon4py.model.atmosphere.dycore.mo_velocity_advection_stencil_11 import (
-    _mo_velocity_advection_stencil_11,
-)
-from icon4py.model.atmosphere.dycore.mo_velocity_advection_stencil_12 import (
-    _mo_velocity_advection_stencil_12,
-)
 from icon4py.model.atmosphere.dycore.mo_velocity_advection_stencil_13 import (
     _mo_velocity_advection_stencil_13,
 )
 from icon4py.model.atmosphere.dycore.mo_velocity_advection_stencil_14 import (
     _mo_velocity_advection_stencil_14,
 )
+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.type_alias import vpfloat, wpfloat
 
@@ -91,8 +89,8 @@ def _fused_velocity_advection_stencil_8_to_14(
 
     z_w_con_c = where(
         k < nlevp1,
-        _mo_velocity_advection_stencil_11(w),
-        _mo_velocity_advection_stencil_12(),
+        _copy_cell_kdim_field_to_vp(w),
+        _set_cell_kdim_field_to_zero_vp(),
     )
 
     z_w_con_c = where(

model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/mo_solve_nonhydro_stencil_47.py

@@ -13,8 +13,11 @@
 
 from gt4py.next.common import GridType
 from gt4py.next.ffront.decorator import field_operator, program
-from gt4py.next.ffront.fbuiltins import Field, astype, broadcast, int32
+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.common.dimension import CellDim, KDim
 from icon4py.model.common.type_alias import vpfloat, wpfloat
 
@@ -26,7 +29,7 @@ def _mo_solve_nonhydro_stencil_47(
     w_concorr_c_wp = astype(w_concorr_c, wpfloat)
 
     w_nnew_wp = w_concorr_c_wp
-    z_contr_w_fl_l_wp = broadcast(wpfloat("0.0"), (CellDim, KDim))
+    z_contr_w_fl_l_wp = _set_cell_kdim_field_to_zero_wp()
     return w_nnew_wp, z_contr_w_fl_l_wp