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

Move LSM vegetation lookup tables into CCPP, clean up RUC snow cover on ice initialization (remove IPD step 2) #244

Merged
merged 2 commits into from
Feb 6, 2021
Merged

Move LSM vegetation lookup tables into CCPP, clean up RUC snow cover on ice initialization (remove IPD step 2) #244

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1098884
Move LSM vegetation lookup tables into CCPP, clean up RUC snow cover …
climbfuji Feb 4, 2021
f22006a
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Feb 5, 2021
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,5 +8,7 @@
branch = master
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = master
#url = https://github.com/NCAR/ccpp-physics
#branch = master
url = https://github.com/climbfuji/ccpp-physics
branch = move_lsm_table_init_to_ccpp
7 changes: 0 additions & 7 deletions ccpp/driver/GFS_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,6 @@ subroutine GFS_initialize (Model, Statein, Stateout, Sfcprop, &
!--- populate the grid components
call GFS_grid_populate (Grid, Init_parm%xlon, Init_parm%xlat, Init_parm%area)

! DH* TODO - MOVE TO CCPP
! sfc_drv.f/lsm_noah_init and sfc_noahmp_drv.f/noahmpdrv_init; Note: This is
! automatically called during the CCPP physics initialization stage.
!--- initialize soil vegetation
call set_soilveg(Model%me, Model%isot, Model%ivegsrc, Model%nlunit)
! *DH

end subroutine GFS_initialize

!------------------
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 2 files
+53 −33 physics/GFS_phys_time_vary.fv3.F90
+104 −1 physics/GFS_phys_time_vary.fv3.meta
2 changes: 0 additions & 2 deletions gfsphysics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ if(32BIT)
endif()

set(CCPP_SOURCES
physics/namelist_soilveg.f
physics/set_soilveg.f
physics/noahmp_tables.f90
Copy link
Collaborator

Choose a reason for hiding this comment

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

Looks like this is the last remaining file in gfsphysics. Is it used? Can we remove it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This will be done by Mike Barlage and Helin Wei as part of their work to move the Noah MP initialization into CCPP. For their work, the present PR is a requirement.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok. Thanks. The exact same file is already in ccpp-physics. Which of those two is actually used (linked into the executable)? I guess it depends on which one is specified first in the link command.

)

Expand Down
49 changes: 0 additions & 49 deletions gfsphysics/physics/namelist_soilveg.f
View file
Open in desktop

This file was deleted.

Loading