Merge branch 'wrf-model:master' into master

Author: LluisFB

phys/module_diag_functions.F

@@ -1166,7 +1166,7 @@ FUNCTION WetBulbTemp ( p, tK, rh) result( wbt )
     !  -----------------
     real                :: tdK      !~ Dewpoint temperature ( K )
     real                :: tC       !~ Temperature ( C )
-    real                :: tdC      !~ Dewpoint temperature ( K )
+    real                :: tdC      !~ Dewpoint temperature ( C )
     real                :: svapr    !~ Saturation vapor pressure ( Pa )
     real                :: vapr     !~ Ambient vapor pressure ( Pa )
     real                :: gamma    !~ Dummy term

share/wrf_timeseries.F

@@ -907,7 +907,7 @@ SUBROUTINE write_ts( grid )
                                  grid%ts_clw(n,i)
             ELSE
                !!! WRF-Solar diagnostics
-               WRITE(UNIT=iunit,FMT='(i2,f13.6,i5,i5,i5,1x,49(f13.5,1x))')  &
+               WRITE(UNIT=iunit,FMT='(i2,f13.6,i5,i5,i5,1x,50(f13.5,1x))')  &
                                  grid%id, grid%ts_hour(n,i),                &
                                  grid%id_tsloc(i), ix, iy,                  &
                                  grid%ts_t(n,i),                            &