Merge remote-tracking branch 'origin/framework-update' into framework…

…-update
ESCOMP · Mar 6, 2024 · d6c9a7f · d6c9a7f
2 parents ab64098 + aec2bd5
commit d6c9a7f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 101 deletions.
diff --git a/doc/NamesNotInDictionary.txt b/doc/NamesNotInDictionary.txt
@@ -1,94 +1 @@
-
-#######################
-Date/time of when script was run:
-2024-02-07 10:29:13.957426
-#######################
-
-Non-dictionary standard names found in the following metadata files:
-
---------------------------
-
-./atmospheric_physics/kessler/kessler_update.meta
-
-    - composition_dependent_specific_heat_of_dry_air_at_constant_pressure
-
---------------------------
-
-./atmospheric_physics/kessler/kessler.meta
-
-    - density_of_dry_air
-    - rain_mixing_ratio_wrt_dry_air
-    - scheme_name
-    - composition_dependent_specific_heat_of_dry_air_at_constant_pressure
-
---------------------------
-
-./atmospheric_physics/utilities/geopotential_temp.meta
-
-    - geopotential_height_wrt_surface_at_interface
-    - ccpp_constituents
-    - number_of_ccpp_constituents
-    - ccpp_constituent_properties
-
---------------------------
-
-./atmospheric_physics/utilities/state_converters.meta
-
-    - dry_air_density
-    - composition_dependent_specific_heat_of_dry_air_at_constant_pressure
-    - cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water
-    - rain_mixing_ratio_wrt_dry_air
-    - rain_mixing_ratio_wrt_moist_air_and_condensed_water
-
---------------------------
-
-./atmospheric_physics/utilities/qneg.meta
-
-    - ccpp_constituent_minimum_values
-    - ccpp_constituents
-    - log_output_unit
-    - number_of_ccpp_constituents
-    - ccpp_constituent_properties
-    - print_qneg_warn
-    - flag_for_mpi_root
-    - scheme_name
-
---------------------------
-
-./atmospheric_physics/utilities/physics_tendency_updaters.meta
-
-    - tendency_of_eastward_wind
-    - tendency_of_northward_wind
-    - tendency_of_eastward_wind_due_to_model_physics
-    - tendency_of_northward_wind_due_to_model_physics
-    - heating_rate
-    - composition_dependent_specific_heat_of_dry_air_at_constant_pressure
-
---------------------------
-
-./atmospheric_physics/utilities/static_energy.meta
-
-    - composition_dependent_specific_heat_of_dry_air_at_constant_pressure
-
---------------------------
-
-./atmospheric_physics/held_suarez/held_suarez_1994.meta
-
-    - tendency_of_eastward_wind
-    - composition_dependent_specific_heat_of_dry_air_at_constant_pressure
-    - reference_pressure_in_atmosphere_layer_normalized_by_reference_pressure
-    - scheme_name
-    - heating_rate
-    - composition_dependent_ratio_of_dry_air_gas_constant_to_specific_heat_of_dry_air_at_constant_pressure
-    - tendency_of_northward_wind
-
---------------------------
-
-./atmospheric_physics/musica/micm/micm.meta
-
-    - ccpp_constituent_properties
-    - log_output_unit
-    - dry_air_density
-    - ccpp_constituents
-
-#######################
+All standard names are in the dictionary!
diff --git a/held_suarez/held_suarez_1994.meta b/held_suarez/held_suarez_1994.meta
@@ -6,7 +6,8 @@
   name  = held_suarez_1994_init
   type  = scheme
 [ pref_in ]
-  standard_name = reference_pressure
+  standard_name = surface_reference_pressure
+  long_name = reference pressure used in definition of potential temperature, Exner function, etc.
   units = Pa
   type = real | kind = kind_phys
   dimensions = ()
@@ -42,7 +43,7 @@
   dimensions = ()
   intent = in
 [ pref_mid_norm ]
-  standard_name = reference_pressure_in_atmosphere_layer_normalized_by_reference_pressure
+  standard_name = reference_pressure_in_atmosphere_layer_normalized_by_surface_reference_pressure
   units = 1
   type = real | kind = kind_phys
   dimensions = (vertical_layer_dimension)
@@ -102,7 +103,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   intent = out
 [ ds ]
-  standard_name = heating_rate
+  standard_name = tendency_of_dry_air_enthalpy_at_constant_pressure
   units = J kg-1 s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)

diff --git a/kessler/kessler.meta b/kessler/kessler.meta
@@ -12,7 +12,7 @@
   type = real | kind = kind_phys
   intent = in
 [ pref_in ]
-  standard_name = reference_pressure
+  standard_name = surface_reference_pressure
   long_name = reference pressure used in definition of Exner function
   units = Pa
   dimensions = ()

diff --git a/utilities/physics_tendency_updaters.meta b/utilities/physics_tendency_updaters.meta
@@ -118,7 +118,7 @@
   dimensions = ()
   intent = in
 [ heating_rate ]
-  standard_name = heating_rate
+  standard_name = tendency_of_dry_air_enthalpy_at_constant_pressure
   units = J kg-1 s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

diff --git a/utilities/qneg.meta b/utilities/qneg.meta
@@ -6,7 +6,7 @@
   name  = qneg_init
   type  = scheme
 [ print_qneg_warn ]
-  standard_name = print_qneg_warn
+  standard_name = control_for_negative_constituent_warning
   units = 1
   type = character | kind = len=*
   dimensions = ()

diff --git a/utilities/state_converters.meta b/utilities/state_converters.meta
@@ -208,7 +208,7 @@
   type = real | kind = kind_phys
   intent = in
 [ ref_pres ]
-  standard_name = reference_pressure
+  standard_name = surface_reference_pressure
   long_name = reference pressure used in definition of potential temperature, Exner function, etc.
   units = Pa
   dimensions = ()