Merge branch 'main' into advection_ppm

C2SM · Nov 29, 2024 · 3d0e8dc · 3d0e8dc
2 parents 34d11df + 66452b9
commit 3d0e8dc
Show file tree

Hide file tree

Showing 17 changed files with 648 additions and 465 deletions.
diff --git a/jenkins/spack-PR b/jenkins/spack-PR
@@ -53,7 +53,7 @@ pipeline {
                         steps {
                             script{
                                 sh """
-                                . ./spack-c2sm/setup-env.sh
+                                . ./spack-c2sm/setup-env.sh /mch-environment/v7
                                 cd local_copy
                                 spack env activate spack/gt4py-main
                                 spack install -v --test=root

diff --git a/jenkins/spack-PR-stable b/jenkins/spack-PR-stable
@@ -53,7 +53,7 @@ pipeline {
                         steps {
                             script{
                                 sh """
-                                . ./spack-c2sm/setup-env.sh
+                                . ./spack-c2sm/setup-env.sh /mch-environment/v7
                                 cd local_copy
                                 spack env activate spack/gt4py-stable
                                 spack install -v --test=root

diff --git a/model/atmosphere/diffusion/tests/diffusion_tests/test_diffusion.py b/model/atmosphere/diffusion/tests/diffusion_tests/test_diffusion.py
@@ -61,9 +61,7 @@ def _construct_minimal_decomposition_info(grid: icon.IconGrid):
         return decomposition_info
 
     if not grid_functionality[experiment].get(name):
-        on_gpu = helpers.is_gpu(backend)
-        gm = grid_utils.get_icon_grid_from_gridfile(experiment, on_gpu)
-        gm()
+        gm = grid_utils.get_grid_manager_for_experiment(experiment, backend)
         grid = gm.grid
         decomposition_info = _construct_minimal_decomposition_info(grid)
         geometry_ = geometry.GridGeometry(

diff --git a/model/common/src/icon4py/model/common/grid/grid_manager.py b/model/common/src/icon4py/model/common/grid/grid_manager.py