Skip to content

ccppdo2 #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mzhangw merged 9 commits into from
Mar 21, 2018
Merged

ccppdo2 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c09a0fb
import CCPP physics documentation into features/ccpp from master.
mzhangw Mar 16, 2018
2694959
put in-line documentation in place.
mzhangw Mar 16, 2018
fbaf7b6
add some CCPP-compliant doxygen.
mzhangw Mar 19, 2018
08f89a5
a minor fix
mzhangw Mar 19, 2018
75630ee
add doxygen to ccpp physics.
mzhangw Mar 20, 2018
cfea3f7
Merge branch 'features/ccpp' of https://github.com/NCAR/gmtb-gfsphysi…
mzhangw Mar 20, 2018
86c77c1
doxygen fix in ccppdo2
mzhangw Mar 20, 2018
a1302d2
fix doxygen warnings.
mzhangw Mar 20, 2018
a7d6094
fix bugs
mzhangw Mar 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions physics/GFS_calpreciptype.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
!> \file GFS_calpreciptype.F90
!! This file contains the subroutine that calculates dominant precipitation type (calpreciptype)
!! and its post. It is adopted from post but was made into a column to used by GFS model.

!> \file GFS_calpreciptype.f90
!! This file contains the subroutine that calculates dominant precipitation type (calpreciptype),
!! which provides precipitation forcing for LSM.

!>\defgroup CALPRECIPTYPE GFS Dominant Precipitation Type
!!\brief This scheme contains the subroutine that calculates dominant
!! precipitation type and its post, which provides precipitation forcing
!! to LSM.
!!
module GFS_calpreciptype
contains

!> \section arg_table_GFS_calpreciptype_init Argument Table
!! \section arg_table_GFS_calpreciptype_init Argument Table
!!
subroutine GFS_calpreciptype_init
end subroutine GFS_calpreciptype_init

!! \section arg_table_GFS_calpreciptype_finalize Argument table
!!
subroutine GFS_calpreciptype_finalize
end subroutine GFS_calpreciptype_finalize


!>\defgroup gfs_calpreciptype GFS calpreciptype Main
!!\ingroup CALPRECIPTYPE
!!\brief This subroutine calculates dominant precipitation type, which provides precipitation forcing for LSM.
!> \section arg_table_GFS_calpreciptype_run Argument Table
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
!! |----------------|------------------------------------------------------------------------|------------------------------------------------------------|---------|------|-----------|-----------|--------|----------|
Expand Down Expand Up @@ -306,10 +319,6 @@ subroutine GFS_calpreciptype_run(kdt,nrcm,im,ix,lm,lp1,randomno, &
tprcp(:) = max(0.0, prec(:)) ! clu: rain -> tprcp

else
domr = 0.
domzr = 0.
domip = 0.
doms = 0.
do i = 1, im
tprcp(i) = max(0.0,prec(i)) ! clu: rain -> tprcp
srflag(i) = 0. ! clu: default srflag as 'rain' (i.e. 0)
Expand Down Expand Up @@ -1526,9 +1535,5 @@ subroutine calwxt_dominant(nalg,rain,freezr,sleet,snow, &
return
end subroutine calwxt_dominant

!> \section arg_table_GFS_calpreciptype_finalize Argument table
!!
subroutine GFS_calpreciptype_finalize
end subroutine GFS_calpreciptype_finalize

end module GFS_calpreciptype
1 change: 1 addition & 0 deletions physics/GFS_rad_time_vary.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module GFS_rad_time_vary
contains

!>\defgroup GFS_rad_time_vary GFS RRTMG Update
!!\ingroup RRTMG
!! @{
!! \section arg_table_GFS_rad_time_vary_init Argument Table
!!
Expand Down
10 changes: 10 additions & 0 deletions physics/GFS_radupdate.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
!>\file GFS_radupdate.f90
!! This file calls many update subroutines to check and update radiation required but
!! time varying data sets and module variables.
module GFS_radupdate
contains

!>\defgroup GFS_radupdate_run RRTMG Update
!!\ingroup RRTMG
!>\brief This subroutine calls many update subroutines to check and update radiation
!! required but time varying data sets and module variables.
!>\section gen_radupdate General Algorithm
!> @{
subroutine GFS_radupdate_run ( idate,jdate,deltsw,deltim,lsswr, me, &
& slag,sdec,cdec,solcon, ictmflg, isolar)

Expand Down Expand Up @@ -170,5 +179,6 @@ subroutine GFS_radupdate_run ( idate,jdate,deltsw,deltim,lsswr, me, &
!...................................
end subroutine GFS_radupdate_run
!-----------------------------------
!> @}

end module GFS_radupdate
9 changes: 0 additions & 9 deletions physics/GFS_surface_loop_control.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

!> \defgroup GFS_surface_loop_control GFS_surface_loop_control scheme
!! @{
!! \brief Brief description of the parameterization
!! \section diagram Calling Hierarchy Diagram
!! \section intraphysics Intraphysics Communication

module GFS_surface_loop_control_part0
contains
Expand Down Expand Up @@ -54,9 +51,6 @@ end module GFS_surface_loop_control_part0

!> \defgroup GFS_surface_loop_control GFS_surface_loop_control scheme
!! @{
!! \brief Brief description of the parameterization
!! \section diagram Calling Hierarchy Diagram
!! \section intraphysics Intraphysics Communication

module GFS_surface_loop_control_part1
contains
Expand Down Expand Up @@ -121,9 +115,6 @@ end module GFS_surface_loop_control_part1

!> \defgroup GFS_surface_loop_control GFS_surface_loop_control scheme
!! @{
!! \brief Brief description of the parameterization
!! \section diagram Calling Hierarchy Diagram
!! \section intraphysics Intraphysics Communication

module GFS_surface_loop_control_part2
contains
Expand Down
3 changes: 1 addition & 2 deletions physics/GFS_zhao_carr_pre.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,13 @@ subroutine GFS_zhao_carr_pre_run (im, ix, levs, cwm, clw1, errmsg, errflg)
! declare variables.

integer,intent(in) :: im, ix, levs
integer :: i,k
real(kind=kind_phys),dimension(ix,levs), intent(in) :: cwm
real(kind=kind_phys),dimension(ix,levs), intent(out) :: clw1

character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

integer :: i,k

! Initialize CCPP error handling variables
errmsg = ''
errflg = 0
Expand Down
Loading