Fix pr 286 (#331)

Several fixes for greenline from recent merges. --------- Co-authored-by: Nicoletta Farabullini <[email protected]>
C2SM · Dec 8, 2023 · 8d9dd91 · 8d9dd91
1 parent 8fba32b
commit 8d9dd91
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion.py b/model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion.py
@@ -712,7 +712,7 @@ def _do_diffusion_step(
             diff_multfac_vn=diff_multfac_vn,
             nudgecoeff_e=self.interpolation_state.nudgecoeff_e,
             vn=prognostic_state.vn,
-            horz_idx=self.horizontal_edge_index,
+            edge=self.horizontal_edge_index,
             nudgezone_diff=self.nudgezone_diff,
             fac_bdydiff_v=self.fac_bdydiff_v,
             start_2nd_nudge_line_idx_e=int32(edge_start_nudging_plus_one),
@@ -746,8 +746,8 @@ def _do_diffusion_step(
             dwdy=diagnostic_state.dwdy,
             diff_multfac_w=self.diff_multfac_w,
             diff_multfac_n2w=self.diff_multfac_n2w,
-            vert_idx=self.vertical_index,
-            horz_idx=self.horizontal_cell_index,
+            k=self.vertical_index,
+            cell=self.horizontal_cell_index,
             nrdmax=int32(
                 self.vertical_params.index_of_damping_layer + 1
             ),  # +1 since Fortran includes boundaries

diff --git a/model/atmosphere/diffusion/tests/diffusion_tests/mpi_tests/test_parallel_diffusion.py b/model/atmosphere/diffusion/tests/diffusion_tests/mpi_tests/test_parallel_diffusion.py
@@ -26,6 +26,9 @@
 from ..utils import verify_diffusion_fields
 
 
+@pytest.mark.xfail(
+    "TODO(@halungge) fails due to expectation of field allocation (vertical ~ contiguous) in ghex."
+)
 @pytest.mark.mpi
 @pytest.mark.parametrize("ndyn_substeps", [2])
 @pytest.mark.parametrize("linit", [True, False])

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
@@ -492,6 +492,10 @@ def time_step(
                 exner=prognostic_state_ls[nnew].exner,
                 rd_o_cvd=self.params.rd_o_cvd,
                 rd_o_p0ref=self.params.rd_o_p0ref,
+                horizontal_start=0,
+                horizontal_end=end_cell_end,
+                vertical_start=0,
+                vertical_end=self.grid.num_levels,
                 offset_provider={},
             )
 

diff --git a/model/atmosphere/dycore/tests/dycore_tests/mpi_tests/test_parallel_solve_nonhydro.py b/model/atmosphere/dycore/tests/dycore_tests/mpi_tests/test_parallel_solve_nonhydro.py
@@ -40,6 +40,9 @@
 )
 
 
+@pytest.mark.xfail(
+    "TODO(@halungge) fails due to expectation of field allocation (vertical ~ contiguous) in ghex."
+)
 @pytest.mark.datatest
 @pytest.mark.parametrize(
     "istep_init, jstep_init, step_date_init,istep_exit, jstep_exit, step_date_exit",