From 91cdff12201dcdf315bee8e7a6bedfd8d1d42b2d Mon Sep 17 00:00:00 2001 From: jili dong Date: Wed, 21 May 2025 17:36:13 +0000 Subject: [PATCH 1/4] update ccpp/physics --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 75876f6fa..e1ad81bb1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = production/RRFS.v1 [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = production/RRFS.v1 +# url = https://github.com/ufs-community/ccpp-physics +# branch = production/RRFS.v1 + url = https://github.com/JiliDong-NOAA/ccpp-physics + branch = sigmab_restart_fix [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index c19759964..852f8060d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c197599640f63a35867c0cee993fee66a67e1b68 +Subproject commit 852f8060d20642272d707aa82a6222f5a04007fa From dfc3f101e67ec9d2e2d0ce46cf0d060cb24e9c92 Mon Sep 17 00:00:00 2001 From: jili dong Date: Fri, 23 May 2025 19:16:33 +0000 Subject: [PATCH 2/4] fix for snow water equivalent accumulation restart reproducibility --- io/fv3atm_restart_io.F90 | 2 ++ io/fv3atm_sfc_io.F90 | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/io/fv3atm_restart_io.F90 b/io/fv3atm_restart_io.F90 index 7dc8460ba..55bfb6c9f 100644 --- a/io/fv3atm_restart_io.F90 +++ b/io/fv3atm_restart_io.F90 @@ -405,6 +405,8 @@ subroutine fv3atm_checksum (Model, GFS_Data, Atm_block) call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%tsnow_ice) call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%snowfallac_land) call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%snowfallac_ice) + call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%acsnow_land) + call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%acsnow_ice) call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%sfalb_lnd) call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%sfalb_lnd_bck) call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%sfalb_ice) diff --git a/io/fv3atm_sfc_io.F90 b/io/fv3atm_sfc_io.F90 index c0bfcf6d9..bfd5d8c0f 100644 --- a/io/fv3atm_sfc_io.F90 +++ b/io/fv3atm_sfc_io.F90 @@ -123,9 +123,9 @@ function Sfc_io_calculate_indices(sfc, Model, reading, warm_start) endif if (Model%lsm == Model%lsm_ruc .and. warm_start) then if (Model%rdlai) then - nvar2r = 13 + nvar2r = 15 else - nvar2r = 12 + nvar2r = 14 endif nvar3 = 5 else @@ -534,6 +534,8 @@ subroutine Sfc_io_fill_2d_names(sfc,Model,warm_start) nt=nt+1 ; sfc%name2(nt) = 'tsnow_ice' nt=nt+1 ; sfc%name2(nt) = 'snowfall_acc_land' nt=nt+1 ; sfc%name2(nt) = 'snowfall_acc_ice' + nt=nt+1 ; sfc%name2(nt) = 'acsnow_land' + nt=nt+1 ; sfc%name2(nt) = 'acsnow_ice' nt=nt+1 ; sfc%name2(nt) = 'sfalb_lnd' nt=nt+1 ; sfc%name2(nt) = 'sfalb_lnd_bck' nt=nt+1 ; sfc%name2(nt) = 'sfalb_ice' @@ -1051,6 +1053,8 @@ subroutine Sfc_io_transfer(sfc, reading, Model, Atm_block, Sfcprop, warm_start, call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%tsnow_ice) call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%snowfallac_land) call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%snowfallac_ice) + call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%acsnow_land) + call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%acsnow_ice) call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%sfalb_lnd) call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%sfalb_lnd_bck) call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%sfalb_ice) From 59b39892bda96dd173b8765444dd9fb77e5c6a1b Mon Sep 17 00:00:00 2001 From: jili dong Date: Fri, 23 May 2025 19:25:01 +0000 Subject: [PATCH 3/4] revert ccpp/physics --- .gitmodules | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index e1ad81bb1..75876f6fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = production/RRFS.v1 [submodule "ccpp/physics"] path = ccpp/physics -# url = https://github.com/ufs-community/ccpp-physics -# branch = production/RRFS.v1 - url = https://github.com/JiliDong-NOAA/ccpp-physics - branch = sigmab_restart_fix + url = https://github.com/ufs-community/ccpp-physics + branch = production/RRFS.v1 [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 8ecef9df480b08ba3973edc7a08673a9a04d0296 Mon Sep 17 00:00:00 2001 From: jili dong Date: Fri, 23 May 2025 19:30:46 +0000 Subject: [PATCH 4/4] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 852f8060d..c19759964 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 852f8060d20642272d707aa82a6222f5a04007fa +Subproject commit c197599640f63a35867c0cee993fee66a67e1b68