Merge branch 'develop' into feature/search_doc

Fixes ufs-community#278
GeorgeGayno-NOAA · Apr 26, 2021 · bdc9a0c · bdc9a0c
2 parents 9d85f8a + 3c1ec74
commit bdc9a0c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/sorc/chgres_cube.fd/input_data.F90 b/sorc/chgres_cube.fd/input_data.F90
@@ -6045,11 +6045,11 @@ subroutine read_winds(file,inv,u,v,localpet)
  real(esmf_kind_r8)                      :: d2r
 
  integer                                 :: varnum_u, varnum_v, vlev, & !ncid, id_var, &
-                                            error, iret, i,istr
+                                            error, iret, istr
 
  character(len=20)                       :: vname
  character(len=50)                       :: method_u, method_v
- character(len=250)                      :: file_coord, cmdline_msg
+ character(len=250)                      :: file_coord
  character(len=10000)                    :: temp_msg
 
  d2r=acos(-1.0_esmf_kind_r8) / 180.0_esmf_kind_r8

diff --git a/sorc/chgres_cube.fd/model_grid.F90 b/sorc/chgres_cube.fd/model_grid.F90
@@ -810,7 +810,7 @@ subroutine define_input_grid_grib2(localpet, npets)
  use netcdf
  use wgrib2api
  use program_setup, only       : grib2_file_input_grid, data_dir_input_grid, &
-                                  fix_dir_input_grid, external_model
+                                  fix_dir_input_grid
  implicit none
 
  character(len=500)           :: the_file, temp_file
@@ -826,7 +826,7 @@ subroutine define_input_grid_grib2(localpet, npets)
  real(esmf_kind_r8)                    :: deltalon, dx
  integer                               :: ncid,id_var, id_dim
  real(esmf_kind_r8), pointer           :: lat_src_ptr(:,:), lon_src_ptr(:,:)
- character(len=10000)            :: cmdline_msg, temp_msg, temp_msg2
+ character(len=10000)            :: temp_msg
  character(len=10)              :: temp_num = 'NA'
 
  num_tiles_input_grid = 1

diff --git a/sorc/chgres_cube.fd/surface.F90 b/sorc/chgres_cube.fd/surface.F90
@@ -155,9 +155,8 @@ subroutine surface_driver(localpet)
                                        read_input_nst_data
 
  use program_setup, only             : calc_soil_params_driver, &
-                                       convert_nst, &
-                                       vgtyp_from_climo, &
-                                       sotyp_from_climo
+                                       convert_nst
+
  use static_data, only               :  get_static_fields, &
                                        cleanup_static_fields
 
@@ -2935,7 +2934,7 @@ subroutine check_smois_land
  do i =clb(1),cub(1)
    do j = clb(2),cub(2)
      if (landmask_ptr(i,j)==1 .and. soilm_target_ptr(i,j,1) < 0.001 .and. nint(veg_type_target_ptr(i,j)) /= veg_type_landice_target) then !.and. &
-         WRITE(*,'(a,2i5,a,2i3)'), " CORRECTING G.P. ",i,j," PARAMS FROM SEA TO LAND &
+         WRITE(*,'(a,2i5,a,2i3)') " CORRECTING G.P. ",i,j," PARAMS FROM SEA TO LAND &
                     VALUES; curr stype,vtype=",  nint(soil_type_target_ptr(i,j)),nint(veg_type_target_ptr(i,j))
          ! Set values to missing so that search function can then replace 
          ! them with nearby point values (see replace_land_sfcparams)