release/public-v2: update .gitmodules, fix linker problem in gfsphysi…

…cs, update SDF for FV3_RRFS_v1beta (NOAA-EMC#173)

- updates `.gitmodules` to refer to the correct branches used by the fv3atm release/public-v2 branch
- points to ufs-release/public-v2 branch of GFDL_atmos_cubed_sphere in the NOAA-GFDL repository
- contains a bugfix for `gfsphysics/CMakeLists.txt` (cherry-pickeded from develop) for a linker problem when compiling with CCPP
- replace GSL drag suite with CIRES UGWP/GFS GWD in `ccpp/suites/suite_FV3_RRFS_v1beta.xml` (a decision made by the SRW App Release Team leads)
- move the non-physics diagnostic tendencies from the `gfs_phys` output stream to the `gfs_dyn` output stream (cherry-picked from develop, from @grantfirl)

.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

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")

ccpp/suites/suite_FV3_RRFS_v1beta.xml

@@ -56,7 +56,8 @@
       <scheme>GFS_surface_generic_post</scheme>
       <scheme>mynnedmf_wrapper</scheme>
       <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>drag_suite</scheme>
+      <scheme>cires_ugwp</scheme>
+      <scheme>cires_ugwp_post</scheme>
       <scheme>GFS_GWD_generic_post</scheme>
       <scheme>rayleigh_damp</scheme>
       <scheme>GFS_suite_stateout_update</scheme>

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

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