Merge pull request NCAR#104 from climbfuji/update_gsl_develop_from_ma…

…in_20210819

Update gsl/develop from main 2021/08/24

physics/GFS_GWD_generic.meta

@@ -16,7 +16,7 @@
   intent = in
   optional = F
 [levs]
-  standard_name = vertical_dimension
+  standard_name = vertical_layer_dimension
   long_name = vertical layer dimension
   units = count
   dimensions = ()
@@ -25,15 +25,15 @@
   optional = F
 [nmtvr]
   standard_name = number_of_statistical_measures_of_subgrid_orography
-  long_name = number of statistical measures of subgrid orography
+  long_name = number of statistical measures of subgrid height_above_mean_sea_level
   units = count
   dimensions = ()
   type = integer
   intent = in
   optional = F
 [mntvar]
-  standard_name = statistical_measures_of_subgrid_orography
-  long_name = array of statistical measures of subgrid orography
+  standard_name = statistical_measures_of_subgrid_orography_collection_array
+  long_name = array of statistical measures of subgrid height_above_mean_sea_level
   units = various
   dimensions = (horizontal_loop_extent,number_of_statistical_measures_of_subgrid_orography)
   type = real
@@ -42,7 +42,7 @@
   optional = F
 [oc]
   standard_name = convexity_of_subgrid_orography
-  long_name = convexity of subgrid orography
+  long_name = convexity of subgrid height_above_mean_sea_level
   units = none
   dimensions = (horizontal_loop_extent)
   type = real
@@ -51,7 +51,7 @@
   optional = F
 [oa4]
   standard_name = asymmetry_of_subgrid_orography
-  long_name = asymmetry of subgrid orography
+  long_name = asymmetry of subgrid height_above_mean_sea_level
   units = none
   dimensions = (horizontal_loop_extent,4)
   type = real
@@ -60,7 +60,7 @@
   optional = F
 [clx]
   standard_name = fraction_of_grid_box_with_subgrid_orography_higher_than_critical_height
-  long_name = horizontal fraction of grid box covered by subgrid orography higher than critical height
+  long_name = horizontal fraction of grid box covered by subgrid height_above_mean_sea_level higher than critical height
   units = frac
   dimensions = (horizontal_loop_extent,4)
   type = real
@@ -78,7 +78,7 @@
   optional = F
 [varss]
   standard_name = standard_deviation_of_subgrid_orography_small_scale
-  long_name = standard deviation of subgrid orography small scale
+  long_name = standard deviation of subgrid height_above_mean_sea_level small scale
   units = m
   dimensions = (horizontal_loop_extent)
   type = real
@@ -87,7 +87,7 @@
   optional = F
 [ocss]
   standard_name = convexity_of_subgrid_orography_small_scale
-  long_name = convexity of subgrid orography small scale
+  long_name = convexity of subgrid height_above_mean_sea_level small scale
   units = none
   dimensions = (horizontal_loop_extent)
   type = real
@@ -96,7 +96,7 @@
   optional = F
 [oa4ss]
   standard_name = asymmetry_of_subgrid_orography_small_scale
-  long_name = asymmetry of subgrid orography small scale
+  long_name = asymmetry of subgrid height_above_mean_sea_level small scale
   units = none
   dimensions = (horizontal_loop_extent,4)
   type = real
@@ -105,7 +105,7 @@
   optional = F
 [clxss]
   standard_name = fraction_of_grid_box_with_subgrid_orography_higher_than_critical_height_small_scale
-  long_name = horizontal fraction of grid box covered by subgrid orography higher than critical height small scale
+  long_name = horizontal fraction of grid box covered by subgrid height_above_mean_sea_level higher than critical height small scale
   units = frac
   dimensions = (horizontal_loop_extent,4)
   type = real
@@ -114,7 +114,7 @@
   optional = F
 [sigma]
   standard_name = slope_of_subgrid_orography
-  long_name = slope of subgrid orography
+  long_name = slope of subgrid height_above_mean_sea_level
   units = none
   dimensions = (horizontal_loop_extent)
   type = real
