Merge pull request #448 from climbfuji/bugfixes_from_public_release

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

CMakeLists.txt

@@ -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

physics/cires_ugwp.F90

@@ -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,             &
@@ -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

physics/dcyc2.meta

@@ -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