Fix build issues

src/data/air_composition.F90

@@ -16,6 +16,7 @@ module air_composition
    public  :: air_composition_init
    public  :: dry_air_composition_update
    public  :: water_composition_update
+
    ! get_cp_dry: (generalized) heat capacity for dry air
    public :: get_cp_dry
    ! get_cp: (generalized) heat capacity
@@ -533,7 +534,7 @@ subroutine dry_air_composition_update(mmr, ncol, to_dry_factor)
 
       cappav(:ncol,:) = rairv(:ncol,:) / cpairv(:ncol,:)
 
-   end subroutine air_composition_update
+   end subroutine dry_air_composition_update
 
    !===========================================================================
    !---------------------------------------------------------------------------

src/data/cam_thermo.F90

@@ -220,7 +220,7 @@ end subroutine cam_thermo_init
    subroutine cam_thermo_dry_air_update(mmr, T, ncol, update_thermo_variables, to_dry_factor)
       use air_composition, only: dry_air_composition_update
       use air_composition, only: update_zvirv
-      use string_utils,    only: int2str
+      use string_utils,    only: to_str
 
       real(kind_phys),    intent(in) :: mmr(:,:,:) ! constituents array (mmr = dry mixing ratio, if not use to_dry_factor to convert)
       real(kind_phys),    intent(in) :: T(:,:)     ! temperature
@@ -1579,6 +1579,7 @@ subroutine get_hydrostatic_energy_1hd(tracer, moist_mixing_ratio, pdel_in, &
       use cam_logfile,     only: iulog
       use dyn_tests_utils, only: vc_height, vc_moist_pressure, vc_dry_pressure
       use air_composition, only: wv_idx
+      use air_composition, only: dry_air_species_num
       use physconst,       only: rga, latvap, latice
 
       ! Dummy arguments

src/data/registry.xml

@@ -15,6 +15,7 @@
   <metadata_file>$SRCROOT/src/data/ref_pres.meta</metadata_file>
   <metadata_file>$SRCROOT/src/dynamics/utils/vert_coord.meta</metadata_file>
   <metadata_file>$SRCROOT/src/dynamics/utils/hycoef.meta</metadata_file>
+  <metadata_file>$SRCROOT/src/dynamics/tests/dyn_tests_utils.meta</metadata_file>
   <!-- Variables registered to physics_types -->
   <file name="physics_types" type="module">
     <use module="ccpp_kinds" reference="kind_phys"/>
@@ -403,8 +404,8 @@
       <initial_value>zvir</initial_value>
     </variable>
     <variable local_name="cp_or_cv_dycore"
-              standard_name="enthalpy_or_internal_energy_scaling_factor_for_energy_consistency?"
-              units="1" type="real" kind="kind_phys"
+              standard_name="enthalpy_or_internal_energy_scaling_factor_for_energy_consistency_tbd"
+              units="J kg-1 K-1" type="real" kind="kind_phys"
               allocatable="allocatable">
       <long_name>Enthalpy or internal energy scaling factor for energy consistency</long_name>
       <dimensions>horizontal_dimension vertical_layer_dimension</dimensions>

src/dynamics/tests/dyn_tests_utils.meta

@@ -6,12 +6,12 @@
   name  = dyn_tests_utils
   type  = module
 [ vc_dycore ]
-  standard_name = vertical_coordinate_for_dynamical_core?
-  units = none
+  standard_name = vertical_coordinate_for_dynamical_core_tbd
+  units = 1
   type = integer
   dimensions = ()
 [ vc_physics ]
-  standard_name = vertical_coordinate_for_physics?
-  units = none
+  standard_name = vertical_coordinate_for_physics_tbd
+  units = 1
   type = integer
   dimensions = ()