@@ -123,7 +123,7 @@
   optional = F
 [gamma]
   standard_name = anisotropy_of_subgrid_orography
-  long_name = anisotropy of subgrid orography
+  long_name = anisotropy of subgrid height_above_mean_sea_level
   units = none
   dimensions = (horizontal_loop_extent)
   type = real
@@ -132,52 +132,52 @@
   optional = F
 [elvmax]
   standard_name = maximum_subgrid_orography
-  long_name = maximum of subgrid orography
+  long_name = maximum of subgrid height_above_mean_sea_level
   units = m
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
   intent = out
   optional = F
 [lssav]
-  standard_name = flag_diagnostics
+  standard_name = flag_for_diagnostics
   long_name = logical flag for storing diagnostics
   units = flag
   dimensions = ()
   type = logical
   intent = in
   optional = F
 [ldiag3d]
-  standard_name = flag_diagnostics_3D
+  standard_name = flag_for_diagnostics_3D
   long_name = flag for 3d diagnostic fields
   units = flag
   dimensions = ()
   type = logical
   intent = in
   optional = F
 [dudt]
-  standard_name = tendency_of_x_wind_due_to_model_physics
+  standard_name = process_split_cumulative_tendency_of_x_wind
   long_name = zonal wind tendency due to model physics
   units = m s-2
-  dimensions = (horizontal_loop_extent,vertical_dimension)
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
   optional = F
 [dvdt]
-  standard_name = tendency_of_y_wind_due_to_model_physics
+  standard_name = process_split_cumulative_tendency_of_y_wind
   long_name = meridional wind tendency due to model physics
   units = m s-2
-  dimensions = (horizontal_loop_extent,vertical_dimension)
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
   optional = F
 [dtdt]
-  standard_name = tendency_of_air_temperature_due_to_model_physics
+  standard_name = process_split_cumulative_tendency_of_air_temperature
   long_name = updated tendency of the temperature
   units = K s-1
-  dimensions = (horizontal_loop_extent,vertical_dimension)
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
@@ -186,7 +186,7 @@
   standard_name = cumulative_change_of_state_variables
   long_name = diagnostic tendencies for state variables
   units = various
-  dimensions = (horizontal_loop_extent,vertical_dimension,number_of_cumulative_change_processes)
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_cumulative_change_processes)
   type = real
   kind = kind_phys
   intent = inout
@@ -232,7 +232,7 @@
   intent = in
   optional = F
 [dtf]
-  standard_name = time_step_for_dynamics
+  standard_name = timestep_for_dynamics
   long_name = dynamics timestep
   units = s
   dimensions = ()
@@ -241,7 +241,7 @@
   intent = in
   optional = F
 [flag_for_gwd_generic_tend]
-  standard_name = flag_for_generic_gravity_wave_drag_tendency
+  standard_name = flag_for_generic_tendency_due_to_gravity_wave_drag
   long_name = true if GFS_GWD_generic should calculate tendencies
   units = flag
   dimensions = ()
@@ -277,23 +277,23 @@
   name = GFS_GWD_generic_post_run
   type = scheme
 [lssav]
-  standard_name = flag_diagnostics
+  standard_name = flag_for_diagnostics
   long_name = flag for calculating diagnostic fields
   units = flag
   dimensions = ()
   type = logical
   intent = in
   optional = F
 [ldiag3d]
-  standard_name = flag_diagnostics_3D
+  standard_name = flag_for_diagnostics_3D
   long_name = flag for calculating 3-D diagnostic fields
   units = flag
   dimensions = ()
   type = logical
   intent = in
   optional = F
 [dtf]
-  standard_name = time_step_for_dynamics
+  standard_name = timestep_for_dynamics
   long_name = dynamics time step
   units = s
   dimensions = ()
@@ -320,28 +320,28 @@
   intent = in
   optional = F
 [dudt]
-  standard_name = tendency_of_x_wind_due_to_model_physics
+  standard_name = process_split_cumulative_tendency_of_x_wind
   long_name = zonal wind tendency due to model physics
   units = m s-2
