Use proper index variable for surface wind enhancement due to convect…

…ion in phy_f2d array in GFS_typedefs.{F90,meta}

gfsphysics/GFS_layer/GFS_typedefs.F90

@@ -1173,10 +1173,11 @@ module GFS_typedefs
     integer              :: nqvdelt         !< the index of specific humidity at the previous timestep for Z-C MP in phy_f3d
     integer              :: nps2delt        !< the index of surface air pressure 2 timesteps back for Z-C MP in phy_f2d
     integer              :: npsdelt         !< the index of surface air pressure at the previous timestep for Z-C MP in phy_f2d
+    integer              :: ncnvwind        !< the index of surface wind enhancement due to convection for MYNN SFC and RAS CNV in phy f2d
 #endif
 
 !--- debug flag
-    logical              :: debug         
+    logical              :: debug
     logical              :: pre_rad         !< flag for testing purpose
 
 !--- variables modified at each time step
@@ -4873,6 +4874,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
 #endif
     if(Model%cnvcld) Model%ncnvcld3d = 1
 
+!--- get cnvwind index in phy_f2d; last entry in phy_f2d array
+    Model%ncnvwind = Model%num_p2d
+
 !--- get cnvw and cnvc indices in phy_f3d
     Model%ncnvw = -999
     Model%ncnvc = -999

gfsphysics/GFS_layer/GFS_typedefs.meta

@@ -4504,6 +4504,12 @@
   units = 
   dimensions = ()
   type = integer
+[ncnvwind]
+  standard_name = index_for_surface_wind_enhancement_due_to_convection
+  long_name = the index of surface wind enhancement due to convection in phy f2d
+  units = 
+  dimensions = ()
+  type = integer
 [debug]
   standard_name = flag_debug
   long_name = control flag for debug
@@ -5285,14 +5291,14 @@
   type = real
   kind = kind_phys
   active = (index_for_surface_air_pressure_at_previous_timestep > 0)
-[phy_f2d(:,array_dimension_of_2d_arrays_for_microphysics)]
+[phy_f2d(:,index_for_surface_wind_enhancement_due_to_convection)]
   standard_name = surface_wind_enhancement_due_to_convection
   long_name = surface wind enhancement due to convection
   units = m s-1
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  active = (array_dimension_of_2d_arrays_for_microphysics > 0)
+  active = (index_for_surface_wind_enhancement_due_to_convection > 0)
 [phy_f3d(:,:,index_for_air_temperature_two_timesteps_back)]
   standard_name = air_temperature_two_timesteps_back
   long_name = air temperature two timesteps back