Merge pull request #730 from climbfuji/vegetation_soil_slope_type_int…

…eger

Convert real(kind_phys) vegetation, slope and soil type arrays into integer arrays

physics/GFS_debug.meta

@@ -604,51 +604,24 @@
   intent = in
   optional = F
 [stype]
-  standard_name = soil_type_classification_real
-  long_name = soil type for lsm
-  units = index
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = F
-[vtype]
-  standard_name = vegetation_type_classification_real
-  long_name = vegetation type for lsm
-  units = index
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = F
-[slope]
-  standard_name = surface_slope_classification_real
-  long_name = sfc slope type for lsm
-  units = index
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = F
-[soiltyp]
   standard_name = soil_type_classification
-  long_name = soil type at each grid cell
+  long_name = soil type for lsm
   units = index
   dimensions = (horizontal_loop_extent)
   type = integer
   intent = in
   optional = F
-[vegtype]
+[vtype]
   standard_name = vegetation_type_classification
-  long_name = vegetation type at each grid cell
+  long_name = vegetation type for lsm
   units = index
   dimensions = (horizontal_loop_extent)
   type = integer
   intent = in
   optional = F
-[slopetyp]
+[slope]
   standard_name = surface_slope_classification
-  long_name = surface slope type at each grid cell
+  long_name = sfc slope type for lsm
   units = index
   dimensions = (horizontal_loop_extent)
   type = integer

physics/GFS_phys_time_vary.fv3.F90

