Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
59f00b6
Initial documentation
dustinswales Mar 18, 2022
9bd527a
Merge branch 'enhanced_GP2cld_coupling_tight' into add_gp_doxygen
dustinswales Mar 21, 2022
29ce467
More RRTMGP documentation.
dustinswales Mar 21, 2022
a9d98f2
Initiate ccppv6 SciDoc
Mar 29, 2022
a690aef
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into ccpp…
mzhangw Mar 30, 2022
42566b2
v6 SciDoc WIP
Mar 31, 2022
26f8f5e
Merge branch 'ccppv6_scidoc' of https://github.com/mzhangw/ccpp-physi…
Mar 31, 2022
6d5cf0a
save scidoc progress
Apr 4, 2022
ab7615b
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into ccpp…
Apr 4, 2022
6446f96
v6 scidoc updates
Apr 5, 2022
c7e8c05
v6scidic updates
Apr 7, 2022
b87bcfa
v6 scidoc updates
Apr 7, 2022
d83e4ef
v6 scidoc updates
Apr 8, 2022
c9f53d9
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into ccpp…
Apr 8, 2022
9909835
scidoc v6 updates
Apr 12, 2022
2018559
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into ccpp…
Apr 12, 2022
25e9b25
Merge branch 'add_gp_doxygen' of https://github.com/dustinswales/ccpp…
dustinswales Apr 13, 2022
7743105
More GP documentation
dustinswales Apr 13, 2022
b4cbe11
doc updates
Apr 14, 2022
59e5871
RRTMGP doxygen documentation.
dustinswales Apr 15, 2022
bafeb8f
SciDoc v6 updates
Apr 18, 2022
f5f203c
doc updates
Apr 21, 2022
21af58f
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into ccpp…
Apr 21, 2022
486630b
scidoc updates
Apr 22, 2022
2094694
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into ccpp…
Apr 28, 2022
6ffe9ca
scidoc updates
Apr 29, 2022
8f39bbf
RRTMGP SciDoc updates
Apr 29, 2022
49951ab
scidoc update
May 3, 2022
01bcaff
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into ccpp…
May 3, 2022
6f1c2b1
v6 scidoc update
May 6, 2022
2ad0697
scidoc update
May 6, 2022
8a5bde8
scidoc bugs and minor cosmatic changes
May 9, 2022
88f79ae
address Ligia's comments
May 17, 2022
c11d45a
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into ccpp…
May 17, 2022
5ed1a60
address Ligia comments-round2
May 19, 2022
5fa0ef1
further scidoc fix
May 20, 2022
5e857cc
scidoc updates
May 20, 2022
fdf41ab
minor fix
May 20, 2022
0cee723
minor fix
May 20, 2022
c8c62c8
minor fix
May 23, 2022
7b9debe
Update physics/docs/pdftxt/CU_GF_deep.txt
mzhangw May 24, 2022
bcd5b08
further tweaks
May 24, 2022
a0ce4f3
Merge branch 'ccppv6_scidoc' of https://github.com/mzhangw/ccpp-physi…
May 24, 2022
5d87731
minor fix
May 24, 2022
ac096ef
minor fix
May 24, 2022
afaaffa
add Doxygen in UGWPv1
May 26, 2022
2cca1aa
bug fix in bib
May 26, 2022
eb1044e
minor bug fix
May 26, 2022
a1513c5
further cleanup empty subroutines
May 26, 2022
3082858
rename MYNN PBL file to match scheme name
grantfirl Jun 2, 2022
d0d6895
Update rte-rrtmgp submodule
dustinswales May 16, 2022
e1d5a95
minor fix
Jun 2, 2022
01bdbd9
make sure that tsfc_wat is calculated when wet = T
grantfirl May 10, 2022
5672879
minor fix
Jun 2, 2022
f3684a3
minor fix
Jun 2, 2022
a0d704d
minor fix
Jun 2, 2022
a0449b4
delete unnecessary files
Jun 2, 2022
9d47cee
Merge pull request #931 from grantfirl/20220602_release_v6_updates
grantfirl Jun 2, 2022
1b8b6c8
merge pr#931
Jun 2, 2022
ad1dea0
Merge pull request #919 from mzhangw/ccppv6_scidoc
grantfirl Jun 2, 2022
bf260fa
re-update RRTMGP submodule pointer after last merge accidentally reve…
grantfirl Jun 2, 2022
8e8b76b
Update README.md
mkavulich Jun 3, 2022
ebc09ba
add back empty comment line for ccpp_prebuild.py to not error on rrtm…
grantfirl Jun 7, 2022
17fceae
Merge pull request #936 from grantfirl/20220607_doc_bugfix
grantfirl Jun 7, 2022
620cf02
Removed references to _init
mark-a-potts Jun 7, 2022
01c6766
Merge pull request #939 from NOAA-EPIC/release/public-v6
grantfirl Jun 8, 2022
206e94f
Modification made to reflect the release plan change
Jun 13, 2022
740845c
Update README.md
mkavulich Jun 14, 2022
3a86fbc
Merge pull request #932 from NCAR/Update-README-to-v6
grantfirl Jun 14, 2022
1de4a35
revert changes as requested
Jun 14, 2022
87d4b6c
Merge pull request #943 from mzhangw/scidocv6_r2
grantfirl Jun 15, 2022
478d44b
Merge remote-tracking branch 'remotes/origin/release/public-v6' into …
mzhangw Jul 1, 2022
3301fb2
Solve warning when running Doxygen
Jul 1, 2022
c8e6f18
Address M. Iacono's comments
Jul 5, 2022
7cb9211
minor fix \
Jul 6, 2022
4d3c729
delete empty subroutines as requested
Jul 15, 2022
9a0871d
delete empty _finalize subroutines
Jul 19, 2022
734f2e8
minor format fix
Jul 19, 2022
604fd2d
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into v6_t…
Jul 19, 2022
9543328
address J. Olson's comments on mym_inialize
Jul 29, 2022
0f41f73
Merge branch 'main' into v6_to_main
Aug 12, 2022
8313af9
fix typo in GFS_time_vary_pre.scm.F90
Aug 12, 2022
3e06b51
Merge pull request #6 from grantfirl/v6_to_main
mzhangw Aug 12, 2022
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
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ Please see more information about the CCPP at the locations below.

