Merge pull request #196 from grantfirl/units_fix

Update master branch to work with ccpp-physics master

scm/src/GFS_typedefs.F90

@@ -220,6 +220,8 @@ module GFS_typedefs
     real (kind=kind_phys), pointer :: zorl   (:)   => null()  !< composite surface roughness in cm
     real (kind=kind_phys), pointer :: zorlo  (:)   => null()  !< ocean surface roughness in cm
     real (kind=kind_phys), pointer :: zorll  (:)   => null()  !< land surface roughness in cm
+    real (kind=kind_phys), pointer :: zorli  (:)   => null()  !< ice  surface roughness in cm
+    real (kind=kind_phys), pointer :: zorlw  (:)   => null()  !< wave surface roughness in cm
     real (kind=kind_phys), pointer :: fice   (:)   => null()  !< ice fraction over open water grid
 !   real (kind=kind_phys), pointer :: hprim  (:)   => null()  !< topographic standard deviation in m
     real (kind=kind_phys), pointer :: hprime (:,:) => null()  !< orographic metrics
@@ -2169,6 +2171,8 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
     allocate (Sfcprop%zorl     (IM))
     allocate (Sfcprop%zorlo    (IM))
     allocate (Sfcprop%zorll    (IM))
+    allocate (Sfcprop%zorli    (IM))
+    allocate (Sfcprop%zorlw    (IM))
     allocate (Sfcprop%fice     (IM))
 !   allocate (Sfcprop%hprim    (IM))
     allocate (Sfcprop%hprime   (IM,Model%nmtvr))
@@ -2187,6 +2191,8 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
     Sfcprop%zorl      = clear_val
     Sfcprop%zorlo     = clear_val
     Sfcprop%zorll     = clear_val
+    Sfcprop%zorli     = clear_val
+    Sfcprop%zorlw     = clear_val
     Sfcprop%fice      = clear_val
 !   Sfcprop%hprim     = clear_val
     Sfcprop%hprime    = clear_val

scm/src/GFS_typedefs.meta

@@ -540,6 +540,20 @@
   dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys
+[zorli]
+  standard_name = surface_roughness_length_over_ice
+  long_name = surface roughness length over ice
+  units = cm
+  dimensions = (horizontal_dimension)
+  type = real
+  kind = kind_phys
+[zorlw]
+  standard_name = surface_roughness_length_from_wave_model
+  long_name = surface roughness length from wave model
+  units = cm
+  dimensions = (horizontal_dimension)
+  type = real
+  kind = kind_phys
 [fice]
   standard_name = sea_ice_concentration
   long_name = ice fraction over open water
@@ -3626,21 +3640,21 @@
 [min_lakeice]
   standard_name = lake_ice_minimum
   long_name = minimum lake ice value
-  units = ???
+  units = frac
   dimensions = ()
   type = real
   kind = kind_phys
 [min_seaice]
   standard_name = sea_ice_minimum
   long_name = minimum sea ice value
-  units = ???
+  units = frac
   dimensions = ()
   type = real
   kind = kind_phys
 [rho_h2o]
   standard_name = density_of_fresh_water
   long_name = density of fresh water
-  units = ???
+  units = kg m-3
   dimensions = ()
   type = real
   kind = kind_phys