Merge pull request NCAR#48 from climbfuji/update_gsd_develop_from_nca…

…r_master Update gsd/develop from NCAR master
climbfuji · Aug 7, 2020 · 2735570 · 2735570
2 parents eab936e + c341e56
commit 2735570
Show file tree

Hide file tree

Showing 54 changed files with 4,871 additions and 714 deletions.
diff --git a/physics/GFS_DCNV_generic.meta b/physics/GFS_DCNV_generic.meta
@@ -500,6 +500,7 @@
   dimensions = ()
   type = logical
   intent = in
+  optional = F
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

diff --git a/physics/GFS_GWD_generic.meta b/physics/GFS_GWD_generic.meta
@@ -66,14 +66,23 @@
   kind = kind_phys
   intent = out
   optional = F
+[theta]
+  standard_name = angle_from_east_of_maximum_subgrid_orographic_variations
+  long_name = angle with_respect to east of maximum subgrid orographic variations
+  units = degree
+  dimensions = (horizontal_dimension)
+  type = real
+  kind = kind_phys
+  intent = out
+  optional = F
 [varss]
   standard_name = standard_deviation_of_subgrid_orography_small_scale
   long_name = standard deviation of subgrid orography small scale
   units = m
   dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys
-  intent = in
+  intent = out
   optional = F
 [ocss]
   standard_name = convexity_of_subgrid_orography_small_scale
@@ -102,15 +111,6 @@
   kind = kind_phys
   intent = out
   optional = F
