diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
index 177a920a3..74da764dc 100644
--- a/ccpp/data/GFS_typedefs.F90
+++ b/ccpp/data/GFS_typedefs.F90
@@ -1966,6 +1966,7 @@ module GFS_typedefs
     integer                             :: nspc1                         !<
     integer                             :: ntcwx                         !<
     integer                             :: ntiwx                         !<
+    integer                             :: ntrwx                         !<
     integer                             :: ntk                           !<
     integer                             :: ntkev                         !<
     integer                             :: nvdiff                        !<
@@ -7351,6 +7352,9 @@ subroutine interstitial_setup_tracers(Interstitial, Model)
     Interstitial%otspt(:,:)       = .true.
     Interstitial%nsamftrac        = 0
     Interstitial%ncstrac          = 0
+    Interstitial%ntcwx            = 0
+    Interstitial%ntiwx            = 0
+    Interstitial%ntrwx            = 0
 
     ! perform aerosol convective transport and PBL diffusion
     Interstitial%trans_aero = Model%cplchm .and. Model%trans_trac
@@ -7383,27 +7387,33 @@ subroutine interstitial_setup_tracers(Interstitial, Model)
 
     Interstitial%nscav = Model%ntrac - Model%ncnd + 2
 
-    Interstitial%ntcwx = Model%ntcw
     if (Interstitial%nvdiff == Model%ntrac) then
+      Interstitial%ntcwx = Model%ntcw
       Interstitial%ntiwx = Model%ntiw
+      Interstitial%ntrwx = Model%ntrw
     else
       if (Model%imp_physics == Model%imp_physics_wsm6) then
+        Interstitial%ntcwx = 2
         Interstitial%ntiwx = 3
       elseif (Model%imp_physics == Model%imp_physics_thompson) then
-        if(Model%ltaerosol) then
-          Interstitial%ntiwx = 3
-        else
-          Interstitial%ntiwx = 3
-        endif
+        Interstitial%ntcwx = 2
+        Interstitial%ntiwx = 3
+        Interstitial%ntrwx = 4
       elseif (Model%imp_physics == Model%imp_physics_gfdl) then
+        Interstitial%ntcwx = 2
         Interstitial%ntiwx = 3
+        Interstitial%ntrwx = 4
       ! F-A MP scheme
       elseif (Model%imp_physics == Model%imp_physics_fer_hires) then
-        Interstitial%ntiwx = 3 ! total ice or total condensate
+        Interstitial%ntcwx = 2
+        Interstitial%ntiwx = 3
+        Interstitial%ntrwx = 4
       elseif (Model%imp_physics == Model%imp_physics_mg) then
+        Interstitial%ntcwx = 2
         Interstitial%ntiwx = 3
-      else
-        Interstitial%ntiwx = 0
+        Interstitial%ntrwx = 4
+      elseif (Model%imp_physics == Model%imp_physics_zhao_carr) then
+        Interstitial%ntcwx = 2
       endif
     endif
 
diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
index e9860eecb..0b5abf86e 100644
--- a/ccpp/data/GFS_typedefs.meta
+++ b/ccpp/data/GFS_typedefs.meta
@@ -8898,6 +8898,12 @@
   units = index
   dimensions = ()
   type = integer
+[ntrwx]
+  standard_name = index_for_rain_water_vertical_diffusion_tracer
+  long_name = tracer index for rain water in the vertically diffused tracer array
+  units = index
+  dimensions = ()
+  type = integer
 [ntk]
   standard_name = index_for_turbulent_kinetic_energy_convective_transport_tracer
   long_name = index for turbulent kinetic energy in the convectively transported tracer array
diff --git a/ccpp/physics b/ccpp/physics
index eb2875603..d18964278 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit eb28756036b280c2c1a741112045fefd5639c6a9
+Subproject commit d189642784545b7edfeebace7b972fea25f42e20