-  dimensions = (horizontal_loop_extent,vertical_dimension)
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
   optional = F
 [dvdt]
-  standard_name = tendency_of_y_wind_due_to_model_physics
+  standard_name = process_split_cumulative_tendency_of_y_wind
   long_name = meridional wind tendency due to model physics
   units = m s-2
-  dimensions = (horizontal_loop_extent,vertical_dimension)
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
   optional = F
 [dtdt]
-  standard_name = tendency_of_air_temperature_due_to_model_physics
+  standard_name = process_split_cumulative_tendency_of_air_temperature
   long_name = air temperature tendency due to model physics
   units = K s-1
-  dimensions = (horizontal_loop_extent,vertical_dimension)
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
@@ -368,7 +368,7 @@
   standard_name = cumulative_change_of_state_variables
   long_name = diagnostic tendencies for state variables
   units = various
-  dimensions = (horizontal_loop_extent,vertical_dimension,number_of_cumulative_change_processes)
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_cumulative_change_processes)
   type = real
   kind = kind_phys
   intent = inout
@@ -414,7 +414,7 @@
   intent = in
   optional = F
 [flag_for_gwd_generic_tend]
-  standard_name = flag_for_generic_gravity_wave_drag_tendency
+  standard_name = flag_for_generic_tendency_due_to_gravity_wave_drag
   long_name = true if GFS_GWD_generic should calculate tendencies
   units = flag
   dimensions = ()

physics/GFS_MP_generic.F90

@@ -84,8 +84,9 @@ end subroutine GFS_MP_generic_post_init
 !!
 !> \section gfs_mp_gen GFS MP Generic Post General Algorithm
 !> @{
-      subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl,     &
-        imp_physics_thompson, imp_physics_mg, imp_physics_fer_hires, cal_pre, cplflx, cplchm, con_g, dtf, frain, rainc,   &
+      subroutine GFS_MP_generic_post_run(                                                                                 &
+        im, levs, kdt, nrcm, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl, imp_physics_thompson,                      &
+        imp_physics_mg, imp_physics_fer_hires, cal_pre, cplflx, cplchm, con_g, rainmin, dtf, frain, rainc,                &
         rain1, rann, xlat, xlon, gt0, gq0, prsl, prsi, phii, tsfc, ice, snow, graupel, save_t, save_q, rain0, ice0, snow0,&
         graupel0, del, rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, srflag, sr, cnvprcp, totprcp, totice,   &
         totsnw, totgrp, cnvprcpb, totprcpb, toticeb, totsnwb, totgrpb, rain_cpl, rainc_cpl, snow_cpl, pwat,               &
@@ -103,7 +104,7 @@ subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, nncl, ntcw, ntrac, imp_p
       logical, intent(in) :: cal_pre, lssav, ldiag3d, qdiag3d, cplflx, cplchm
       integer, intent(in) :: index_of_temperature,index_of_process_mp
 
-      real(kind=kind_phys),                    intent(in)    :: dtf, frain, con_g
+      real(kind=kind_phys),                    intent(in)    :: dtf, frain, con_g, rainmin
       real(kind=kind_phys), dimension(:),      intent(in)    :: rain1, xlat, xlon, tsfc
       real(kind=kind_phys), dimension(:),      intent(inout) :: ice, snow, graupel, rainc
       real(kind=kind_phys), dimension(:),      intent(in)    :: rain0, ice0, snow0, graupel0
@@ -146,7 +147,6 @@ subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, nncl, ntcw, ntrac, imp_p
       ! DH* TODO: CLEANUP, all of these should be coming in through the argument list
       real(kind=kind_phys), parameter :: con_p001= 0.001_kind_phys
       real(kind=kind_phys), parameter :: con_day = 86400.0_kind_phys
-      real(kind=kind_phys), parameter :: rainmin = 1.0e-13_kind_phys
       real(kind=kind_phys), parameter :: p850    = 85000.0_kind_phys
       ! *DH