Skip to content
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

Bring documentation updates from release/public-v4 back to master, correct syntax of \htmlinclude line for m_micro_run #448

Merged
merged 14 commits into from
May 11, 2020
Merged

Bring documentation updates from release/public-v4 back to master, correct syntax of \htmlinclude line for m_micro_run #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
379c2f3
scientific documentation update for UFS public release, add two addit…
mzhangw Feb 27, 2020
f48b283
add two new suites: GFSv15p2_no_nsst and GFSv16beta_no_nsst and GFS o…
mzhangw Mar 2, 2020
e63c34f
CCPP V4.0 scidoc update (#402)
mzhangw Mar 2, 2020
ab540e5
add no_nsst suites in all_schemes page per ligia email
mzhangw Mar 9, 2020
01a91cb
update ocean scheme description per Ligias request
mzhangw Mar 27, 2020
5a254ff
fix doxygen compile warnings
mzhangw Mar 27, 2020
e990919
fix m_micro prebuild error
mzhangw Mar 27, 2020
cec1ad9
fix doc of m_micro
mzhangw Mar 27, 2020
540035a
Update physics/docs/pdftxt/mainpage.txt
mzhangw Mar 30, 2020
7dea01c
minor fix
mzhangw Mar 30, 2020
c494cc7
Update version from 3.0.0 to 4.0.0
climbfuji May 6, 2020
5229075
Fix merge conflicts and apply missing updates for scientific document…
climbfuji May 6, 2020
6c1eec4
Remove dcyc2t3_post from physics/dcyc2.meta and scientific documentation
climbfuji May 6, 2020
e340e62
physics/m_micro.F90: correct syntax for \htmlinclude statement
climbfuji May 11, 2020
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif (NOT PROJECT)
cmake_minimum_required(VERSION 3.0)

project(ccppphys
VERSION 3.0.0
VERSION 4.0.0
LANGUAGES C CXX Fortran)

# Use rpaths on MacOSX
Expand Down
7 changes: 4 additions & 3 deletions physics/cires_ugwp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ end subroutine cires_ugwp_finalize
!> \section arg_table_cires_ugwp_run Argument Table
!! \htmlinclude cires_ugwp_run.html
!!

! subroutines original
!> \section gen_cires_ugwp CIRES UGWP Scheme General Algorithm
!! @{
subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr, &
oro, oro_uf, hprime, nmtvr, oc, theta, sigma, gamma, elvmax, clx, oa4, &
do_tofd, ldiag_ugwp, cdmbgwd, xlat, xlat_d, sinlat, coslat, area, &
Expand Down Expand Up @@ -366,5 +366,6 @@ subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr
gw_dudt = gw_dudt*(1.-pked) + ed_dudt*pked

end subroutine cires_ugwp_run

!! @}
!>@}
end module cires_ugwp
67 changes: 0 additions & 67 deletions physics/dcyc2.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,70 +535,3 @@
type = integer
intent = out
optional = F

########################################################################
[ccpp-arg-table]
name = dcyc2t3_post_init
type = scheme

########################################################################
[ccpp-arg-table]
name = dcyc2t3_post_finalize
type = scheme

########################################################################
[ccpp-arg-table]
name = dcyc2t3_post_run
type = scheme
[im]
standard_name = horizontal_loop_extent
long_name = horizontal loop extent
units = count
dimensions = ()
type = integer
intent = in
optional = F
[adjsfcdsw]
standard_name = surface_downwelling_shortwave_flux
long_name = surface downwelling shortwave flux at current time
units = W m-2
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
intent = in
optional = F
[adjsfcnsw]
standard_name = surface_net_downwelling_shortwave_flux
long_name = surface net downwelling shortwave flux at current time
units = W m-2
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
intent = in
optional = F
[adjsfcusw]
standard_name = surface_upwelling_shortwave_flux
long_name = surface upwelling shortwave flux at current time
units = W m-2
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
intent = out
optional = F
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
units = none
dimensions = ()
type = character
kind = len=*
intent = out
optional = F
[errflg]
standard_name = ccpp_error_flag
long_name = error flag for error handling in CCPP
units = flag
dimensions = ()
type = integer
intent = out
optional = F
Loading