Skip to content

UFS-dev PR#26 #95

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 4 commits into from
Jun 29, 2023
Merged

UFS-dev PR#26 #95

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33ac26d
Add CLM Lake Model and update Flake (#606)
SamuelTrahanNOAA Apr 26, 2023
478978e
Merge commit '33ac26d' into ufs-dev-PR26
grantfirl May 9, 2023
1a47c56
update ccpp/physics submodule pointer
grantfirl Jun 13, 2023
e340fc1
update ccpp/physics 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics

@mkavulich mkavulich Jun 28, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update prior to merge

branch = main
#url = https://github.com/NCAR/ccpp-physics
#branch = main
url = https://github.com/grantfirl/ccpp-physics
branch = ufs-dev-PR26
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ add_library(fv3atm
cpl/module_block_data.F90
cpl/module_cplfields.F90
cpl/module_cap_cpl.F90
io/clm_lake_io.F90
io/FV3GFS_io.F90
io/FV3GFS_restart_io.F90
io/module_write_netcdf.F90
Expand Down
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 @@ -183,6 +183,7 @@
'physics/physics/lsm_noah.f',
'physics/physics/noahmpdrv.F90',
'physics/physics/flake_driver.F90',
'physics/physics/clm_lake.f90',
'physics/physics/sfc_nst_pre.f',
'physics/physics/sfc_nst.f',
'physics/physics/sfc_nst_post.f',
Expand Down
3 changes: 0 additions & 3 deletions ccpp/data/CCPP_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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 @@ -647,7 +646,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 @@ -1327,7 +1325,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 ccpp/data/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
266 changes: 250 additions & 16 deletions ccpp/data/GFS_typedefs.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading