Update standard names

doc/NamesNotInDictionary.txt

@@ -1,7 +1,7 @@
 
 #######################
 Date/time of when script was run:
-2024-10-25 12:47:27.849590
+2024-11-13 12:40:59.115207
 #######################
 
 Non-dictionary standard names found in the following metadata files:
@@ -10,10 +10,11 @@ Non-dictionary standard names found in the following metadata files:
 
 atmospheric_physics/schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta
 
+    - current_timestep_number
     - global_mean_air_pressure_at_top_of_atmosphere_model
     - global_mean_heating_rate_correction_for_energy_conservation
     - global_mean_surface_air_pressure
-    - global_mean_vertically_integrated_total_energy_at_end_of_physics
+    - global_mean_vertically_integrated_total_energy_at_end_of_physics_timestep
     - global_mean_vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula
 
 --------------------------
@@ -22,9 +23,9 @@ atmospheric_physics/schemes/sima_diagnostics/check_energy_diagnostics.meta
 
     - cumulative_total_energy_boundary_flux_using_physics_energy_formula
     - cumulative_total_water_boundary_flux
-    - ratio_of_specific_heat_for_air_used_in_physics_energy_formula_and_specific_heat_for_air_used_in_dycore_energy_formula
-    - specific_heat_for_air_used_in_dycore
-    - vertically_integrated_total_energy_at_end_of_physics
+    - ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula
+    - specific_heat_of_dry_air_used_in_dycore
+    - vertically_integrated_total_energy_at_end_of_physics_timestep
     - vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula
     - vertically_integrated_total_energy_of_current_state_using_physics_energy_formula
     - vertically_integrated_water_vapor_and_condensed_water_of_current_state
@@ -255,30 +256,30 @@ atmospheric_physics/schemes/utilities/geopotential_temp.meta
 
 atmospheric_physics/schemes/check_energy/check_energy_save_teout.meta
 
-    - vertically_integrated_total_energy_at_end_of_physics
+    - vertically_integrated_total_energy_at_end_of_physics_timestep
     - vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula
 
 --------------------------
 
 atmospheric_physics/schemes/check_energy/check_energy_chng.meta
 
     - air_pressure_of_dry_air_at_interface
-    - control_for_energy_conservation_warning
     - cumulative_total_energy_boundary_flux_using_physics_energy_formula
     - cumulative_total_water_boundary_flux
+    - flag_for_energy_conservation_warning
     - height_wrt_surface_of_initial_state
     - latent_heat_of_fusion_of_water_at_0c
-    - net_ice_fluxes_through_top_and_bottom_of_atmosphere_column
-    - net_liquid_and_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+    - net_liquid_and_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+    - net_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
     - net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
     - net_water_vapor_fluxes_through_top_and_bottom_of_atmosphere_column
-    - number_of_values_with_significant_energy_or_water_imbalances
-    - ratio_of_specific_heat_for_air_used_in_physics_energy_formula_and_specific_heat_for_air_used_in_dycore_energy_formula
-    - specific_heat_for_air_used_in_dycore
+    - number_of_atmosphere_columns_with_significant_energy_or_water_imbalances
+    - ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula
+    - specific_heat_of_dry_air_used_in_dycore
     - temperature_of_initial_state
     - total_energy_formula_for_dycore
     - total_energy_formula_for_physics
-    - vertically_integrated_total_energy_at_end_of_physics
+    - vertically_integrated_total_energy_at_end_of_physics_timestep
     - vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula
     - vertically_integrated_total_energy_of_current_state_using_physics_energy_formula
     - vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula
@@ -290,25 +291,33 @@ atmospheric_physics/schemes/check_energy/check_energy_chng.meta
 
 atmospheric_physics/schemes/check_energy/check_energy_zero_fluxes.meta
 
-    - net_ice_fluxes_through_top_and_bottom_of_atmosphere_column
-    - net_liquid_and_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+    - net_liquid_and_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+    - net_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
     - net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
     - net_water_vapor_fluxes_through_top_and_bottom_of_atmosphere_column
 
 --------------------------
 
+atmospheric_physics/schemes/check_energy/dycore_energy_consistency_adjust.meta
+
+    - ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula
+    - temperature_of_initial_state
+    - total_energy_formula_for_dycore
+
+--------------------------
+
 atmospheric_physics/schemes/check_energy/check_energy_scaling.meta
 
-    - ratio_of_specific_heat_for_air_used_in_physics_energy_formula_and_specific_heat_for_air_used_in_dycore_energy_formula
-    - specific_heat_for_air_used_in_dycore
+    - ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula
+    - specific_heat_of_dry_air_used_in_dycore
 
 --------------------------
 
 atmospheric_physics/schemes/check_energy/check_energy_fix.meta
 
     - air_pressure_at_interface
     - global_mean_heating_rate_correction_for_energy_conservation