@@ -105,9 +105,9 @@ subroutine GFS_phys_time_vary_init (
 
          integer,              intent(in)    :: isot, ivegsrc, nlunit
          real(kind_phys),      intent(inout) :: sncovr(:), sncovr_ice(:)
-         integer,              intent(in)    :: lsm, lsm_noahmp, lsm_ruc
+         integer,              intent(in)    :: lsm, lsm_noahmp, lsm_ruc, vtype(:)
          real(kind_phys),      intent(in)    :: min_seaice, fice(:)
-         real(kind_phys),      intent(in)    :: landfrac(:), vtype(:)
+         real(kind_phys),      intent(in)    :: landfrac(:)
          real(kind_phys),      intent(inout) :: weasd(:)
 
          ! NoahMP - only allocated when NoahMP is used
@@ -165,7 +165,7 @@ subroutine GFS_phys_time_vary_init (
          real(kind_phys),      intent(in)    :: snowd(:)
          real(kind_phys),      intent(in)    :: canopy(:)
          real(kind_phys),      intent(in)    :: tg3(:)
-         real(kind_phys),      intent(in)    :: stype(:)
+         integer,              intent(in)    :: stype(:)
          real(kind_phys),      intent(in)    :: con_t0c
 
          integer,              intent(in)    :: nthrds
@@ -765,9 +765,10 @@ subroutine GFS_phys_time_vary_timestep_init (
                                       tslb(:,:), tiice(:,:), tg3(:), tref(:),                        &
                                       tsfc(:), tsfco(:), tisfc(:), hice(:), fice(:),                 &
                                       facsf(:), facwf(:), alvsf(:), alvwf(:), alnsf(:), alnwf(:),    &
-                                      zorli(:), zorll(:), zorlo(:), weasd(:), slope(:), snoalb(:),   &
-                                      canopy(:), vfrac(:), vtype(:), stype(:), shdmin(:), shdmax(:), &
+                                      zorli(:), zorll(:), zorlo(:), weasd(:), snoalb(:),             &
+                                      canopy(:), vfrac(:), shdmin(:), shdmax(:),                     &
                                       snowd(:), cv(:), cvb(:), cvt(:), oro(:), oro_uf(:), slmsk(:)
+         integer,              intent(inout) :: vtype(:), stype(:), slope(:)
 
          character(len=*),     intent(out)   :: errmsg
          integer,              intent(out)   :: errflg

physics/GFS_phys_time_vary.fv3.meta

@@ -444,12 +444,11 @@
   intent = in
   optional = F
 [vtype]
-  standard_name = vegetation_type_classification_real
+  standard_name = vegetation_type_classification
   long_name = vegetation type for lsm
   units = index
   dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
+  type = integer
   intent = in
   optional = F
 [weasd]
@@ -963,12 +962,11 @@
   intent = in
   optional = F
 [stype]
-  standard_name = soil_type_classification_real
+  standard_name = soil_type_classification
   long_name = soil type for lsm
   units = index
   dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
+  type = integer
   intent = in
   optional = F
 [con_t0c]
@@ -1863,12 +1861,11 @@
   intent = inout
   optional = F
 [slope]
-  standard_name = surface_slope_classification_real
+  standard_name = surface_slope_classification
   long_name = sfc slope type for lsm
   units = index
   dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
+  type = integer
   intent = inout
   optional = F
 [snoalb]
@@ -1899,21 +1896,19 @@
   intent = inout
   optional = F
 [vtype]
-  standard_name = vegetation_type_classification_real
+  standard_name = vegetation_type_classification
   long_name = vegetation type for lsm
   units = index
   dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
+  type = integer
   intent = inout
   optional = F
 [stype]
-  standard_name = soil_type_classification_real
+  standard_name = soil_type_classification
   long_name = soil type for lsm
   units = index
   dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
+  type = integer
   intent = inout
   optional = F
 [shdmin]

physics/GFS_phys_time_vary.scm.F90

@@ -101,7 +101,8 @@ subroutine GFS_phys_time_vary_init (
          real(kind_phys),      intent(inout) :: sncovr(:), sncovr_ice(:)
          integer,              intent(in)    :: lsm, lsm_noahmp, lsm_ruc
          real(kind_phys),      intent(in)    :: min_seaice, fice(:)
-         real(kind_phys),      intent(in)    :: landfrac(:), vtype(:)
+         real(kind_phys),      intent(in)    :: landfrac(:)
+         integer,              intent(in)    :: vtype(:)
          real(kind_phys),      intent(inout) :: weasd(:)
 
          ! NoahMP - only allocated when NoahMP is used
@@ -159,7 +160,7 @@ subroutine GFS_phys_time_vary_init (
          real(kind_phys),      intent(in)    :: snowd(:)
          real(kind_phys),      intent(in)    :: canopy(:)
          real(kind_phys),      intent(in)    :: tg3(:)
-         real(kind_phys),      intent(in)    :: stype(:)
+         integer,              intent(in)    :: stype(:)
          real(kind_phys),      intent(in)    :: con_t0c
 
          integer,              intent(in)    :: nthrds

physics/GFS_phys_time_vary.scm.meta

@@ -444,12 +444,11 @@
   intent = in
   optional = F
 [vtype]
-  standard_name = vegetation_type_classification_real
+  standard_name = vegetation_type_classification
   long_name = vegetation type for lsm
   units = index
   dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
+  type = integer
   intent = in
   optional = F
 [weasd]
@@ -963,12 +962,11 @@
   intent = in
   optional = F
 [stype]
-  standard_name = soil_type_classification_real
+  standard_name = soil_type_classification
   long_name = soil type for lsm
   units = index
   dimensions = (horizontal_dimension)
-  type = real
-  kind = kind_phys
+  type = integer
   intent = in
   optional = F
 [con_t0c]

physics/GFS_radiation_surface.F90

@@ -57,7 +57,7 @@ end subroutine GFS_radiation_surface_init
 !!
       subroutine GFS_radiation_surface_run (                            &
         im, frac_grid, lslwr, lsswr, lsm, lsm_noahmp, lsm_ruc,          &
-        vtype, xlat, xlon, slmsk, lndp_type, n_var_lndp, sfc_alb_pert,  &
+        xlat, xlon, slmsk, lndp_type, n_var_lndp, sfc_alb_pert,         &
         lndp_var_list, lndp_prt_list, landfrac, snowd, sncovr,          &
         sncovr_ice, fice, zorl, hprime, tsfg, tsfa, tisfc, coszen,      &
         min_seaice, min_lakeice, lakefrac,                              &
@@ -78,9 +78,9 @@ subroutine GFS_radiation_surface_run (                            &
       integer,              intent(in) :: lsm, lsm_noahmp, lsm_ruc, lndp_type, n_var_lndp
       real(kind=kind_phys), intent(in) :: min_seaice, min_lakeice
 
-      real(kind=kind_phys), dimension(:),   intent(in)  :: xlat, xlon, vtype, slmsk,    &
+      real(kind=kind_phys), dimension(:),   intent(in)  :: xlat, xlon, slmsk,           &
                                                            sfc_alb_pert, lndp_prt_list, &
-                                                           landfrac, lakefrac,         &
+                                                           landfrac, lakefrac,          &
                                                            snowd, sncovr,               &
                                                            sncovr_ice, fice, zorl,      &
                                                            hprime, tsfg, tsfa, tisfc,   &
@@ -158,7 +158,7 @@ subroutine GFS_radiation_surface_run (                            &
       if (lslwr) then
 !>  - Call module_radiation_surface::setemis(),to set up surface
 !! emissivity for LW radiation.
-        call setemis (lsm, lsm_noahmp, lsm_ruc, vtype,             &
+        call setemis (lsm, lsm_noahmp, lsm_ruc,                    &
                       frac_grid,             xlon, xlat, slmsk,    &
 !                     frac_grid, min_seaice, xlon, xlat, slmsk,    &
                       snowd, sncovr, sncovr_ice, zorl, tsfg, tsfa, &

physics/GFS_radiation_surface.meta

@@ -118,15 +118,6 @@
   type = integer
   intent = in
   optional = F
-[vtype]
-  standard_name = vegetation_type_classification_real
-  long_name = vegetation type for lsm
-  units = index
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = F
 [xlat]
   standard_name = latitude
   long_name = latitude

physics/GFS_rrtmgp_pre.meta

@@ -2,7 +2,7 @@
   name = GFS_rrtmgp_pre
   type = scheme
   dependencies = funcphys.f90,iounitdef.f,machine.F,module_bfmicrophysics.f,physcons.F90,physparam.f,radcons.f90,radiation_aerosols.f
-  dependencies = radiation_astronomy.f,radiation_clouds.f,module_mp_thompson.F90,radiation_gases.f,radiation_surface.f,radiation_tools.F90,rrtmg_lw_cloud_optics.F90
+  dependencies = radiation_astronomy.f,radiation_clouds.f,radiation_gases.f,radiation_tools.F90,rrtmg_lw_cloud_optics.F90
 
 ########################################################################
 [ccpp-arg-table]