-[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
-  dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
-  intent = out
-  optional = F
 [sigma]
   standard_name = slope_of_subgrid_orography
   long_name = slope of subgrid orography
@@ -162,6 +162,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = F
 [dvdt]
   standard_name = tendency_of_y_wind_due_to_model_physics
   long_name = meridional wind tendency due to model physics
@@ -170,6 +171,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = F
 [dtdt]
   standard_name = tendency_of_air_temperature_due_to_model_physics
   long_name = updated tendency of the temperature
@@ -187,6 +189,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = F
 [dv3dt]
   standard_name = cumulative_change_in_y_wind_due_to_orographic_gravity_wave_drag
   long_name = cumulative change in y wind due to orographic gravity wave drag
@@ -195,6 +198,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = F
 [dt3dt]
   standard_name = cumulative_change_in_temperature_due_to_orographic_gravity_wave_drag
   long_name = cumulative change in temperature due to orographic gravity wave drag
@@ -220,6 +224,7 @@
   dimensions = ()
   type = logical
   intent = in
+  optional = F
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP
@@ -368,6 +373,8 @@
   units = flag
   dimensions = ()
   type = logical
+  intent = in
+  optional = F
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

diff --git a/physics/GFS_MP_generic.meta b/physics/GFS_MP_generic.meta
@@ -356,7 +356,7 @@
 [xlat]
   standard_name = latitude
   long_name = latitude
-  units = radians
+  units = radian
   dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys
@@ -365,7 +365,7 @@
 [xlon]
   standard_name = longitude
   long_name = longitude
-  units = radians
+  units = radian
   dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys

diff --git a/physics/GFS_PBL_generic.meta b/physics/GFS_PBL_generic.meta
@@ -314,27 +314,35 @@
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = out
+  optional = F
 [save_v]
   standard_name = y_wind_save
   long_name = y-wind before entering a physics scheme
   units = m s-1
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = out
+  optional = F
 [save_t]
   standard_name = air_temperature_save
   long_name = air temperature before entering a physics scheme
   units = K
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = out
+  optional = F
 [save_q]
   standard_name = tracer_concentration_save
   long_name = tracer concentration before entering a physics scheme
   units = kg kg-1
   dimensions = (horizontal_dimension,vertical_dimension,number_of_tracers)
   type = real
   kind = kind_phys
+  intent = out
+  optional = F
 [ldiag3d]
   standard_name = flag_diagnostics_3D
   long_name = flag for 3d diagnostic fields
@@ -358,27 +366,34 @@
   dimensions = ()
   type = logical
   intent = in
+  optional = F
 [ugrs]
   standard_name = x_wind
   long_name = zonal wind
   units = m s-1
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [vgrs]
   standard_name = y_wind
   long_name = meridional wind
   units = m s-1
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [tgrs]
   standard_name = air_temperature
   long_name = model layer mean temperature
   units = K
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP
@@ -688,6 +703,7 @@
   dimensions = ()
   type = logical
   intent = in
+  optional = F
 [ldiag3d]
   standard_name = flag_diagnostics_3D
   long_name = flag for 3d diagnostic fields
@@ -1331,55 +1347,71 @@
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [vgrs]
   standard_name = y_wind
   long_name = meridional wind
   units = m s-1
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [tgrs]
   standard_name = air_temperature
   long_name = model layer mean temperature
   units = K
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [qgrs]
   standard_name = tracer_concentration
   long_name = model layer mean tracer concentration
   units = kg kg-1
   dimensions = (horizontal_dimension,vertical_dimension,number_of_tracers)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [save_u]
   standard_name = x_wind_save
   long_name = x-wind before entering a physics scheme
   units = m s-1
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [save_v]
   standard_name = y_wind_save
   long_name = y-wind before entering a physics scheme
   units = m s-1
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [save_t]
   standard_name = air_temperature_save
   long_name = air temperature before entering a physics scheme
   units = K
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [save_q]
   standard_name = tracer_concentration_save
   long_name = tracer concentration before entering a physics scheme
   units = kg kg-1
   dimensions = (horizontal_dimension,vertical_dimension,number_of_tracers)
   type = real
   kind = kind_phys
+  intent = in
+  optional = F
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

diff --git a/physics/GFS_SCNV_generic.meta b/physics/GFS_SCNV_generic.meta
@@ -76,23 +76,25 @@
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
-  intent = in
+  intent = out
+  optional = F
 [save_v]
   standard_name = y_wind_save
   long_name = y-wind before entering a physics scheme
   units = m s-1
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
-  intent = in
+  intent = out
+  optional = F
 [save_t]
   standard_name = air_temperature_save
   long_name = air temperature before entering a physics scheme
   units = K
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = out
   optional = F
 [save_qv]
   standard_name = water_vapor_specific_humidity_save
@@ -101,7 +103,7 @@
   dimensions = (horizontal_dimension,vertical_dimension)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = out
   optional = F
 [flag_for_scnv_generic_tend]
   standard_name = flag_for_generic_shallow_convection_tendency
@@ -110,6 +112,7 @@
   dimensions = ()
   type = logical
   intent = in
+  optional = F
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP
@@ -241,6 +244,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = F
 [save_v]
   standard_name = y_wind_save
   long_name = y-wind before entering a physics scheme
@@ -249,6 +253,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = F
 [save_t]
   standard_name = air_temperature_save
   long_name = air temperature before entering a physics scheme
@@ -284,6 +289,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = F
 [dv3dt]
   standard_name = cumulative_change_in_y_wind_due_to_shallow_convection
   long_name = cumulative change in y wind due to shallow convection
@@ -292,6 +298,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = F
 [dt3dt]
   standard_name = cumulative_change_in_temperature_due_to_shallow_convection
   long_name = cumulative change in temperature due to shal conv.
@@ -430,6 +437,7 @@
   dimensions = ()
   type = logical
   intent = in
+  optional = F
 [imfshalcnv]
   standard_name = flag_for_mass_flux_shallow_convection_scheme
   long_name = flag for mass-flux shallow convection scheme

diff --git a/physics/GFS_rrtmg_setup.meta b/physics/GFS_rrtmg_setup.meta
@@ -312,7 +312,7 @@
 [slag]
   standard_name = equation_of_time
   long_name = equation of time (radian)
-  units = radians
+  units = radian
   dimensions = ()
   type = real
   kind = kind_phys

diff --git a/physics/GFS_rrtmgp_setup.meta b/physics/GFS_rrtmgp_setup.meta
@@ -269,7 +269,7 @@
 [slag]
   standard_name = equation_of_time
   long_name = equation of time (radian)
-  units = radians
+  units = radian
   dimensions = ()
   type = real
   kind = kind_phys

diff --git a/physics/GFS_rrtmgp_sw_pre.meta b/physics/GFS_rrtmgp_sw_pre.meta
@@ -191,4 +191,4 @@
 ########################################################################
 [ccpp-arg-table]
   name = GFS_rrtmgp_sw_pre_finalize
-  type = scheme
+  type = scheme