-    - net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column_from_global_total_energy_correction
+    - net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
     - reciprocal_of_gravitational_acceleration
 
 --------------------------
@@ -320,9 +329,9 @@ atmospheric_physics/schemes/check_energy/check_energy_gmean/check_energy_gmean.m
     - global_mean_heating_rate_correction_for_energy_conservation
     - global_mean_surface_air_pressure
     - global_mean_total_energy_correction_for_energy_conservation
-    - global_mean_vertically_integrated_total_energy_at_end_of_physics
+    - global_mean_vertically_integrated_total_energy_at_end_of_physics_timestep
     - global_mean_vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula
-    - vertically_integrated_total_energy_at_end_of_physics
+    - vertically_integrated_total_energy_at_end_of_physics_timestep
     - vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula
 
 --------------------------

schemes/check_energy/check_energy_chng.F90

@@ -243,7 +243,7 @@ subroutine check_energy_chng_run( &
     real(kind_phys),    intent(inout) :: te_cur_phys(:) ! physics formula: current total energy [J m-2]
     real(kind_phys),    intent(inout) :: te_cur_dyn (:) ! dycore  formula: current total energy [J m-2]
     real(kind_phys),    intent(inout) :: tw_cur     (:) ! current total water [kg m-2]
-    integer,            intent(inout) :: count          ! count of values with significant energy or water imbalances [1]
+    integer,            intent(inout) :: count          ! count of columns with significant energy or water imbalances [1]
     real(kind_phys),    intent(inout) :: tend_te_tnd(:) ! total energy tendency [J m-2 s-1]
     real(kind_phys),    intent(inout) :: tend_tw_tnd(:) ! total water tendency [kg m-2 s-1]
 

schemes/check_energy/check_energy_chng.meta

@@ -96,7 +96,7 @@
   dimensions = (horizontal_dimension, vertical_layer_dimension)
   intent = in
 [ cp_or_cv_dycore ]
-  standard_name = specific_heat_for_air_used_in_dycore
+  standard_name = specific_heat_of_dry_air_used_in_dycore
   units = J kg-1 K-1
   type = real | kind = kind_phys
   dimensions = (horizontal_dimension, vertical_layer_dimension)
@@ -162,13 +162,13 @@
   dimensions = (horizontal_dimension, vertical_layer_dimension)
   intent = out
 [ count ]
-  standard_name = number_of_values_with_significant_energy_or_water_imbalances
+  standard_name = number_of_atmosphere_columns_with_significant_energy_or_water_imbalances
   units = count
   type = integer
   dimensions = ()
   intent = out
 [ teout ]
-  standard_name = vertically_integrated_total_energy_at_end_of_physics
+  standard_name = vertically_integrated_total_energy_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = (horizontal_dimension)
@@ -280,13 +280,13 @@
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = in
 [ cp_or_cv_dycore ]
-  standard_name = specific_heat_for_air_used_in_dycore
+  standard_name = specific_heat_of_dry_air_used_in_dycore
   units = J kg-1 K-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = in
 [ scaling_dycore ]
-  standard_name = ratio_of_specific_heat_for_air_used_in_physics_energy_formula_and_specific_heat_for_air_used_in_dycore_energy_formula
+  standard_name = ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula
   units = 1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -334,7 +334,7 @@
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = in
 [ count ]
-  standard_name = number_of_values_with_significant_energy_or_water_imbalances
+  standard_name = number_of_atmosphere_columns_with_significant_energy_or_water_imbalances
   units = count
   type = integer
   dimensions = ()
@@ -382,13 +382,13 @@
   dimensions = (horizontal_loop_extent)
   intent = in
 [ flx_cnd ]
-  standard_name = net_liquid_and_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+  standard_name = net_liquid_and_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
   units = m s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)
   intent = in
 [ flx_ice ]
-  standard_name = net_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+  standard_name = net_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
   units = m s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)

schemes/check_energy/check_energy_gmean/check_energy_gmean.meta

@@ -43,7 +43,7 @@
   dimensions = (horizontal_loop_extent)
   intent = in
 [ teout ]
-  standard_name = vertically_integrated_total_energy_at_end_of_physics
+  standard_name = vertically_integrated_total_energy_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)
@@ -67,7 +67,7 @@
   dimensions = ()
   intent = out
 [ teout_glob ]
-  standard_name = global_mean_vertically_integrated_total_energy_at_end_of_physics
+  standard_name = global_mean_vertically_integrated_total_energy_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = ()

schemes/check_energy/check_energy_save_teout.meta

@@ -18,7 +18,7 @@
   dimensions = (horizontal_loop_extent)
   intent = in
 [ teout ]
