From 78955ff54cf3e7841f211419dd78f0fc003550f1 Mon Sep 17 00:00:00 2001 From: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com> Date: Tue, 2 Apr 2024 08:50:20 -0400 Subject: [PATCH 1/5] Update io/module_write_netcdf.F90 (#810) Changes made to address netcdf write hangs within RRFS system --- io/module_write_netcdf.F90 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/io/module_write_netcdf.F90 b/io/module_write_netcdf.F90 index 03a9d57dc..515fc6e76 100644 --- a/io/module_write_netcdf.F90 +++ b/io/module_write_netcdf.F90 @@ -407,7 +407,11 @@ end function nf_set_log_level if (is_cubed_sphere) then chunksizes = [im, jm, 1, 1, 1] else +<<<<<<< HEAD chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), min(kchunk3d(grid_id),fldlev(i)), 1] +======= + chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), fldlev(i), 1] +>>>>>>> c01786de (Update io/module_write_netcdf.F90 (#810)) end if ncerr = nf90_def_var_chunking(ncid, varids(i), NF90_CHUNKED, chunksizes) ; NC_ERR_STOP(ncerr) end if From fab599453f5f31d0e740d53654612184a2e884ae Mon Sep 17 00:00:00 2001 From: jordanschnell Date: Thu, 11 Apr 2024 13:15:05 -0400 Subject: [PATCH 2/5] [production/RRFS.v1] Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!) (#812) * Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!) * Move ebu_smoke outside of extended_sd_diag IF block in diagnostics * Update ccpp/physics to relevant commmit, revert .gitmodules back to original state --- ccpp/driver/GFS_diagnostics.F90 | 10 ++++++++++ ccpp/physics | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 4729819ea..cb6031d3e 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -4972,6 +4972,16 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop endif extended_smoke_dust_diagnostics + idx = idx + 1 + ExtDiag(idx)%axes = 3 + ExtDiag(idx)%name = 'ebu_smoke' + ExtDiag(idx)%desc = 'smoke emission' + ExtDiag(idx)%unit = 'ug/m2/s' + ExtDiag(idx)%mod_name = 'gfs_phys' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%ebu_smoke(:,:) + enddo idx = idx + 1 ExtDiag(idx)%axes = 2 diff --git a/ccpp/physics b/ccpp/physics index f3eeb3442..5d1a4aa90 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit f3eeb3442775b7239d98e3d09acc6d4f1d42233e +Subproject commit 5d1a4aa9075dc7c03fb9c98eadcc15cc4d0bf743 From 1779f549810d9358b32e440dcd54c6840df04622 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 29 Oct 2024 16:59:13 -0400 Subject: [PATCH 3/5] fix merge errors --- ccpp/driver/GFS_diagnostics.F90 | 15 ++------------- io/module_write_netcdf.F90 | 4 ---- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index cb6031d3e..9731510a6 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -4971,7 +4971,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop endif endif extended_smoke_dust_diagnostics - + idx = idx + 1 ExtDiag(idx)%axes = 3 ExtDiag(idx)%name = 'ebu_smoke' @@ -4980,7 +4980,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%mod_name = 'gfs_phys' allocate (ExtDiag(idx)%data(nblks)) do nb = 1,nblks - ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%ebu_smoke(:,:) + ExtDiag(idx)%data(nb)%var3 => Coupling%ebu_smoke(Model%chunk_begin(nb):Model%chunk_end(nb),:) enddo idx = idx + 1 @@ -5044,17 +5044,6 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop endif smoke_forecast_mode - idx = idx + 1 - ExtDiag(idx)%axes = 3 - ExtDiag(idx)%name = 'ebu_smoke' - ExtDiag(idx)%desc = 'smoke emission' - ExtDiag(idx)%unit = 'ug/m2/s' - ExtDiag(idx)%mod_name = 'gfs_phys' - allocate (ExtDiag(idx)%data(nblks)) - do nb = 1,nblks - ExtDiag(idx)%data(nb)%var3 => Coupling%ebu_smoke(Model%chunk_begin(nb):Model%chunk_end(nb),:) - enddo - idx = idx + 1 ExtDiag(idx)%axes = 3 ExtDiag(idx)%name = 'ext550' diff --git a/io/module_write_netcdf.F90 b/io/module_write_netcdf.F90 index 515fc6e76..016d6416d 100644 --- a/io/module_write_netcdf.F90 +++ b/io/module_write_netcdf.F90 @@ -407,11 +407,7 @@ end function nf_set_log_level if (is_cubed_sphere) then chunksizes = [im, jm, 1, 1, 1] else -<<<<<<< HEAD - chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), min(kchunk3d(grid_id),fldlev(i)), 1] -======= chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), fldlev(i), 1] ->>>>>>> c01786de (Update io/module_write_netcdf.F90 (#810)) end if ncerr = nf90_def_var_chunking(ncid, varids(i), NF90_CHUNKED, chunksizes) ; NC_ERR_STOP(ncerr) end if From 6d7cb5a6b17910132ef860bfcc424dfb92bce232 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 29 Oct 2024 17:04:16 -0400 Subject: [PATCH 4/5] revert changes to io/module_write_netcdf.F90 since changes in produciton/RRFS.v1 were already in develop --- io/module_write_netcdf.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/module_write_netcdf.F90 b/io/module_write_netcdf.F90 index 016d6416d..03a9d57dc 100644 --- a/io/module_write_netcdf.F90 +++ b/io/module_write_netcdf.F90 @@ -407,7 +407,7 @@ end function nf_set_log_level if (is_cubed_sphere) then chunksizes = [im, jm, 1, 1, 1] else - chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), fldlev(i), 1] + chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), min(kchunk3d(grid_id),fldlev(i)), 1] end if ncerr = nf90_def_var_chunking(ncid, varids(i), NF90_CHUNKED, chunksizes) ; NC_ERR_STOP(ncerr) end if From 4327b1273c3bfa76492a1eec5ef4deb1100c111f Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 30 Dec 2024 10:13:24 -0500 Subject: [PATCH 5/5] update ccpp physics after merge --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index cca3c1da4..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/ufs-community/ccpp-physics - #branch = ufs/dev - url = https://github.com/grantfirl/ccpp-physics - branch = rrfsv1-to-ufs/dev5 + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 2594a9e2c..dfad42fe3 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2594a9e2c73c2a3a9acaa78fef8252cf5de3b524 +Subproject commit dfad42fe3ac83ab76c9e2523a5d185752d771fa8