Skip to content

CCPP metadata updates and bug fixes #133

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
dustinswales merged 2 commits into from
Aug 16, 2021
Merged

CCPP metadata updates and bug fixes #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5841ebb
Fix CCPP metadata in several files, convert from dos to unix line end…
climbfuji Aug 12, 2021
d995da9
Revert line endings change in rte/mo_optical_props.F90
climbfuji Aug 16, 2021
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
12 changes: 8 additions & 4 deletions extensions/cloud_optics/mo_cloud_optics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
! -------------------------------------------------------------------------------------------------

module mo_cloud_optics

!! \section arg_table_mo_cloud_optics
!! \htmlinclude mo_cloud_optics.html
!!

use mo_rte_kind, only: wp, wl
use mo_rte_config, only: check_values, check_extents
use mo_rte_util_array,only: any_vals_less_than, any_vals_outside, extents_are
Expand All @@ -33,11 +38,10 @@ module mo_cloud_optics
end interface pade_eval
private
! -----------------------------------------------------------------------------------
#if 0
!! \section arg_table_mo_cloud_optics
!! \htmlinclude mo_cloud_optics.html

!! \section arg_table_ty_cloud_optics Argument Table
!! \htmlinclude ty_cloud_optics.html
!!
#endif
type, extends(ty_optical_props), public :: ty_cloud_optics
private
!
Expand Down
11 changes: 11 additions & 0 deletions extensions/cloud_optics/mo_cloud_optics.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
[ccpp-table-properties]
name = ty_cloud_optics
type = ddt
dependencies =

[ccpp-arg-table]
name = ty_cloud_optics
type = ddt

########################################################################

[ccpp-table-properties]
name = mo_cloud_optics
type = module
Expand Down
9 changes: 7 additions & 2 deletions rrtmgp/mo_gas_concentrations.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
! -------------------------------------------------------------------------------------------------

module mo_gas_concentrations

!! \section arg_table_mo_gas_concentrations Argument Table
!! \htmlinclude mo_gas_concentrations.html
!!

use mo_rte_kind, only: wp
use mo_rte_config, only: check_values
use mo_rrtmgp_util_string, only: lower_case
Expand All @@ -41,8 +46,8 @@ module mo_gas_concentrations
real(wp), dimension(:,:), pointer :: conc => NULL()
end type conc_field

!! \section arg_table_mo_gas_concentrations
!! \htmlinclude mo_gas_concentrations.html
!! \section arg_table_ty_gas_concs Argument Table
!! \htmlinclude ty_gas_concs.html
!!
type, public :: ty_gas_concs
!
Expand Down
11 changes: 11 additions & 0 deletions rrtmgp/mo_gas_concentrations.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
[ccpp-table-properties]
name = ty_gas_concs
type = ddt
dependencies =

[ccpp-arg-table]
name = ty_gas_concs
type = ddt

########################################################################

[ccpp-table-properties]
name = mo_gas_concentrations
type = module
Expand Down
10 changes: 6 additions & 4 deletions rrtmgp/mo_gas_optics_rrtmgp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
!
! -------------------------------------------------------------------------------------------------
module mo_gas_optics_rrtmgp

!! \section arg_table_mo_gas_optics_rrtmgp Argument Table
!! \htmlinclude mo_gas_optics.html
!!
use mo_rte_kind, only: wp, wl
use mo_rte_config, only: check_extents, check_values
use mo_rte_util_array, only: zero_array, any_vals_less_than, any_vals_outside, extents_are
Expand All @@ -39,11 +43,9 @@ module mo_gas_optics_rrtmgp
private
real(wp), parameter :: pi = acos(-1._wp)

#if 0
!! \section arg_table_mo_gas_optics_rrtmgp
!! \htmlinclude mo_gas_optics.html
!! \section arg_table_ty_gas_optics_rrtmgp Argument Table
!! \htmlinclude ty_gas_optics_rrtmgp.html
!!
#endif
type, extends(ty_gas_optics), public :: ty_gas_optics_rrtmgp
private
!
Expand Down
14 changes: 13 additions & 1 deletion rrtmgp/mo_gas_optics_rrtmgp.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
[ccpp-table-properties]
name = ty_gas_optics_rrtmgp
type = ddt
dependencies =

[ccpp-arg-table]
name = ty_gas_optics_rrtmgp
type = ddt

########################################################################

