merge upstream/develop

NOAA-EMC · Sep 1, 2020 · 15fc07b · 15fc07b
1 parent 0b01a66
commit 15fc07b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
+2 −2		physics/GFS_MP_generic.meta
+1 −1		physics/GFS_debug.F90
+8 −5		physics/GFS_rrtmg_pre.F90
+22 −14		physics/GFS_rrtmgp_sw_pre.F90
+29 −20		physics/GFS_rrtmgp_sw_pre.meta
+2 −2		physics/GFS_stochastics.meta
+32 −39		physics/GFS_surface_generic.F90
+34 −52		physics/GFS_surface_generic.meta
+3 −3		physics/radiation_surface.f
+14 −2		physics/rrtmg_sw_pre.F90
+3 −3		physics/sfc_drv.f
+1 −1		physics/sfc_drv.meta