Implement code review requests.

cime_config/cam_autogen.py

@@ -601,7 +601,7 @@ def generate_physics_suites(build_cache, preproc_defs, host_name,
         # Copy all utility source files to the build directory
         atm_phys_util_files = glob.glob(os.path.join(atm_phys_util_dir, "*.F90"))
         for util_file in atm_phys_util_files:
-            shutil.copy2(util_file, physics_blddir)
+            shutil.copy(util_file, physics_blddir)
         # end for
     # end if
 

src/control/cam_comp.F90

@@ -506,7 +506,7 @@ subroutine cam_register_constituents(cam_runtime_opts)
       ! Dummy arguments
       type(runtime_options), intent(in) :: cam_runtime_opts
       ! Local variables
-      logical                                        :: is_const
+      logical                                        :: is_constituent
       integer                                        :: num_advect
       integer                                        :: const_idx
       integer                                        :: errflg
@@ -522,7 +522,7 @@ subroutine cam_register_constituents(cam_runtime_opts)
       ! physics:
       call cam_ccpp_is_scheme_constituent(                                              &
            "water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water",                &
-           is_const, errflg, errmsg)
+           is_constituent, errflg, errmsg)
 
       if (errflg /= 0) then
          call endrun(subname//trim(errmsg), file=__FILE__, line=__LINE__)
@@ -531,7 +531,7 @@ subroutine cam_register_constituents(cam_runtime_opts)
       !If not requested by the physics, then add water vapor to the
       !constituents object:
       !-------------------------------------------
-      if (.not. is_const) then
+      if (.not. is_constituent) then
 
          ! Allocate host_constituents object:
          allocate(host_constituents(1), stat=errflg)

src/data/air_composition.F90

@@ -677,7 +677,7 @@ subroutine get_cp_1hd(tracer, inv_cp, cp, dp_dry, active_species_idx_dycore)
               (tracer(:,:,itrac) * factor(:,:))
       end do
 
-      ! Get Cp for dry air:
+      ! Get heat capacity at constant pressure (Cp) for dry air:
       call get_cp_dry(tracer, idx_local, sum_cp, fact=factor)
 
       ! Add water species to Cp:

src/data/ref_pres.F90

@@ -171,7 +171,7 @@ subroutine ref_pres_init(pref_edge_in, pref_mid_in, num_pr_lev_in)
       ! pref_edge_in
       call mark_as_initialized("reference_pressure_at_interface")
       ! pref_mid_in
-      call mark_as_initialized("reference_pressure_of_atmosphere_layer")
+      call mark_as_initialized("reference_pressure_in_atmosphere_layer")
       ! pref_mid_norm
       call mark_as_initialized("reference_pressure_in_atmosphere_layer_normalized_by_reference_pressure")
       ! ptop_ref

src/data/ref_pres.meta

@@ -11,7 +11,7 @@
   dimensions = (vertical_interface_dimension)
   protected = True
 [ pref_mid ]
-  standard_name = reference_pressure_of_atmosphere_layer
+  standard_name = reference_pressure_in_atmosphere_layer
   units = Pa
   type = real | kind = kind_phys
   dimensions = (vertical_layer_dimension)