From 98b5524bff9fbcc51ea0a6136bd8e5b1576ca42f Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Thu, 3 Oct 2024 10:27:38 -0500 Subject: [PATCH 1/3] Update chunksizes for cubed sphere grid --- io/module_write_netcdf.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io/module_write_netcdf.F90 b/io/module_write_netcdf.F90 index b0164151e..03a9d57dc 100644 --- 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 From c304b42db8309ef706eadeaeebb6b23eb0206bed Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 10 Oct 2024 16:42:40 -0600 Subject: [PATCH 2/3] Update .gitmodules and submodule pointer for ccpp-framework for code review and testing --- .gitmodules | 6 ++++-- ccpp/framework | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..c9a7fc74d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = main + #url = https://github.com/NCAR/ccpp-framework + #branch = main + url = https://github.com/climbfuji/ccpp-framework + branch = bugfix/unit_conv_invalid_allocation_prebuild [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/ufs-community/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index 0f8232724..8c8b60498 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 0f8232724975c13289cad390c9a71fa2c6a9bff4 +Subproject commit 8c8b60498ec463ea2d3d5b79950c6b47f4af3e34 From e249b4bd02539a491437d586f91881df2c175ae9 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 23 Oct 2024 11:43:57 +0000 Subject: [PATCH 3/3] Revert .gitmodules and update ccpp/framework --- .gitmodules | 6 ++---- ccpp/framework | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index c9a7fc74d..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = main - url = https://github.com/climbfuji/ccpp-framework - branch = bugfix/unit_conv_invalid_allocation_prebuild + url = https://github.com/NCAR/ccpp-framework + branch = main [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/ufs-community/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index 8c8b60498..b7d55fd07 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 8c8b60498ec463ea2d3d5b79950c6b47f4af3e34 +Subproject commit b7d55fd07fa35c5de9b2292596d30784a800b276