Add control flag for processing category percentages.

Add the new logic for the processing of soil type.

Fixes ufs-community#709.

Author: GeorgeGayno-NOAA

sorc/sfc_climo_gen.fd/driver.F90

@@ -80,8 +80,12 @@ program driver
 !-------------------------------------------------------------------------
 
  call define_source_grid(localpet, npets, input_vegetation_type_file)
- method=ESMF_REGRIDMETHOD_NEAREST_STOD
- call interp2(localpet, input_vegetation_type_file)
+ if (fract_vegsoil_type) then
+   call interp2(localpet, input_vegetation_type_file)
+ else
+   method=ESMF_REGRIDMETHOD_NEAREST_STOD
+   call interp(localpet, method, input_vegetation_type_file)
+ endif
  call source_grid_cleanup
 
 ! Snow free albedo
@@ -136,8 +140,12 @@ program driver
 
  if (trim(input_soil_type_file) /= "NULL") then
    call define_source_grid(localpet, npets, input_soil_type_file)
-   method=ESMF_REGRIDMETHOD_NEAREST_STOD
-   call interp(localpet, method, input_soil_type_file)
+   if (fract_vegsoil_type) then
+     call interp2(localpet, input_soil_type_file)
+   else
+     method=ESMF_REGRIDMETHOD_NEAREST_STOD
+     call interp(localpet, method, input_soil_type_file)
+   endif
    call source_grid_cleanup
  endif
 

sorc/sfc_climo_gen.fd/interp2.F90

@@ -205,8 +205,4 @@ subroutine interp2(localpet, input_file)
  print*,"- CALL FieldDestroy."
  call ESMF_FieldDestroy(data_field_src, rc=rc)
 
- print*,'after output ', localpet
- call mpi_barrier(mpi_comm_world, rc)
- stop
-
  end subroutine interp2

sorc/sfc_climo_gen.fd/output2.f90

@@ -225,9 +225,6 @@ subroutine output2(data_one_tile, lat_one_tile, lon_one_tile, i_mdl, j_mdl, &
 
  error = nf90_close(ncid_with_halo)
 
- call mpi_barrier(mpi_comm_world, error)
- stop
-
  return
 
  end subroutine output2

sorc/sfc_climo_gen.fd/program_setup.f90

@@ -43,6 +43,9 @@ module program_setup
  integer, public              :: halo = 0 !< Number of row/cols defining the lateral
                                           !! boundary halo. Used for regional nests.
 
+ logical, public              :: fract_vegsoil_type = .true. !< When true, output the percentage of each soil
+                                                             !! and vegetation type category.
+
  public :: read_setup_namelist
 
  contains