diff --git a/.gitmodules b/.gitmodules
index 789f67889..e88d5144c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
[submodule "atmos_cubed_sphere"]
path = atmos_cubed_sphere
- url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere
- branch = dev/emc
+ url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
+ branch = ufs-release/public-v2
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
- branch = master
+ branch = release/public-v5
[submodule "ccpp/physics"]
path = ccpp/physics
- url = https://github.com/NCAR/ccpp-physics.git
- branch = master
+ url = https://github.com/NCAR/ccpp-physics
+ branch = release/public-v5
diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
index 8b59ebc03..27cc6ab4e 160000
--- a/atmos_cubed_sphere
+++ b/atmos_cubed_sphere
@@ -1 +1 @@
-Subproject commit 8b59ebc039dafe1c20ed6dd21cb38ca564852b98
+Subproject commit 27cc6ab4e46a3381be77edb1c0fbb4561334b1cc
diff --git a/ccpp/CMakeLists.txt b/ccpp/CMakeLists.txt
index dd1c317e4..35341be88 100644
--- a/ccpp/CMakeLists.txt
+++ b/ccpp/CMakeLists.txt
@@ -119,11 +119,13 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
endif (LEGACY_INTEL)
elseif (${CMAKE_BUILD_TYPE} MATCHES "Release")
# Specify aggressive optimization flags (to be overwritten for individual files in ccpp-physics' CMakeLists.txt)
- if (SIMDMULTIARCH)
- set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512")
- else (SIMDMULTIARCH)
- set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX2")
- endif (SIMDMULTIARCH)
+ if (AVX2)
+ if (SIMDMULTIARCH)
+ set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512")
+ else (SIMDMULTIARCH)
+ set (CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX2")
+ endif (SIMDMULTIARCH)
+ endif (AVX2)
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3")
endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
set (CMAKE_Fortran_FLAGS_DEFAULT_PREC "-i4 -real-size 64")
diff --git a/ccpp/framework b/ccpp/framework
index 209f1c92d..930d96333 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit 209f1c92d99b7d4cc63e0d41c652fcfd730bd9fa
+Subproject commit 930d96333cd562672a77832fa885805c8ffff0ac
diff --git a/ccpp/physics b/ccpp/physics
index 8617587ed..5c9c75436 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 8617587edb95aa097b7bbc2735990393bc6d9b90
+Subproject commit 5c9c75436df4796ace8d951d72f0846859bdc148
diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/suite_FV3_RRFS_v1beta.xml
index 3bff7b39d..c570483df 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml
+++ b/ccpp/suites/suite_FV3_RRFS_v1beta.xml
@@ -56,7 +56,8 @@
GFS_surface_generic_post
mynnedmf_wrapper
GFS_GWD_generic_pre
- drag_suite
+ cires_ugwp
+ cires_ugwp_post
GFS_GWD_generic_post
rayleigh_damp
GFS_suite_stateout_update
diff --git a/gfsphysics/CMakeLists.txt b/gfsphysics/CMakeLists.txt
index 34faf6f4c..2c5040588 100644
--- a/gfsphysics/CMakeLists.txt
+++ b/gfsphysics/CMakeLists.txt
@@ -17,7 +17,6 @@ endif()
set(CCPP_SOURCES
physics/mersenne_twister.f
physics/namelist_soilveg.f
- physics/physparam.f
physics/set_soilveg.f
physics/noahmp_tables.f90
diff --git a/gfsphysics/GFS_layer/GFS_diagnostics.F90 b/gfsphysics/GFS_layer/GFS_diagnostics.F90
index 1b6fabe96..adb624cca 100644
--- a/gfsphysics/GFS_layer/GFS_diagnostics.F90
+++ b/gfsphysics/GFS_layer/GFS_diagnostics.F90
@@ -2445,7 +2445,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'dt3dt_nophys'
ExtDiag(idx)%desc = 'temperature tendency due to non-physics processes'
ExtDiag(idx)%unit = 'K s-1'
- ExtDiag(idx)%mod_name = 'gfs_phys'
+ ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
@@ -2626,7 +2626,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'du3dt_nophys'
ExtDiag(idx)%desc = 'u momentum tendency due to non-physics processes'
ExtDiag(idx)%unit = 'm s-2'
- ExtDiag(idx)%mod_name = 'gfs_phys'
+ ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
@@ -2638,7 +2638,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'dv3dt_nophys'
ExtDiag(idx)%desc = 'v momentum tendency due to non-physics processes'
ExtDiag(idx)%unit = 'm s-2'
- ExtDiag(idx)%mod_name = 'gfs_phys'
+ ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
@@ -2785,7 +2785,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'dq3dt_nophys'
ExtDiag(idx)%desc = 'water vapor specific humidity tendency due to non-physics processes'
ExtDiag(idx)%unit = 'kg kg-1 s-1'
- ExtDiag(idx)%mod_name = 'gfs_phys'
+ ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
@@ -2797,7 +2797,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%name = 'dq3dt_o3nophys'
ExtDiag(idx)%desc = 'ozone concentration tendency due to non-physics processes'
ExtDiag(idx)%unit = 'kg kg-1 s-1'
- ExtDiag(idx)%mod_name = 'gfs_phys'
+ ExtDiag(idx)%mod_name = 'gfs_dyn'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks