Fixed some bugs in argument tables.

grantfirl · Sep 24, 2019 · f5562ee · f5562ee
1 parent c668a6a
commit f5562ee
Show file tree

Hide file tree

Showing 21 changed files with 118 additions and 112 deletions.
diff --git a/physics/GFS_rrtmgp_gas_optics.F90 b/physics/GFS_rrtmgp_gas_optics.F90
@@ -1,9 +1,13 @@
+!> \file GFS_rrtmgp_gas_optics.f90
+!! This file contains
 module GFS_rrtmgp_gas_optics
   use machine,      only: kind_phys
   use GFS_typedefs, only: GFS_control_type,GFS_radtend_type
+
+  public GFS_rrtmgp_gas_optics_init,GFS_rrtmgp_gas_optics_run,GFS_rrtmgp_gas_optics_finalize
 contains
 
-!! \section arg_table_GFS_rrtmgp_gas_optics
+!! \section arg_table_GFS_rrtmgp_gas_optics_init
 !! \htmlinclude GFS_rrtmgp_gas_optics.html
 !!
 

diff --git a/physics/GFS_rrtmgp_gas_optics.meta b/physics/GFS_rrtmgp_gas_optics.meta
@@ -34,3 +34,13 @@
   type = integer
   intent = out
   optional = F
+
+########################################################################
+[ccpp-arg-table]
+  name = GFS_rrtmgp_gas_optics_run
+  type = scheme
+
+########################################################################
+[ccpp-arg-table]
+  name = GFS_rrtmgp_gas_optics_finalize
+  type = scheme
diff --git a/physics/GFS_rrtmgp_lw_post.F90 b/physics/GFS_rrtmgp_lw_post.F90
@@ -22,12 +22,9 @@ module GFS_rrtmgp_lw_post
   subroutine GFS_rrtmgp_lw_post_init()
   end subroutine GFS_rrtmgp_lw_post_init
 
-  ! PGI compiler does not accept lines longer than 264 characters, remove during pre-processing
-#ifndef __PGI
-!> \section arg_table_GFS_rrtmgp_lw_post
+!> \section arg_table_GFS_rrtmgp_lw_post_run
 !! \htmlinclude GFS_rrtmgp_lw_post.html
 !!
