From b96b60bfc04176a6a87ac81b040cfef954b4b026 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Wed, 17 Sep 2025 20:53:52 -0600 Subject: [PATCH 1/4] Changes from NOAA-EMC/ufsatm PR#1001 --- scm/src/GFS_typedefs.F90 | 16 ++++++---------- scm/src/GFS_typedefs.meta | 8 ++++---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90 index 35164f022..bb8be9545 100644 --- a/scm/src/GFS_typedefs.F90 +++ b/scm/src/GFS_typedefs.F90 @@ -1360,9 +1360,7 @@ module GFS_typedefs !< 6=areodynamical roughness over water with input 10-m wind !< 7=slightly decrease Cd for higher wind speed compare to 6 !--- air_sea_flux scheme - integer :: icplocn2atm !< air_sea flux options over ocean: - !< 0=no change - !< l=including ocean current in the computation of air_sea fluxes + logical :: use_oceanuv !< flag for including ocean current in the computation of air_sea fluxes !--- potential temperature definition in surface layer physics logical :: thsfc_loc !< flag for local vs. standard potential temperature @@ -3663,7 +3661,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & !--- GFDL microphysical parameters logical :: lgfdlmprad = .false. !< flag for GFDLMP radiation interaction logical :: fast_mp_consv = .false. - + !--- Thompson,GFDL microphysical parameter logical :: lrefres = .false. !< flag for radar reflectivity in restart file @@ -3951,9 +3949,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & !< 6=areodynamical roughness over water with input 10-m wind !< 7=slightly decrease Cd for higher wind speed compare to 6 !< negative when cplwav2atm=.true. - i.e. two way wave coupling - integer :: icplocn2atm = 0 !< air_sea_flux options over ocean - !< 0=ocean current is not used in the computation of air_sea fluxes - !< 1=including ocean current in the computation of air_sea fluxes + logical :: use_oceanuv = .false. !< flag for air_sea_flux options over ocean !--- potential temperature definition in surface layer physics logical :: thsfc_loc = .true. !< flag for local vs. standard potential temperature @@ -4257,7 +4253,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & frac_grid, min_lakeice, min_seaice, min_lake_height, & ignore_lake, frac_ice, & !--- surface layer - sfc_z0_type, icplocn2atm, & + sfc_z0_type, use_oceanuv, & !--- switch beteeen local and standard potential temperature thsfc_loc, & !--- switches in 2-m diagnostics @@ -5278,7 +5274,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & !--- surface layer Model%sfc_z0_type = sfc_z0_type if (Model%cplwav2atm) Model%sfc_z0_type = -1 - Model%icplocn2atm = icplocn2atm + Model%use_oceanuv = use_oceanuv !--- potential temperature reference in sfc layer Model%thsfc_loc = thsfc_loc @@ -7145,7 +7141,7 @@ subroutine control_print(Model) print *, ' ' print *, 'surface layer options' print *, ' sfc_z0_type : ', Model%sfc_z0_type - print *, ' icplocn2atm : ', Model%icplocn2atm + print *, ' use_oceanuv : ', Model%use_oceanuv print *, ' ' print *, 'vertical diffusion coefficients' print *, ' xkzm_m : ', Model%xkzm_m diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta index 675589479..9c129bf20 100644 --- a/scm/src/GFS_typedefs.meta +++ b/scm/src/GFS_typedefs.meta @@ -6131,12 +6131,12 @@ units = flag dimensions = () type = integer -[icplocn2atm] - standard_name = control_for_air_sea_flux_computation_over_water +[use_oceanuv] + standard_name = do_air_sea_flux_computation_over_water long_name = air-sea flux option - units = 1 + units = flag dimensions = () - type = integer + type = logical [xkzminv] standard_name = max_atmosphere_heat_diffusivity_due_to_background long_name = maximum background value of heat diffusivity From 86414ca5cbb4e742d8d61ed214f5db2ec59859f0 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Wed, 17 Sep 2025 20:55:38 -0600 Subject: [PATCH 2/4] Commits for NCAR/ccpp-physics PR#1164 --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index dc0798c32..0c936aad9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/scrasmussen/ccpp-physics + branch = ufsatm-1001 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 2bd74bab4..e477cb7c5 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2bd74bab4cddeb1d24b1cec132b3762ec1464be4 +Subproject commit e477cb7c5aeb5194e250f10d96502c6d37d7cd5f From e8f16143cf8d559751d140216bfaf38ad89d5204 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 25 Sep 2025 13:54:01 -0400 Subject: [PATCH 3/4] update ccpp/physics submodule --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 18d9fa2c1..f32df9970 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 18d9fa2c1f43997df72a713e56e868884d5aeaba +Subproject commit f32df99703116f643ecf91b6f56cb539faa15672 From fe40a729a63253a193baa9dbc291b698e4aad6c6 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 25 Sep 2025 14:33:51 -0400 Subject: [PATCH 4/4] update ccpp/physics and .gitmodules after merging --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0c936aad9..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/scrasmussen/ccpp-physics - branch = ufsatm-1001 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index f32df9970..5a43fea7b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit f32df99703116f643ecf91b6f56cb539faa15672 +Subproject commit 5a43fea7b32d42571c545976c798e9c69c86781f