Skip to content
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

Jump to bottom

UFS-dev PR#26 #387

Merged
merged 2 commits into from
Jun 29, 2023
Merged

UFS-dev PR#26 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24d24bb
update the SCM to work with the ccpp/physics PR#26 in ufs/dev
grantfirl Jun 14, 2023
16bc850
update ccpp/physics submodule and revert .gitmodules
grantfirl Jun 29, 2023
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
1 change: 1 addition & 0 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
'ccpp/physics/physics/lsm_noah.f' ,
'ccpp/physics/physics/noahmpdrv.F90' ,
'ccpp/physics/physics/flake_driver.F90' ,
'ccpp/physics/physics/clm_lake.f90' ,
'ccpp/physics/physics/sfc_nst_pre.f' ,
'ccpp/physics/physics/sfc_nst.f' ,
'ccpp/physics/physics/sfc_nst_post.f' ,
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 37 files
+10 −3 physics/GFS_MP_generic_post.F90
+28 −0 physics/GFS_MP_generic_post.meta
+29 −3 physics/GFS_phys_time_vary.fv3.F90
+67 −0 physics/GFS_phys_time_vary.fv3.meta
+3 −3 physics/GFS_radiation_surface.F90
+4 −4 physics/GFS_radiation_surface.meta
+5 −3 physics/GFS_surface_composites_inter.F90
+9 −2 physics/GFS_surface_composites_inter.meta
+58 −23 physics/GFS_surface_composites_post.F90
+35 −0 physics/GFS_surface_composites_post.meta
+30 −23 physics/GFS_surface_composites_pre.F90
+22 −8 physics/GFS_surface_composites_pre.meta
+5,619 −0 physics/clm_lake.f90
+952 −0 physics/clm_lake.meta
+63 −20 physics/flake.F90
+204 −146 physics/flake_driver.F90
+255 −65 physics/flake_driver.meta
+3 −2 physics/lsm_ruc.F90
+3 −3 physics/lsm_ruc.meta
+2 −2 physics/myjsfc_wrapper.F90
+0 −8 physics/myjsfc_wrapper.meta
+1 −0 physics/physcons.F90
+4 −4 physics/radiation_surface.f
+6 −6 physics/scm_sfc_flux_spec.F90
+6 −6 physics/scm_sfc_flux_spec.meta
+45 −29 physics/sfc_diag.f
+44 −0 physics/sfc_diag.meta
+2 −2 physics/sfc_diff.f
+1 −1 physics/sfc_diff.meta
+8 −8 physics/sfc_nst.f
+5 −5 physics/sfc_nst.meta
+5 −4 physics/sfc_nst_post.f
+4 −4 physics/sfc_nst_post.meta
+5 −4 physics/sfc_ocean.F
+4 −4 physics/sfc_ocean.meta
+5 −4 physics/sfc_sice.f
+4 −4 physics/sfc_sice.meta
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_HRRR.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_ruc</scheme>
<scheme>clm_lake</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
Expand Down
3 changes: 0 additions & 3 deletions scm/src/CCPP_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ module CCPP_typedefs
integer, pointer :: idxday(:) => null() !<
logical, pointer :: icy(:) => null() !<
logical, pointer :: lake(:) => null() !<
logical, pointer :: use_flake(:) => null() !<
logical, pointer :: ocean(:) => null() !<
integer :: ipr !<
integer, pointer :: islmsk(:) => null() !<
Expand Down Expand Up @@ -576,7 +575,6 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model)
allocate (Interstitial%idxday (IM))
allocate (Interstitial%icy (IM))
allocate (Interstitial%lake (IM))
allocate (Interstitial%use_flake (IM))
allocate (Interstitial%ocean (IM))
allocate (Interstitial%islmsk (IM))
allocate (Interstitial%islmsk_cice (IM))
Expand Down Expand Up @@ -1255,7 +1253,6 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model)
Interstitial%dry = .false.
Interstitial%icy = .false.
Interstitial%lake = .false.
Interstitial%use_flake = .false.
Interstitial%ocean = .false.
Interstitial%islmsk = 0
Interstitial%islmsk_cice = 0
Expand Down
6 changes: 0 additions & 6 deletions scm/src/CCPP_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,12 +1238,6 @@
units = flag
dimensions = (horizontal_loop_extent)
type = logical
[use_flake]
standard_name = flag_for_using_flake
long_name = flag indicating lake points using flake model
units = flag
dimensions = (horizontal_loop_extent)
type = logical
[ocean]
standard_name = flag_nonzero_ocean_surface_fraction
long_name = flag indicating presence of some ocean surface area fraction
Expand Down
263 changes: 249 additions & 14 deletions scm/src/GFS_typedefs.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading