diff --git a/ccpp/framework b/ccpp/framework
index b14e3e041..209f1c92d 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit b14e3e0415205ea4d3004bfb5241cc34da702db8
+Subproject commit 209f1c92d99b7d4cc63e0d41c652fcfd730bd9fa
diff --git a/ccpp/physics b/ccpp/physics
index 01c2257ab..168932b60 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 01c2257ab1538b3e9a51fed5a5b10f4dda5bfddf
+Subproject commit 168932b60a6c5cabab1257e2ab99f9e6c1a1da36
diff --git a/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml b/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml
index 89f21fd7c..fac22314c 100644
--- a/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml
+++ b/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml
@@ -60,9 +60,9 @@
rayleigh_damp
GFS_suite_stateout_update
ozphys
- GFS_DCNV_generic_pre
get_phi_fv3
GFS_suite_interstitial_3
+ GFS_DCNV_generic_pre
samfdeepcnv
GFS_DCNV_generic_post
GFS_SCNV_generic_pre
diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90
index 967a4cc64..7da19334f 100644
--- a/gfsphysics/GFS_layer/GFS_typedefs.F90
+++ b/gfsphysics/GFS_layer/GFS_typedefs.F90
@@ -140,7 +140,6 @@ module GFS_typedefs
#ifdef CCPP
!--- restart information
logical :: restart !< flag whether this is a coldstart (.false.) or a warmstart/restart (.true.)
- logical :: cycling !< flag whether this is a coldstart (.false.) or a cycled run (.true.)
!--- hydrostatic/non-hydrostatic flag
logical :: hydrostatic !< flag whether this is a hydrostatic or non-hydrostatic run
#endif
@@ -1125,7 +1124,6 @@ module GFS_typedefs
#ifdef CCPP
logical :: first_time_step !< flag signaling first time step for time integration routine
logical :: restart !< flag whether this is a coldstart (.false.) or a warmstart/restart (.true.)
- logical :: cycling !< flag whether this is a coldstart (.false.) or a cycled run (.true.)
logical :: hydrostatic !< flag whether this is a hydrostatic or non-hydrostatic run
#endif
integer :: jdat(1:8) !< current forecast date and time
@@ -2890,7 +2888,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
logical :: aux2d_time_avg(1:naux2dmax) = .false. !< flags for time averaging of auxiliary 2d arrays
logical :: aux3d_time_avg(1:naux3dmax) = .false. !< flags for time averaging of auxiliary 3d arrays
- logical :: cycling = .false. !< flag to activate extra cycling procedures
real(kind=kind_phys) :: fhcyc = 0. !< frequency for surface data cycling (hours)
integer :: thermodyn_id = 1 !< valid for GFS only for get_prs/phi
integer :: sfcpress_id = 1 !< valid for GFS only for get_prs/phi
@@ -4164,7 +4161,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
#ifdef CCPP
Model%first_time_step = .true.
Model%restart = restart
- Model%cycling = cycling
Model%hydrostatic = hydrostatic
#endif
Model%jdat(1:8) = jdat(1:8)
@@ -5128,7 +5124,6 @@ subroutine control_print(Model)
print *, ' sec : ', Model%sec
print *, ' first_time_step : ', Model%first_time_step
print *, ' restart : ', Model%restart
- print *, ' cycling : ', Model%cycling
print *, ' hydrostatic : ', Model%hydrostatic
#endif
endif
@@ -5783,7 +5778,6 @@ end subroutine diag_create
subroutine diag_rad_zero(Diag, Model)
class(GFS_diag_type) :: Diag
type(GFS_control_type), intent(in) :: Model
- integer :: i
Diag%fluxr = zero
Diag%topfsw%upfxc = zero
@@ -5806,7 +5800,6 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center)
logical,optional, intent(in) :: linit, iauwindow_center
logical set_totprcp
- integer :: i
!--- In/Out
Diag%srunoff = zero
diff --git a/gfsphysics/GFS_layer/GFS_typedefs.meta b/gfsphysics/GFS_layer/GFS_typedefs.meta
index 337b3fce8..b8b450f04 100644
--- a/gfsphysics/GFS_layer/GFS_typedefs.meta
+++ b/gfsphysics/GFS_layer/GFS_typedefs.meta
@@ -4010,7 +4010,7 @@
[slag]
standard_name = equation_of_time
long_name = equation of time (radian)
- units = radians
+ units = radian
dimensions = ()
type = real
kind = kind_phys
@@ -4074,12 +4074,6 @@
units = flag
dimensions = ()
type = logical
-[cycling]
- standard_name = flag_for_cycling
- long_name = flag for cycling or coldstart
- units = flag
- dimensions = ()
- type = logical
[hydrostatic]
standard_name = flag_for_hydrostatic_solver
long_name = flag for hydrostatic solver from dynamics
@@ -4319,14 +4313,14 @@
[xlat]
standard_name = latitude
long_name = latitude
- units = radians
+ units = radian
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
[xlon]
standard_name = longitude
long_name = longitude
- units = radians
+ units = radian
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
@@ -4345,9 +4339,9 @@
type = real
kind = kind_phys
[xlat_d]
- standard_name = latitude_degree
- long_name = latitude in degrees
- units = degree
+ standard_name = latitude_in_degree
+ long_name = latitude in degree north
+ units = degree_north
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
@@ -8150,7 +8144,7 @@
type = real
kind = kind_phys
[save_tcp]
- standard_name = air_temperature_save_from_cumulus_paramterization
+ standard_name = air_temperature_save_from_convective_parameterization
long_name = air temperature after cumulus parameterization
units = K
dimensions = (horizontal_dimension,vertical_dimension)
@@ -8344,7 +8338,7 @@
[theta]
standard_name = angle_from_east_of_maximum_subgrid_orographic_variations
long_name = angle with_respect to east of maximum subgrid orographic variations
- units = degrees
+ units = degree
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
@@ -9482,7 +9476,7 @@
[con_pi]
standard_name = pi
long_name = ratio of a circle's circumference to its diameter
- units = radians
+ units = none
dimensions = ()
type = real
kind = kind_phys
@@ -9502,7 +9496,7 @@
kind = kind_phys
[con_t0c]
standard_name = temperature_at_zero_celsius
- long_name = temperature at 0 degrees Celsius
+ long_name = temperature at 0 degree Celsius
units = K
dimensions = ()
type = real