- [CCPP website hosted by the Developmental Testbed Center (DTC)](https://dtcenter.org/ccpp)
- [CCPP public release information](https://dtcenter.org/community-code/common-community-physics-package-ccpp/download)
- [CCPP Technical Documentation](https://ccpp-techdoc.readthedocs.io/en/latest)
- [CCPP Scientific Documentation](https://dtcenter.ucar.edu/GMTB/v5.0.0/sci_doc)
- [CCPP Technical Documentation](https://ccpp-techdoc.readthedocs.io/en/v6.0.0/)
- [CCPP Scientific Documentation](https://dtcenter.ucar.edu/GMTB/v6.0.0/sci_doc/index.html)
- [CCPP Physics GitHub wiki](https://github.com/NCAR/ccpp-physics/wiki)
- [CCPP Framework GitHub wiki](https://github.com/NCAR/ccpp-framework/wiki)

For the use of CCPP with its Single Column Model, see the [Single Column Model User's Guide](http://dtcenter.org/sites/default/files/paragraph/scm-ccpp-guide-v5.0.0.pdf).
For the use of CCPP with its Single Column Model, see the [Single Column Model User's Guide](http://dtcenter.org/sites/default/files/paragraph/scm-ccpp-guide-v6.0.0.pdf).

For the use of CCPP with NOAA's Unified Forecast System (UFS), see the [UFS Medium-Range Application User's Guide](https://ufs-mrweather-app.readthedocs.io/en/latest), the [UFS Short-Range Application User's Guide](https://ufs-srweather-app.readthedocs.io/en/latest) and the [UFS Weather Model User's Guide](https://ufs-weather-model.readthedocs.io/en/latest).

Expand All @@ -24,5 +24,3 @@ This revision of the CCPP physics library is compliant with [version 0.1.1 of th
## Licensing

The Apache license will be in effect unless superseded by an existing license in specific files.

### Last updated by Dom Heinzeller, 11/04/2021
1 change: 0 additions & 1 deletion physics/GFS_DCNV_generic_post.F90
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,4 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, &
endif ! if (lssav)

end subroutine GFS_DCNV_generic_post_run

end module GFS_DCNV_generic_post
9 changes: 3 additions & 6 deletions physics/GFS_GWD_generic_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ module GFS_GWD_generic_pre

contains

!! \section arg_table_GFS_GWD_generic_pre_run Argument Table
!> \section arg_table_GFS_GWD_generic_pre_run Argument Table
!! \htmlinclude GFS_GWD_generic_pre_run.html
!!
!! \section general General Algorithm
!! \section detailed Detailed Algorithm
!! @{
!! \section gfs_gwd_ge_pre_ga General Algorithm
subroutine GFS_GWD_generic_pre_run( &
& im, levs, nmtvr, mntvar, &
& oc, oa4, clx, theta, &
Expand Down Expand Up @@ -136,6 +134,5 @@ subroutine GFS_GWD_generic_pre_run( &
endif

end subroutine GFS_GWD_generic_pre_run
!> @}

end module GFS_GWD_generic_pre
end module GFS_GWD_generic_pre
2 changes: 1 addition & 1 deletion physics/GFS_MP_generic_post.F90
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module GFS_MP_generic_post
!! will be called. the tallies are then summed in calwxt_dominant(). For GFDL cloud MP scheme, determine convective
!! rain/snow by surface temperature; and determine explicit rain/snow by rain/snow coming out directly from MP.
!!
!! \section arg_table_GFS_MP_generic_post_run Argument Table
!> \section arg_table_GFS_MP_generic_post_run Argument Table
!! \htmlinclude GFS_MP_generic_post_run.html
!!
!> \section gfs_mp_gen GFS MP Generic Post General Algorithm
Expand Down
37 changes: 13 additions & 24 deletions physics/GFS_cloud_diagnostics.F90
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
! ########################################################################################
! This module contains code to produce the UFS High/Mid/Low cloud-diagnostics.
! This was bundled together with the prognostic cloud modules within the RRTMG implementation.
! For the RRTMGP implementation we propose to keep these diagnostics independent.
! ########################################################################################
!>\file GFS_cloud_diagnostics.F90
!!

module GFS_cloud_diagnostics
use machine, only: kind_phys
use physparam, only: icldflg
Expand All @@ -26,17 +24,16 @@ module GFS_cloud_diagnostics
integer :: &
llyr = 2 ! Upper limit of boundary layer clouds

public GFS_cloud_diagnostics_run, GFS_cloud_diagnostics_init,&
GFS_cloud_diagnostics_finalize, hml_cloud_diagnostics_init
public GFS_cloud_diagnostics_run

contains
! ######################################################################################
! ######################################################################################
subroutine GFS_cloud_diagnostics_init()
end subroutine GFS_cloud_diagnostics_init

! ######################################################################################
! ######################################################################################
!! \section arg_table_GFS_cloud_diagnostics_run

!>\defgroup gfs_cloud_diagnostics_mod GFS Cloud Diagnostics Module
!> This module contains code to produce the UFS High/Mid/Low cloud-diagnostics.
!! This was bundled together with the prognostic cloud modules within the RRTMG implementation.
!! For the RRTMGP implementation we propose to keep these diagnostics independent.
!> @{
!> \section arg_table_GFS_cloud_diagnostics_run
!! \htmlinclude GFS_cloud_diagnostics_run.html
!!
subroutine GFS_cloud_diagnostics_run(nCol, nLev, iovr_rand, iovr_maxrand, iovr_max, &
Expand Down Expand Up @@ -118,13 +115,5 @@ subroutine GFS_cloud_diagnostics_run(nCol, nLev, iovr_rand, iovr_maxrand, iovr_m
iovr_exprand, cldsa, mtopa, mbota)

end subroutine GFS_cloud_diagnostics_run

! ######################################################################################
! ######################################################################################
subroutine GFS_cloud_diagnostics_finalize()
end subroutine GFS_cloud_diagnostics_finalize

! ######################################################################################
! Subroutine hml_cloud_diagnostics_initialize is removed (refer to GFS_rrtmgp_setup.F90)
! ######################################################################################
!> @}
end module GFS_cloud_diagnostics
26 changes: 4 additions & 22 deletions physics/GFS_debug.F90
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ module GFS_diagtoscreen

private

public GFS_diagtoscreen_init, GFS_diagtoscreen_timestep_init, GFS_diagtoscreen_run, GFS_diagtoscreen_finalize
public GFS_diagtoscreen_init, GFS_diagtoscreen_timestep_init, GFS_diagtoscreen_run

contains

Expand Down Expand Up @@ -377,9 +377,6 @@ subroutine GFS_diagtoscreen_timestep_init (Model, Data, Interstitial, errmsg, er

end subroutine GFS_diagtoscreen_timestep_init

subroutine GFS_diagtoscreen_finalize ()
end subroutine GFS_diagtoscreen_finalize

!> \section arg_table_GFS_diagtoscreen_run Argument Table
!! \htmlinclude GFS_diagtoscreen_run.html
!!
Expand Down Expand Up @@ -968,7 +965,7 @@ module GFS_interstitialtoscreen

private

public GFS_interstitialtoscreen_init, GFS_interstitialtoscreen_timestep_init, GFS_interstitialtoscreen_run, GFS_interstitialtoscreen_finalize
public GFS_interstitialtoscreen_init, GFS_interstitialtoscreen_timestep_init, GFS_interstitialtoscreen_run

contains

Expand Down Expand Up @@ -1040,9 +1037,6 @@ subroutine GFS_interstitialtoscreen_timestep_init (Model, Data, Interstitial, er

end subroutine GFS_interstitialtoscreen_timestep_init

subroutine GFS_interstitialtoscreen_finalize ()
end subroutine GFS_interstitialtoscreen_finalize

!> \section arg_table_GFS_interstitialtoscreen_run Argument Table
!! \htmlinclude GFS_interstitialtoscreen_run.html
!!
Expand Down Expand Up @@ -1484,16 +1478,10 @@ module GFS_abort

private

public GFS_abort_init, GFS_abort_run, GFS_abort_finalize
public GFS_abort_run

contains

subroutine GFS_abort_init ()
end subroutine GFS_abort_init

subroutine GFS_abort_finalize ()
end subroutine GFS_abort_finalize

!> \section arg_table_GFS_abort_run Argument Table
!! \htmlinclude GFS_abort_run.html
!!
Expand Down Expand Up @@ -1528,16 +1516,10 @@ module GFS_checkland

private

public GFS_checkland_init, GFS_checkland_run, GFS_checkland_finalize
public GFS_checkland_run

contains

subroutine GFS_checkland_init ()
end subroutine GFS_checkland_init

subroutine GFS_checkland_finalize ()
end subroutine GFS_checkland_finalize

!> \section arg_table_GFS_checkland_run Argument Table
!! \htmlinclude GFS_checkland_run.html
!!
Expand Down
14 changes: 6 additions & 8 deletions physics/GFS_phys_time_vary.fv3.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
!>\defgroup mod_GFS_phys_time_vary GFS Physics Time Update
!! This module contains GFS physics time vary subroutines including ozone, stratospheric water vapor,
!! aerosol, IN&CCN and surface properties updates.
!> @{
module GFS_phys_time_vary

#ifdef _OPENMP
Expand Down Expand Up @@ -66,7 +65,7 @@ module GFS_phys_time_vary
!! \htmlinclude GFS_phys_time_vary_init.html
!!
!>\section gen_GFS_phys_time_vary_init GFS_phys_time_vary_init General Algorithm
!! @{
!> @{
subroutine GFS_phys_time_vary_init ( &
me, master, ntoz, h2o_phys, iaerclm, iccn, iflip, im, levs, &
nx, ny, idate, xlat_d, xlon_d, &
Expand Down Expand Up @@ -701,13 +700,13 @@ function find_eq_smc(bexp, dwsat, dksat, ddz, smcmax) result(smc)
end function find_eq_smc

end subroutine GFS_phys_time_vary_init
!! @}
!> @}

!> \section arg_table_GFS_phys_time_vary_timestep_init Argument Table
!! \htmlinclude GFS_phys_time_vary_timestep_init.html
!!
!>\section gen_GFS_phys_time_vary_timestep_init GFS_phys_time_vary_timestep_init General Algorithm
!! @{
!> @{
subroutine GFS_phys_time_vary_timestep_init ( &
me, master, cnx, cny, isc, jsc, nrcm, im, levs, kdt, idate, nsswr, fhswr, lsswr, fhour, &
imfdeepcnv, cal_pre, random_clds, nscyc, ntoz, h2o_phys, iaerclm, iccn, clstp, &
Expand Down Expand Up @@ -906,13 +905,13 @@ subroutine GFS_phys_time_vary_timestep_init (
endif

end subroutine GFS_phys_time_vary_timestep_init
!! @}
!> @}

!> \section arg_table_GFS_phys_time_vary_timestep_finalize Argument Table
!! \htmlinclude GFS_phys_time_vary_timestep_finalize.html
!!
!>\section gen_GFS_phys_time_vary_timestep_finalize GFS_phys_time_vary_timestep_finalize General Algorithm
!! @{
!> @{
subroutine GFS_phys_time_vary_timestep_finalize (errmsg, errflg)

implicit none
Expand All @@ -926,7 +925,7 @@ subroutine GFS_phys_time_vary_timestep_finalize (errmsg, errflg)
errflg = 0

end subroutine GFS_phys_time_vary_timestep_finalize
!! @}
!> @}

!> \section arg_table_GFS_phys_time_vary_finalize Argument Table
!! \htmlinclude GFS_phys_time_vary_finalize.html
Expand Down Expand Up @@ -976,4 +975,3 @@ subroutine GFS_phys_time_vary_finalize(errmsg, errflg)
end subroutine GFS_phys_time_vary_finalize

end module GFS_phys_time_vary
!> @}
3 changes: 2 additions & 1 deletion physics/GFS_rad_time_vary.fv3.F90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!>\file GFS_rad_time_vary.fv3.F90
!! Contains code related to GFS physics suite setup (radiation part of time_vary_step)
!! Contains code related to GFS radiation suite setup (radiation part of time_vary_step)
module GFS_rad_time_vary

implicit none
Expand All @@ -11,6 +11,7 @@ module GFS_rad_time_vary
contains

!>\defgroup mod_GFS_rad_time_vary GFS Radiation Time Update
!! This module contains code related to GFS radiation setup.
!> @{
!> \section arg_table_GFS_rad_time_vary_timestep_init Argument Table
!! \htmlinclude GFS_rad_time_vary_timestep_init.html
Expand Down
14 changes: 8 additions & 6 deletions physics/GFS_radiation_surface.F90
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
!>\file GFS_radiation_surface.f90
!>\file GFS_radiation_surface.F90
!! This file contains calls to module_radiation_surface::setemis() to set up
!! surface emissivity for LW radiation and to module_radiation_surface::setalb()
!! to set up surface albedo for SW radiation.

module GFS_radiation_surface

use machine, only: kind_phys

contains

!>\defgroup GFS_radiation_surface GFS radiation surface
!! @{
!>\defgroup GFS_radiation_surface_mod GFS Radiation Surface Module
!! This module contains calls to module_radiation_surface::setemis() to set up
!! surface emissivity for LW radiation and to module_radiation_surface::setalb()
!! to set up surface albedo for SW radiation.
!> @{
!> \section arg_table_GFS_radiation_surface_init Argument Table
!! \htmlinclude GFS_radiation_surface_init.html
!!
Expand Down Expand Up @@ -189,7 +193,5 @@ subroutine GFS_radiation_surface_run ( &

end subroutine GFS_radiation_surface_run

subroutine GFS_radiation_surface_finalize ()
end subroutine GFS_radiation_surface_finalize
!! @}
!> @}
end module GFS_radiation_surface
36 changes: 19 additions & 17 deletions physics/GFS_rrtmg_post.F90
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
!>\file GFS_rrtmg_post.f90
!! This file contains
!>\file GFS_rrtmg_post.F90
!! This file contains the calculation of time averaged output quantities (including total-sky and
!! clear-sky SW and LW fluxes at TOA and surface; conventional
!! 3-domain cloud amount, cloud top and base pressure, and cloud top
!! temperature; aerosols AOD, etc.), store computed results in
!! corresponding slots of array fluxr with appropriate time weights.

!>\defgroup GFS_rrtmg_post_mod GFS RRTMG Scheme Post
module GFS_rrtmg_post
contains

!> \section arg_table_GFS_rrtmg_post_init Argument Table
!!
subroutine GFS_rrtmg_post_init ()
end subroutine GFS_rrtmg_post_init

!>\defgroup GFS_rrtmg_post_mod GFS RRTMG Scheme Post
!! This module calculate time averaged output quantities (including total-sky and
!! clear-sky SW and LW fluxes at TOA and surface; conventional
!! 3-domain cloud amount, cloud top and base pressure, and cloud top
!! temperature; aerosols AOD, etc.), store computed results in
!! corresponding slots of array fluxr with appropriate time weights.
!> @{
!> \section arg_table_GFS_rrtmg_post_run Argument Table
!! \htmlinclude GFS_rrtmg_post_run.html
!!
Expand Down Expand Up @@ -66,11 +71,11 @@ subroutine GFS_rrtmg_post_run (im, km, kmp1, lm, ltp, kt, kb, kd, nspc1, &

if (.not. (lsswr .or. lslwr)) return

!> - For time averaged output quantities (including total-sky and
!! clear-sky SW and LW fluxes at TOA and surface; conventional
!! 3-domain cloud amount, cloud top and base pressure, and cloud top
!! temperature; aerosols AOD, etc.), store computed results in
!! corresponding slots of array fluxr with appropriate time weights.
! - For time averaged output quantities (including total-sky and
! clear-sky SW and LW fluxes at TOA and surface; conventional
! 3-domain cloud amount, cloud top and base pressure, and cloud top
! temperature; aerosols AOD, etc.), store computed results in
! corresponding slots of array fluxr with appropriate time weights.

! --- ... collect the fluxr data for wrtsfc

Expand Down Expand Up @@ -205,8 +210,5 @@ subroutine GFS_rrtmg_post_run (im, km, kmp1, lm, ltp, kt, kb, kd, nspc1, &
endif
!
end subroutine GFS_rrtmg_post_run

subroutine GFS_rrtmg_post_finalize ()
end subroutine GFS_rrtmg_post_finalize

!> @}
end module GFS_rrtmg_post
Loading