-#endif
   subroutine GFS_rrtmgp_lw_post_run (Model, Grid, Radtend,  &
               Coupling, im, p_lev,          &
               tsfa, fluxlwUP_allsky, fluxlwDOWN_allsky, fluxlwUP_clrsky, fluxlwDOWN_clrsky, &

diff --git a/physics/GFS_rrtmgp_post.F90 b/physics/GFS_rrtmgp_post.F90
@@ -19,14 +19,10 @@ module GFS_rrtmgp_post
   implicit none
 contains
 
-!>\defgroup GFS_rrtmgp_post GFS RRTMGP Scheme Post
-!! @{
-!> \section arg_table_GFS_rrtmgp_post_init Argument Table
-!!
   subroutine GFS_rrtmgp_post_init ()
   end subroutine GFS_rrtmgp_post_init
 
-!> \section arg_table_GFS_rrtmgp_post
+!> \section arg_table_GFS_rrtmgp_post_run
 !! \htmlinclude GFS_rrtmgp_post.html
 !!
   subroutine GFS_rrtmgp_post_run (Model, Grid, Diag, Radtend, Statein, Coupling, scmpsw, &

diff --git a/physics/GFS_rrtmgp_post.meta b/physics/GFS_rrtmgp_post.meta
@@ -123,7 +123,7 @@
   intent = in
   optional = F
 [cldtaulw]
-  standard_name = cloud_optical_depth_layers_at_10mu_band
+  standard_name = RRTMGP_cloud_optical_depth_layers_at_10mu_band
   long_name = approx 10mu band layer cloud optical depth
   units = none
   dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
@@ -132,7 +132,7 @@
   intent = in
   optional = F
 [cldtausw]
-  standard_name = cloud_optical_depth_layers_at_0_55mu_band
+  standard_name = RRTMGP_cloud_optical_depth_layers_at_0_55mu_band
   long_name = approx .55mu band layer cloud optical depth
   units = none
   dimensions = (horizontal_dimension,vertical_dimension_plus_one)

diff --git a/physics/GFS_rrtmgp_pre.F90 b/physics/GFS_rrtmgp_pre.F90
@@ -66,7 +66,7 @@ module GFS_rrtmgp_pre
   subroutine GFS_rrtmgp_pre_init ()
   end subroutine GFS_rrtmgp_pre_init
 
-!> \section arg_table_GFS_rrtmgp_pre
+!> \section arg_table_GFS_rrtmgp_pre_run
 !! \htmlinclude GFS_rrtmgp_pre.html
 !!
   ! Attention - the output arguments lm, im, lmk, lmp must not be set

diff --git a/physics/GFS_rrtmgp_pre.meta b/physics/GFS_rrtmgp_pre.meta
@@ -226,23 +226,22 @@
   intent = out
   optional = F
 [faerlw]
-  standard_name = aerosol_optical_properties_for_longwave_bands_01_16
+  standard_name = RRTMGP_aerosol_optical_properties_for_longwave_bands_01_16
   long_name = aerosol optical properties for longwave bands 01-16
   units = various
-  dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_longwave_radiation,number_of_aerosol_output_fields_for_longwave_radiation)
+  dimensions = (horizontal_dimension,vertical_dimension_plus_one, number_of_lw_bands_rrtmgp,number_of_aerosol_output_fields_for_longwave_radiation)
   type = real
   kind = kind_phys
   intent = out
   optional = F
 [faersw]
-  standard_name = aerosol_optical_properties_for_shortwave_bands_01_16
+  standard_name = RRTMGP_aerosol_optical_properties_for_shortwave_bands_01_16
   long_name = aerosol optical properties for shortwave bands 01-16
   units = various
-  dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation,number_of_aerosol_output_fields_for_shortwave_radiation)
+  dimensions = (horizontal_dimension,vertical_dimension_plus_one, number_of_sw_bands_rrtmgp, number_of_aerosol_output_fields_for_shortwave_radiation)
   type = real
-  kind = kind_phys
   intent = out
-  optional = F
+  kind = kind_phys
 [mtopa]
   standard_name = model_layer_number_at_cloud_top
   long_name = vertical indices for low, middle and high cloud tops

diff --git a/physics/GFS_rrtmgp_setup.F90 b/physics/GFS_rrtmgp_setup.F90
@@ -37,9 +37,7 @@ module GFS_rrtmgp_setup
 
    contains
 
-!> \defgroup GFS_rrtmgp_setup GFS RRTMGP Scheme Setup
-!! @{
-!! \section arg_table_GFS_rrtmgp_setup
+!! \section arg_table_GFS_rrtmgp_setup_init
 !! \htmlinclude GFS_rrtmgp_setup.html
 !!
    subroutine GFS_rrtmgp_setup_init (                                    &
@@ -316,7 +314,7 @@ subroutine GFS_rrtmgp_setup_init (                                    &
 
    end subroutine GFS_rrtmgp_setup_init
 
-!> \section arg_table_GFS_rrtmgp_setup
+!> \section arg_table_GFS_rrtmgp_setup_run
 !! \htmlinclude GFS_rrtmgp_setup.html
 !!
    subroutine GFS_rrtmgp_setup_run (                &
@@ -355,7 +353,7 @@ subroutine GFS_rrtmgp_setup_run (                &
 
    end subroutine GFS_rrtmgp_setup_run
 
-!> \section arg_table_GFS_rrtmgp_setup
+!> \section arg_table_GFS_rrtmgp_setup_finalize
 !! \htmlinclude GFS_rrtmgp_setup.html
 !!
    subroutine GFS_rrtmgp_setup_finalize (errmsg, errflg)

diff --git a/physics/GFS_rrtmgp_sw_post.F90 b/physics/GFS_rrtmgp_sw_post.F90
@@ -23,12 +23,9 @@ module GFS_rrtmgp_sw_post
   subroutine GFS_rrtmgp_sw_post_init()
   end subroutine GFS_rrtmgp_sw_post_init
 
-  ! PGI compiler does not accept lines longer than 264 characters, remove during pre-processing
-#ifndef __PGI
-!> \section arg_table_GFS_rrtmgp_sw_post
+!> \section arg_table_GFS_rrtmgp_sw_post_run
 !! \htmlinclude GFS_rrtmgp_sw_post.html
 !!
-#endif
   subroutine GFS_rrtmgp_sw_post_run (Model, Grid, Diag, Radtend, Coupling,       & 
        scmpsw, im, p_lev, sw_gas_props,  nday, idxday, fluxswUP_allsky, fluxswDOWN_allsky,         &
        fluxswUP_clrsky, fluxswDOWN_clrsky, hswc, topflx_sw, sfcflx_sw, flxprf_sw, hsw0,   &

diff --git a/physics/radlw_param.meta b/physics/radlw_param.meta
@@ -23,3 +23,9 @@
   units = DDT
   dimensions = ()
   type = sfcflw_type
+[proflw_type]
+  standard_name = proflw_type
+  long_name = definition of type proflw_type
+  units = DDT
+  dimensions = ()
+  type = proflw_type
diff --git a/physics/radsw_param.meta b/physics/radsw_param.meta
@@ -34,3 +34,9 @@
   units = DDT
   dimensions = ()
   type = cmpfsw_type
+[profsw_type]
+  standard_name = profsw_type
+  long_name = definition of type profsw_type
+  units = DDT
+  dimensions = ()
+  type = profsw_type
diff --git a/physics/rrtmgp_lw_cloud_optics.F90 b/physics/rrtmgp_lw_cloud_optics.F90
@@ -1,3 +1,5 @@
+!>\file rrtmgp_lw_cloud_optics.F90
+!! This file contains
 module rrtmgp_lw_cloud_optics
   use machine,                  only: kind_phys
   use GFS_typedefs,             only: GFS_control_type
@@ -15,7 +17,7 @@ module rrtmgp_lw_cloud_optics
   public rrtmgp_lw_cloud_optics_init, rrtmgp_lw_cloud_optics_run, rrtmgp_lw_cloud_optics_finalize
 contains
 
-!! \section arg_table_rrtmgp_lw_cloud_optics
+!! \section arg_table_rrtmgp_lw_cloud_optics_init
 !! \htmlinclude rrtmgp_lw_cloud_optics.html
 !!
   ! #########################################################################################
@@ -304,16 +306,16 @@ subroutine rrtmgp_lw_cloud_optics_init(Model, mpicomm, mpirank, mpiroot, lw_clou
   end subroutine rrtmgp_lw_cloud_optics_init
 
 
-!! \section arg_table_rrtmgp_lw_cloud_optics
-!! \html_include rrtmgp_lw_cloud_optics.html
+!! \section arg_table_rrtmgp_lw_cloud_optics_run
+!! \htmlinclude rrtmgp_lw_cloud_optics.html
 !!
   ! #########################################################################################
   ! SUBROUTINE rrtmgp_lw_cloud_optics_run()
   ! #########################################################################################
-  subroutine rrtmgp_lw_cloud_optics_run(Model, ncol, icseed_lw,cld_frac,       &
-       cld_lwp, cld_reliq, cld_iwp, cld_reice, cld_swp, cld_resnow, cld_rwp, cld_rerain,    &
-       aerosols, lw_cloud_props, lw_gas_props, ipsdlw0,                             &
-       optical_props_clouds, optical_props_aerosol, cldtaulw, errmsg, errflg)
+  subroutine rrtmgp_lw_cloud_optics_run(Model, ncol, ipsdlw0, icseed_lw, cld_frac, cld_lwp, &
+       cld_reliq, cld_iwp, cld_reice, cld_swp, cld_resnow, cld_rwp, cld_rerain,             &
+       lw_cloud_props, lw_gas_props,  aerosols,                                             &
+       cldtaulw, optical_props_clouds, optical_props_aerosol, errmsg, errflg)
 
     ! Inputs
     type(GFS_control_type), intent(in) :: &
@@ -342,10 +344,10 @@ subroutine rrtmgp_lw_cloud_optics_run(Model, ncol, icseed_lw,cld_frac,       &
          lw_gas_props
     real(kind_phys), intent(in),dimension(ncol, model%levs, lw_gas_props%get_nband(),3) :: &
          aerosols            !
-    real(kind_phys), dimension(ncol,Model%levs), intent(out) :: &
-         cldtaulw            ! approx 10.mu band layer cloud optical depth  
 
     ! Outputs
+    real(kind_phys), dimension(ncol,Model%levs), intent(out) :: &
+         cldtaulw            ! approx 10.mu band layer cloud optical depth  
     type(ty_optical_props_1scl),intent(out) :: &
          optical_props_clouds, & !
          optical_props_aerosol   !