Skip to content

Commit

Permalink
Merge pull request #6 from NCAR/master
Browse files Browse the repository at this point in the history
Sync with upstream master
  • Loading branch information
dustinswales authored Oct 9, 2019
2 parents 77bfcc2 + ce641c9 commit 9d6b208
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions physics/GFS_debug.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module GFS_diagtoscreen

private

public GFS_diagtoscreen_init, GFS_diagtoscreen_run, GFS_diagtoscreen_finalize

public print_my_stuff, chksum_int, chksum_real
Expand Down Expand Up @@ -130,7 +130,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank,omprank, blkno, 'Sfcprop%zorlo' , Sfcprop%zorlo)
call print_var(mpirank,omprank, blkno, 'Sfcprop%zorll' , Sfcprop%zorll)
call print_var(mpirank,omprank, blkno, 'Sfcprop%fice' , Sfcprop%fice)
call print_var(mpirank,omprank, blkno, 'Sfcprop%hprim' , Sfcprop%hprim)
! call print_var(mpirank,omprank, blkno, 'Sfcprop%hprim' , Sfcprop%hprim)
call print_var(mpirank,omprank, blkno, 'Sfcprop%hprime' , Sfcprop%hprime)
call print_var(mpirank,omprank, blkno, 'Sfcprop%sncovr' , Sfcprop%sncovr)
call print_var(mpirank,omprank, blkno, 'Sfcprop%snoalb' , Sfcprop%snoalb)
Expand Down Expand Up @@ -617,7 +617,7 @@ subroutine print_real_2d(mpirank,omprank,blkno,name,var)
integer, intent(in) :: mpirank, omprank, blkno
character(len=*), intent(in) :: name
real(kind_phys), intent(in) :: var(:,:)

integer :: k, i

#ifdef PRINT_SUM
Expand Down Expand Up @@ -744,7 +744,7 @@ end module GFS_diagtoscreen
module GFS_interstitialtoscreen

private

public GFS_interstitialtoscreen_init, GFS_interstitialtoscreen_run, GFS_interstitialtoscreen_finalize

contains
Expand Down Expand Up @@ -856,7 +856,7 @@ end module GFS_interstitialtoscreen
module GFS_abort

private

public GFS_abort_init, GFS_abort_run, GFS_abort_finalize

contains
Expand Down Expand Up @@ -900,7 +900,7 @@ end module GFS_abort
module GFS_checkland

private

public GFS_checkland_init, GFS_checkland_run, GFS_checkland_finalize

contains
Expand Down
2 changes: 1 addition & 1 deletion physics/rrtmg_lw_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ subroutine rrtmg_lw_pre_run (Model, Grid, Sfcprop, Radtend, im, tsfg, tsfa, errm
!! emissivity for LW radiation.
call setemis (Grid%xlon, Grid%xlat, Sfcprop%slmsk, & ! --- inputs
Sfcprop%snowd, Sfcprop%sncovr, Sfcprop%zorl, &
tsfg, tsfa, Sfcprop%hprim, IM, &
tsfg, tsfa, Sfcprop%hprime(:,1), IM, &
Radtend%semis) ! --- outputs
endif

Expand Down
14 changes: 7 additions & 7 deletions physics/rrtmg_sw_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ subroutine rrtmg_sw_pre_run (Model, Grid, Sfcprop, Radtend, im, &
!> - Call module_radiation_surface::setalb() to setup surface albedo.
!! for SW radiation.

call setalb (Sfcprop%slmsk, Sfcprop%snowd, Sfcprop%sncovr,& ! --- inputs:
Sfcprop%snoalb, Sfcprop%zorl, Radtend%coszen,&
tsfg, tsfa, Sfcprop%hprim, Sfcprop%alvsf, &
Sfcprop%alnsf, Sfcprop%alvwf, Sfcprop%alnwf, &
Sfcprop%facsf, Sfcprop%facwf, Sfcprop%fice, &
Sfcprop%tisfc, IM, &
alb1d, Model%pertalb, & ! mg, sfc-perts
call setalb (Sfcprop%slmsk, Sfcprop%snowd, Sfcprop%sncovr, & ! --- inputs:
Sfcprop%snoalb, Sfcprop%zorl, Radtend%coszen, &
tsfg, tsfa, Sfcprop%hprime(:,1), Sfcprop%alvsf, &
Sfcprop%alnsf, Sfcprop%alvwf, Sfcprop%alnwf, &
Sfcprop%facsf, Sfcprop%facwf, Sfcprop%fice, &
Sfcprop%tisfc, IM, &
alb1d, Model%pertalb, & ! mg, sfc-perts
sfcalb) ! --- outputs

!> -# Approximate mean surface albedo from vis- and nir- diffuse values.
Expand Down

0 comments on commit 9d6b208

Please sign in to comment.