Skip to content

ufs-community ccpp-physics 307 #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grantfirl merged 5 commits into from
Sep 25, 2025
Merged

ufs-community ccpp-physics 307 #620

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b96b60b
Changes from NOAA-EMC/ufsatm PR#1001
scrasmussen Sep 18, 2025
86414ca
Commits for NCAR/ccpp-physics PR#1164
scrasmussen Sep 18, 2025
2132d15
Merge branch 'main' into ufsatm-1001
grantfirl Sep 23, 2025
e8f1614
update ccpp/physics submodule
grantfirl Sep 25, 2025
fe40a72
update ccpp/physics and .gitmodules after merging
grantfirl Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 11 files
+48 −46 physics/PBL/SATMEDMF/satmedmfvdifq.F
+4 −4 physics/PBL/SATMEDMF/satmedmfvdifq.meta
+11 −10 physics/SFC_Layer/UFS/sfc_diag.f
+4 −4 physics/SFC_Layer/UFS/sfc_diag.meta
+18 −18 physics/SFC_Layer/UFS/sfc_diff.f
+4 −4 physics/SFC_Layer/UFS/sfc_diff.meta
+10 −10 physics/SFC_Layer/UFS/sfc_nst.f90
+4 −4 physics/SFC_Layer/UFS/sfc_nst.meta
+16 −14 physics/SFC_Models/Ocean/UFS/sfc_ocean.F
+4 −4 physics/SFC_Models/Ocean/UFS/sfc_ocean.meta
+109 −112 physics/docs/pdftxt/suite_input.nml.txt
16 changes: 6 additions & 10 deletions scm/src/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,9 +1368,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
Expand Down Expand Up @@ -3672,7 +3670,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
!--- 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

Expand Down Expand Up @@ -3963,9 +3961,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
!< 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
Expand Down Expand Up @@ -4269,7 +4265,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
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
Expand Down Expand Up @@ -5349,7 +5345,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
!--- 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
Expand Down Expand Up @@ -7233,7 +7229,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
Expand Down
8 changes: 4 additions & 4 deletions scm/src/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6162,12 +6162,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
Expand Down
Loading