[ccpp-table-properties]
name = mo_gas_optics_rrtmgp
type = module
Expand All @@ -7,9 +18,10 @@
[ccpp-arg-table]
name = mo_gas_optics_rrtmgp
type = module

[ty_gas_optics_rrtmgp]
standard_name = ty_gas_optics_rrtmgp
long_name = definition of type ty_gas_optics_rrtmgp
units = DDT
units = ddt
dimensions = ()
type = ty_gas_optics_rrtmgp
20 changes: 15 additions & 5 deletions rte/mo_optical_props.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
!
! -------------------------------------------------------------------------------------------------
module mo_optical_props

!! \section arg_table_mo_optical_props Argument Table
!! \htmlinclude mo_optical_props.html
!!

use mo_rte_kind, only: wp
use mo_rte_util_array, only: any_vals_less_than, any_vals_outside, extents_are
use mo_optical_props_kernels, only: &
Expand Down Expand Up @@ -158,13 +163,12 @@ end function subset_range_abstract
! phase function moments (index 1 = g) for use with discrete ordinate methods
!
! -------------------------------------------------------------------------------------------------

!! \section arg_table_mo_optical_props Argument Table
!! \htmlinclude mo_optical_props.html
!!

!! \section arg_table_ty_optical_props_1scl Argument Table
!! \htmlinclude ty_optical_props_1scl.html
!!
type, public, extends(ty_optical_props_arry) :: ty_optical_props_1scl

contains
procedure, public :: validate => validate_1scalar
procedure, public :: get_subset => subset_1scl_range
Expand All @@ -178,6 +182,9 @@ end function subset_range_abstract
end type

! --- 2 stream ------------------------------------------------------------------------
!! \section arg_table_ty_optical_props_2str Argument Table
!! \htmlinclude ty_optical_props_2str.html
!!
type, public, extends(ty_optical_props_arry) :: ty_optical_props_2str
real(wp), dimension(:,:,:), allocatable :: ssa ! single-scattering albedo (ncol, nlay, ngpt)
real(wp), dimension(:,:,:), allocatable :: g ! asymmetry parameter (ncol, nlay, ngpt)
Expand All @@ -194,6 +201,9 @@ end function subset_range_abstract
end type

! --- n stream ------------------------------------------------------------------------
!! \section arg_table_ty_optical_props_nstr Argument Table
!! \htmlinclude ty_optical_props_nstr.html
!!
type, public, extends(ty_optical_props_arry) :: ty_optical_props_nstr
real(wp), dimension(:,:,:), allocatable :: ssa ! single-scattering albedo (ncol, nlay, ngpt)
real(wp), dimension(:,:,:,:), allocatable :: p ! phase-function moments (nmom, ncol, nlay, ngpt)
Expand Down
33 changes: 33 additions & 0 deletions rte/mo_optical_props.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
[ccpp-table-properties]
name = ty_optical_props_1scl
type = ddt
dependencies =

[ccpp-arg-table]
name = ty_optical_props_1scl
type = ddt

########################################################################

[ccpp-table-properties]
name = ty_optical_props_2str
type = ddt
dependencies =

[ccpp-arg-table]
name = ty_optical_props_2str
type = ddt

########################################################################

[ccpp-table-properties]
name = ty_optical_props_nstr
type = ddt
dependencies =

[ccpp-arg-table]
name = ty_optical_props_nstr
type = ddt

########################################################################

[ccpp-table-properties]
name = mo_optical_props
type = module
Expand Down
9 changes: 7 additions & 2 deletions rte/mo_source_functions.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,17 @@
!
! -------------------------------------------------------------------------------------------------
module mo_source_functions

!! \section arg_table_mo_source_functions Argument Table
!! \htmlinclude mo_source_functions.html
!!

use mo_rte_kind, only: wp
use mo_optical_props, only: ty_optical_props
implicit none

!! \section arg_table_mo_source_functions Argument Table
!! \htmlinclude mo_source_functions.html
!! \section arg_table_ty_source_func_lw Argument Table
!! \htmlinclude ty_source_func_lw.html
!!
! -------------------------------------------------------------------------------------------------
!
Expand Down
11 changes: 11 additions & 0 deletions rte/mo_source_functions.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
[ccpp-table-properties]
name = ty_source_func_lw
type = ddt
dependencies =

[ccpp-arg-table]
name = ty_source_func_lw
type = ddt

########################################################################

[ccpp-table-properties]
name = mo_source_functions
type = module
Expand Down