Skip to content

Changes to SCM for RRTMGP - updates for @grantfirl's PR #3

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
grantfirl merged 2 commits into from
Mar 26, 2020
Merged

Changes to SCM for RRTMGP - updates for @grantfirl's PR #3

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
2824804
Update submodule pointers for ccpp-framework and ccpp-physics
climbfuji Mar 26, 2020
c09db8d
Change logic on how/where kind and type definitions are compiled
climbfuji Mar 26, 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: 2 additions & 0 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
'ccpp/physics/physics/radsw_param.f',
'ccpp/physics/physics/radlw_param.f',
'scm/src/GFS_typedefs.F90',
'scm/src/gmtb_scm_kinds.F90',
'scm/src/gmtb_scm_type_defs.F90',
'scm/src/gmtb_scm_physical_constants.F90',
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
Expand Down Expand Up @@ -199,6 +200,7 @@
# derived data type definitions
'scm/src/GFS_typedefs.F90',
'scm/src/gmtb_scm_kinds.F90',
'scm/src/gmtb_scm_physical_constants.F90',
'scm/src/gmtb_scm_type_defs.F90',
]

Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Open in desktop
Submodule framework updated 0 files
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 9 files
+1 −1 physics/GFS_rrtmgp_pre.F90
+9 −8 physics/GFS_rrtmgp_setup.F90
+1 −1 physics/GFS_rrtmgp_sw_post.F90
+0 −10 physics/rrtmgp_aux.F90
+2 −2 physics/rrtmgp_lw_cloud_sampling.F90
+2 −2 physics/rrtmgp_lw_gas_optics.F90
+1 −1 physics/rrtmgp_lw_pre.F90
+1 −1 physics/rrtmgp_lw_rte.F90
+1 −1 physics/rrtmgp_sw_aerosol_optics.F90
3 changes: 0 additions & 3 deletions scm/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,6 @@ SET(scm_source_files gmtb_scm.F90
gmtb_scm_forcing.F90
gmtb_scm_time_integration.F90
gmtb_scm_output.F90
gmtb_scm_kinds.F90
gmtb_scm_physical_constants.F90
gmtb_scm_type_defs.F90
)

if(STATIC)
Expand Down
8 changes: 6 additions & 2 deletions scm/src/gmtb_scm_kinds.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@

module gmtb_scm_kinds

!! \section arg_table_gmtb_scm_kinds
!! \htmlinclude gmtb_scm_kinds.html
!!

integer, parameter :: sp = selected_real_kind(P= 6,R=37)
integer, parameter :: dp = selected_real_kind(P=13,R=300)
integer, parameter :: qp = selected_real_kind(P=27,R=2400)
integer, parameter :: dp = selected_real_kind(P=13,R=300)
integer, parameter :: qp = selected_real_kind(P=27,R=2400)

end module gmtb_scm_kinds
21 changes: 21 additions & 0 deletions scm/src/gmtb_scm_kinds.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[ccpp-arg-table]
name = gmtb_scm_kinds
type = module
[kind_sp]
standard_name = kind_sp
long_name = definition of kind_sp
units = none
dimensions = ()
type = integer
[kind_dp]
standard_name = kind_dp
long_name = definition of kind_dp
units = none
dimensions = ()
type = integer
[kind_qp]
standard_name = kind_qp
long_name = definition of kind_qp
units = none
dimensions = ()
type = integer