From 45a330cf58f51770b9194a288bfbf08f69254ef2 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Tue, 17 Sep 2024 00:05:08 +0000 Subject: [PATCH 1/9] add namelist parameter sigmab_coldstart --- .gitmodules | 6 ++++-- ccpp/data/GFS_typedefs.F90 | 5 +++++ ccpp/data/GFS_typedefs.meta | 6 ++++++ ccpp/physics | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..a1d2f8699 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + #url = https://github.com/ufs-community/ccpp-physics + #branch = ufs/dev + url = https://github.com/grantfirl/ccpp-physics + branch = rrfsv1-to-ufs/dev10 [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 4614c087b..c46799e15 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1258,6 +1258,7 @@ module GFS_typedefs real(kind=kind_phys) :: betascu !< Tuning parameter for prog. closure shallow clouds real(kind=kind_phys) :: betamcu !< Tuning parameter for prog. closure midlevel clouds real(kind=kind_phys) :: betadcu !< Tuning parameter for prog. closure deep clouds + logical :: sigmab_coldstart !< flag to cold start sigmab !--- MYNN parameters/switches logical :: do_mynnedmf @@ -3787,6 +3788,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & real(kind=kind_phys) :: betascu = 8.0 !< Tuning parameter for prog. closure shallow clouds real(kind=kind_phys) :: betamcu = 1.0 !< Tuning parameter for prog. closure midlevel clouds real(kind=kind_phys) :: betadcu = 2.0 !< Tuning parameter for prog. closure deep clouds + logical :: sigmab_coldstart = .false. !< flag to cold start sigmab ! *DH logical :: do_myjsfc = .false. !< flag for MYJ surface layer scheme logical :: do_myjpbl = .false. !< flag for MYJ PBL scheme @@ -4141,6 +4143,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & do_myjsfc, do_myjpbl, & hwrf_samfdeep, hwrf_samfshal,progsigma,betascu,betamcu, & betadcu,h2o_phys, pdfcld, shcnvcw, redrag, hybedmf, satmedmf,& + sigmab_coldstart, & shinhong, do_ysu, dspheat, lheatstrg, lseaspray, cnvcld, & xr_cnvcld, random_clds, shal_cnv, imfshalcnv, imfdeepcnv, & isatmedmf, conv_cf_opt, do_deep, jcap, & @@ -4970,6 +4973,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%betascu = betascu Model%betamcu = betamcu Model%betadcu = betadcu + Model%sigmab_coldstart = sigmab_coldstart if (oz_phys .and. oz_phys_2015) then write(*,*) 'Logic error: can only use one ozone physics option (oz_phys or oz_phys_2015), not both. Exiting.' @@ -7004,6 +7008,7 @@ subroutine control_print(Model) print *, 'betascu : ', Model%betascu print *, 'betamcu : ', Model%betamcu print *, 'betadcu : ', Model%betadcu + print *, 'sigmab_coldstart : ', Model%sigmab_coldstart print *, ' ' print *, 'cellular automata' print *, ' nca : ', Model%nca diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index bd0e34975..461a3154d 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -5674,6 +5674,12 @@ dimensions = () type = real kind = kind_phys +[sigmab_coldstart] + standard_name = flag_to_cold_start_for_sigmab_init + long_name = flag to cold start for sigmab initialization + units = flag + dimensions = () + type = logical [isatmedmf] standard_name = choice_of_scale_aware_TKE_moist_EDMF_PBL long_name = choice of scale-aware TKE moist EDMF PBL scheme diff --git a/ccpp/physics b/ccpp/physics index db19a6d1d..1e5a6d3af 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit db19a6d1d7fa7ed56f62318501c4abb5fb8b1138 +Subproject commit 1e5a6d3af61eae38a6e431d47548e7a33e54893f From 2e3076fd0a8e43a27c079af742ebce499d712d85 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Fri, 11 Oct 2024 00:15:45 +0000 Subject: [PATCH 2/9] fix for inline post when using RUC LSM --- io/post_fv3.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index a74e47670..215f46248 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -1668,7 +1668,8 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) sllevel(7) = 1.0 sllevel(8) = 1.6 sllevel(9) = 3.0 - endif + iSF_SURFACE_PHYSICS = 3 + endif ! liquid volumetric soil mpisture in fraction if(trim(fieldname)=='soill1') then From 8bdaef277defe3d1d219e6489e44601f82fc5e3e Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Fri, 18 Oct 2024 20:57:59 +0000 Subject: [PATCH 3/9] pass landsfcmdl to iSF_SURFACE_PHYSICS in post_fv3 --- io/post_fv3.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index 215f46248..6ad77abba 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -597,6 +597,7 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) ! integer i, ip1, j, l, k, n, iret, ibdl, rc, kstart, kend integer i1,i2,j1,j2,k1,k2 + integer landsfcmdl integer fieldDimCount,gridDimCount,ncount_field,bundle_grid_id integer jdate(8) logical foundland, foundice, found, mvispresent @@ -1668,7 +1669,6 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) sllevel(7) = 1.0 sllevel(8) = 1.6 sllevel(9) = 3.0 - iSF_SURFACE_PHYSICS = 3 endif ! liquid volumetric soil mpisture in fraction From f6af75569eaaa28f18f255836c5a9a0e3efd42be Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Sat, 2 Nov 2024 01:02:07 +0000 Subject: [PATCH 4/9] remove redundant declaration --- io/post_fv3.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index 6ad77abba..86c3991db 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -597,7 +597,6 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) ! integer i, ip1, j, l, k, n, iret, ibdl, rc, kstart, kend integer i1,i2,j1,j2,k1,k2 - integer landsfcmdl integer fieldDimCount,gridDimCount,ncount_field,bundle_grid_id integer jdate(8) logical foundland, foundice, found, mvispresent From 2e7f4801fc0196882e843fa27dd0e4c47d3248c7 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Wed, 13 Nov 2024 19:50:02 +0000 Subject: [PATCH 5/9] another bug fix for LSM soil output with inline post --- io/fv3atm_history_io.F90 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/io/fv3atm_history_io.F90 b/io/fv3atm_history_io.F90 index 6fe537e04..9bd102d22 100644 --- a/io/fv3atm_history_io.F90 +++ b/io/fv3atm_history_io.F90 @@ -187,8 +187,7 @@ subroutine history_type_register(hist, Diag, Time, Atm_block, Model, xlon, xlat, hist%fhzero = Model%fhzero ! hist%ncld = Model%ncld hist%ncld = Model%imp_physics - hist%nsoil = Model%lsoil - hist%nsoil_lsm = Model%lsoil_lsm + hist%nsoil = Model%lsoil_lsm hist%dtp = Model%dtp hist%imp_physics = Model%imp_physics hist%landsfcmdl = Model%lsm From 26b1af9e79ae8813cba7709638d0b092382c2dc6 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 7 Feb 2025 10:44:31 -0500 Subject: [PATCH 6/9] remove unnecessary change in io/post_fv3.F90 --- io/post_fv3.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index 86c3991db..a74e47670 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -1668,7 +1668,7 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) sllevel(7) = 1.0 sllevel(8) = 1.6 sllevel(9) = 3.0 - endif + endif ! liquid volumetric soil mpisture in fraction if(trim(fieldname)=='soill1') then From 64b2d01792bcf668c273d53fd2ad416ae7bfeb94 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 14 Feb 2025 10:47:00 -0500 Subject: [PATCH 7/9] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 1e5a6d3af..26783c859 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 1e5a6d3af61eae38a6e431d47548e7a33e54893f +Subproject commit 26783c859477fd13519c814a28b40b0824b644fe From e660f16941961feef5057c6d57f6eab1a9c5d83f Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 14 Feb 2025 11:06:47 -0500 Subject: [PATCH 8/9] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 26783c859..04cd3b0a1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 26783c859477fd13519c814a28b40b0824b644fe +Subproject commit 04cd3b0a107ad38f90574690493ec351b9db43dd From 9d073801dd01b3bc8fa378350158a672298b8c0d Mon Sep 17 00:00:00 2001 From: jkbk2004 Date: Wed, 19 Feb 2025 09:55:19 -0700 Subject: [PATCH 9/9] update physics hash and revert changes in gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index a1d2f8699..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/dev10 + 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 5f6ffca4c..dce8be651 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 5f6ffca4c46cb5f438591563e22d60db3bdf6e6a +Subproject commit dce8be6515a5bdac7f281d0c8c2bdbc227592a6f