Merge branch 'develop' into feature/lnd_iau

* develop: Update chunksizes for cubed sphere grid (NOAA-EMC#876) First reconciliation PR from production/RRFS.v1 (NOAA-EMC#872)
tsga · Oct 30, 2024 · 0527fa6 · 0527fa6
2 parents 300cdfc + 99091f9
commit 0527fa6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ccpp/framework b/ccpp/framework
diff --git a/io/module_write_netcdf.F90 b/io/module_write_netcdf.F90
@@ -398,14 +398,14 @@ end function nf_set_log_level
             par_access = NF90_COLLECTIVE
             if (rank == 2 .and. ichunk2d(grid_id) > 0 .and. jchunk2d(grid_id) > 0) then
                if (is_cubed_sphere) then
-                  chunksizes = [im, jm, tileCount, 1]
+                  chunksizes = [im, jm, 1, 1]
                else
                   chunksizes = [ichunk2d(grid_id), jchunk2d(grid_id),            1]
                end if
                ncerr = nf90_def_var_chunking(ncid, varids(i), NF90_CHUNKED, chunksizes) ; NC_ERR_STOP(ncerr)
             else if (rank == 3 .and. ichunk3d(grid_id) > 0 .and. jchunk3d(grid_id) > 0 .and. kchunk3d(grid_id) > 0) then
                if (is_cubed_sphere) then
-                  chunksizes = [im, jm, lm, tileCount, 1]
+                  chunksizes = [im, jm, 1, 1, 1]
                else
                   chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), min(kchunk3d(grid_id),fldlev(i)), 1]
                end if
+3 −2		scripts/mkcap.py
+30 −5		scripts/mkstatic.py
+2 −1		test_prebuild/run_all_tests.sh
+11 −6		test_prebuild/test_blocked_data/main.F90
+5 −5		test_prebuild/test_chunked_data/main.F90
+98 −0		test_prebuild/test_unit_conv/CMakeLists.txt
+16 −0		test_prebuild/test_unit_conv/README.md
+13 −0		test_prebuild/test_unit_conv/ccpp_kinds.F90
+15 −0		test_prebuild/test_unit_conv/ccpp_kinds.meta
+82 −0		test_prebuild/test_unit_conv/ccpp_prebuild_config.py
+22 −0		test_prebuild/test_unit_conv/data.F90
+53 −0		test_prebuild/test_unit_conv/data.meta
+92 −0		test_prebuild/test_unit_conv/main.F90
+13 −0		test_prebuild/test_unit_conv/run_test.sh
+11 −0		test_prebuild/test_unit_conv/suite_unit_conv_suite.xml
+55 −0		test_prebuild/test_unit_conv/unit_conv_scheme_1.F90
+41 −0		test_prebuild/test_unit_conv/unit_conv_scheme_1.meta
+55 −0		test_prebuild/test_unit_conv/unit_conv_scheme_2.F90
+41 −0		test_prebuild/test_unit_conv/unit_conv_scheme_2.meta