-  standard_name = vertically_integrated_total_energy_at_end_of_physics
+  standard_name = vertically_integrated_total_energy_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)

schemes/check_energy/check_energy_scaling.meta

@@ -12,7 +12,7 @@
   dimensions = ()
   intent = in
 [ cp_or_cv_dycore ]
-  standard_name = specific_heat_for_air_used_in_dycore
+  standard_name = specific_heat_of_dry_air_used_in_dycore
   units = J kg-1 K-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -24,7 +24,7 @@
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = in
 [ scaling_dycore ]
-  standard_name = ratio_of_specific_heat_for_air_used_in_physics_energy_formula_and_specific_heat_for_air_used_in_dycore_energy_formula
+  standard_name = ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula
   units = 1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/check_energy/check_energy_zero_fluxes.meta

@@ -24,13 +24,13 @@
   dimensions = (horizontal_loop_extent)
   intent = out
 [ flx_cnd ]
-  standard_name = net_liquid_and_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+  standard_name = net_liquid_and_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
   units = m s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)
   intent = out
 [ flx_ice ]
-  standard_name = net_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+  standard_name = net_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
   units = m s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)

schemes/check_energy/dycore_energy_consistency_adjust.meta

@@ -24,7 +24,7 @@
   dimensions = ()
   intent = in
 [ scaling_dycore ]
-  standard_name = ratio_of_specific_heat_for_air_used_in_physics_energy_formula_and_specific_heat_for_air_used_in_dycore_energy_formula
+  standard_name = ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula
   units = 1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/sima_diagnostics/check_energy_diagnostics.F90

@@ -27,8 +27,8 @@ subroutine check_energy_diagnostics_init(errmsg, errflg)
       errflg = 0
 
       ! History add field calls
-      call history_add_field('cp_or_cv_dycore', 'specific_heat_for_air_used_in_dycore', 'lev', 'inst', 'J kg-1 K-1')
-      call history_add_field('scaling_dycore', 'ratio_of_specific_heat_for_air_used_in_physics_energy_formula_and_specific_heat_for_air_used_in_dycore_energy_formula', 'lev', 'inst', '1')
+      call history_add_field('cp_or_cv_dycore', 'specific_heat_of_dry_air_used_in_dycore', 'lev', 'inst', 'J kg-1 K-1')
+      call history_add_field('scaling_dycore', 'ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula', 'lev', 'inst', '1')
 
       call history_add_field('te_cur_phys', 'vertically_integrated_total_energy_of_current_state_using_physics_energy_formula', horiz_only, 'inst', 'J m-2')
       call history_add_field('te_cur_dyn', 'vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula', horiz_only, 'inst', 'J m-2')
@@ -37,7 +37,7 @@ subroutine check_energy_diagnostics_init(errmsg, errflg)
       call history_add_field('tend_te_tnd', 'cumulative_total_energy_boundary_flux_using_physics_energy_formula', horiz_only, 'inst', 'J m-2 s-1')
       call history_add_field('tend_tw_tnd', 'cumulative_total_water_boundary_flux', horiz_only, 'inst', 'kg m-2 s-1')
 
-      call history_add_field('teout', 'vertically_integrated_total_energy_at_end_of_physics', horiz_only, 'inst', 'J m-2')
+      call history_add_field('teout', 'vertically_integrated_total_energy_at_end_of_physics_timestep', horiz_only, 'inst', 'J m-2')
 
    end subroutine check_energy_diagnostics_init
 

schemes/sima_diagnostics/check_energy_diagnostics.meta

@@ -22,13 +22,13 @@
   name  = check_energy_diagnostics_run
   type  = scheme
 [ cp_or_cv_dycore ]
-  standard_name = specific_heat_for_air_used_in_dycore
+  standard_name = specific_heat_of_dry_air_used_in_dycore
   units = J kg-1 K-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = in
 [ scaling_dycore ]
-  standard_name = ratio_of_specific_heat_for_air_used_in_physics_energy_formula_and_specific_heat_for_air_used_in_dycore_energy_formula
+  standard_name = ratio_of_specific_heat_of_dry_air_used_in_physics_energy_formula_to_specific_heat_of_dry_air_used_in_dycore_energy_formula
   units = 1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -64,7 +64,7 @@
   dimensions = (horizontal_loop_extent)
   intent = in
 [ teout ]
-  standard_name = vertically_integrated_total_energy_at_end_of_physics
+  standard_name = vertically_integrated_total_energy_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)

schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta

@@ -30,7 +30,7 @@
   dimensions = ()
   intent = in
 [ teout_glob ]
-  standard_name = global_mean_vertically_integrated_total_energy_at_end_of_physics
+  standard_name = global_mean_vertically_integrated_total_energy_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = ()