Merge pull request #17 from climbfuji/mynnsfclay_from_joe_in_latest_c…

…ode_without_reversing_composites_in_typedefs_20200319 Mynnsfclay from joe in latest code without reversing composites in typedefs 2020/03/19
NOAA-GSL · Mar 19, 2020 · 82f1ace · 82f1ace
2 parents 2a05c53 + 1ffee69
commit 82f1ace
Show file tree

Hide file tree

Showing 7 changed files with 228 additions and 238 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/atmos_model.F90 b/atmos_model.F90
@@ -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)

diff --git a/ccpp/physics b/ccpp/physics
diff --git a/gfsphysics/GFS_layer/GFS_diagnostics.F90 b/gfsphysics/GFS_layer/GFS_diagnostics.F90
@@ -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

diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90