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

Mynnsfclay from joe in latest code without reversing composites in typedefs 2020/03/19 #17

Merged
merged 5 commits into from
Mar 19, 2020
Merged

Mynnsfclay from joe in latest code without reversing composites in typedefs 2020/03/19 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
596a0b5
Update to MYNN Surface Layer Scheme and related modules - part II
joeolson42 Feb 28, 2020
7648548
Merge branch 'gsd/develop' of https://github.com/joeolson42/fv3atm in…
climbfuji Mar 17, 2020
3972587
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Mar 17, 2020
78586f4
Mirror changes to CCPP version of GFS_debug.F90 in IPD version
climbfuji Mar 17, 2020
1ffee69
Update .gitmodules for creating back branch of Joe's work
climbfuji Mar 19, 2020
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: 5 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@
branch = gsd/develop
[submodule "ccpp/physics"]
path = ccpp/physics
#url = https://github.com/NOAA-GSD/ccpp-physics
#branch = gsd/develop
#url = https://github.com/climbfuji/ccpp-physics
#branch = mynnsfclay_from_joe_in_latest_code
url = https://github.com/NOAA-GSD/ccpp-physics
branch = gsd/develop
branch = mynnsfclay_from_joe_in_latest_code_without_reversing_composites_in_typedefs_20200319
2 changes: 1 addition & 1 deletion atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,7 +1443,7 @@ subroutine update_atmos_chemistry(state, rc)
ib = i + Atm_block%isc - 1
nb = Atm_block%blkno(ib,jb)
ix = Atm_block%ixp(ib,jb)
hpbl(i,j) = IPD_Data(nb)%IntDiag%hpbl(ix)
hpbl(i,j) = IPD_Data(nb)%Tbd%hpbl(ix)
area(i,j) = IPD_Data(nb)%Grid%area(ix)
stype(i,j) = IPD_Data(nb)%Sfcprop%stype(ix)
rainc(i,j) = IPD_Data(nb)%Coupling%rainc_cpl(ix)
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated from d1ef65 to b91b34
2 changes: 1 addition & 1 deletion gfsphysics/GFS_layer/GFS_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%hpbl(:)
ExtDiag(idx)%data(nb)%var2 => Tbd(nb)%hpbl(:)
enddo

idx = idx + 1
Expand Down
152 changes: 69 additions & 83 deletions gfsphysics/GFS_layer/GFS_typedefs.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading