Skip to content

Commit

Permalink
Added _type to all instances of ty_gas_optics_rrtmgp
Browse files Browse the repository at this point in the history
  • Loading branch information
@dustinswales
dustinswales committed May 8, 2019
1 parent 81f256d commit 232545f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
26 changes: 13 additions & 13 deletions physics/GFS_rrtmgp_lw.F90
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! ###########################################################################################
! ###########################################################################################
module GFS_rrtmgp_lw
use mo_gas_optics_rrtmgp, only: ty_gas_optics_rrtmgp
use mo_gas_optics_rrtmgp, only: ty_gas_optics_rrtmgp_type
use mo_gas_concentrations, only: ty_gas_concs
use mo_fluxes, only: ty_fluxes_broadband
use mo_fluxes_byband, only: ty_fluxes_byband
Expand Down Expand Up @@ -67,15 +67,15 @@ module GFS_rrtmgp_lw
! GFS_rrtmgp_lw_init
! #########################################################################################
!! \section arg_table_GFS_rrtmgp_lw_init Argument Table
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
!! |-----------------|------------------------------------------|--------------------------------------------------------------------|-------|------|----------------------|-----------|--------|----------|
!! | Model | GFS_control_type_instance | Fortran DDT containing FV3-GFS model control parameters | DDT | 0 | GFS_control_type | | in | F |
!! | mpirank | mpi_rank | current MPI rank | index | 0 | integer | | in | F |
!! | mpiroot | mpi_root | master MPI rank | index | 0 | integer | | in | F |
!! | mpicomm | mpi_comm | MPI communicator | index | 0 | integer | | in | F |
!! | errmsg | ccpp_error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
!! | errflg | ccpp_error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
!! | kdist_lw | K_distribution_file_for_RRTMGP_LW_scheme | DDT containing spectral information for RRTMGP LW radiation scheme | DDT | 0 | ty_gas_optics_rrtmgp | | inout | F |
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
!! |-----------------|------------------------------------------|--------------------------------------------------------------------|-------|------|---------------------------|-----------|--------|----------|
!! | Model | GFS_control_type_instance | Fortran DDT containing FV3-GFS model control parameters | DDT | 0 | GFS_control_type | | in | F |
!! | mpirank | mpi_rank | current MPI rank | index | 0 | integer | | in | F |
!! | mpiroot | mpi_root | master MPI rank | index | 0 | integer | | in | F |
!! | mpicomm | mpi_comm | MPI communicator | index | 0 | integer | | in | F |
!! | errmsg | ccpp_error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
!! | errflg | ccpp_error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
!! | kdist_lw | K_distribution_file_for_RRTMGP_LW_scheme | DDT containing spectral information for RRTMGP LW radiation scheme | DDT | 0 | ty_gas_optics_rrtmgp_type | | inout | F |
!!
! #########################################################################################
subroutine GFS_rrtmgp_lw_init(Model,mpicomm, mpirank, mpiroot, kdist_lw, errmsg, errflg)
Expand All @@ -92,7 +92,7 @@ subroutine GFS_rrtmgp_lw_init(Model,mpicomm, mpirank, mpiroot, kdist_lw, errmsg,
mpicomm, & ! MPI communicator
mpirank, & ! Current MPI rank
mpiroot ! Master MPI rank
type(ty_gas_optics_rrtmgp),intent(inout) :: &
type(ty_gas_optics_rrtmgp_type),intent(inout) :: &
kdist_lw
! Outputs
character(len=*), intent(out) :: &
Expand Down Expand Up @@ -773,7 +773,7 @@ end subroutine GFS_rrtmgp_lw_init
!! | cld_od | cloud_optical_depth | cloud optical depth | none | 2 | real | kind_phys | in | T |
!! | errmsg | ccpp_error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
!! | errflg | ccpp_error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
!! | kdist_lw | K_distribution_file_for_RRTMGP_LW_scheme | DDT containing spectral information for RRTMGP LW radiation scheme | DDT | 0 | ty_gas_optics_rrtmgp | | in | F |
!! | kdist_lw | K_distribution_file_for_RRTMGP_LW_scheme | DDT containing spectral information for RRTMGP LW radiation scheme | DDT | 0 | ty_gas_optics_rrtmgp_type | | in | F |
!!
! #########################################################################################
subroutine GFS_rrtmgp_lw_run(p_lay, p_lev, t_lay, t_lev, q_lay, o3_lay, vmr_co2, vmr_n2o, & ! IN
Expand All @@ -797,7 +797,7 @@ subroutine GFS_rrtmgp_lw_run(p_lay, p_lev, t_lay, t_lev, q_lay, o3_lay, vmr_co2,
logical,intent(in) :: &
lprint, & ! Control flag for diagnostics
lslwr ! Flag to calculate RRTMGP LW? (1)
type(ty_gas_optics_rrtmgp),intent(in) :: &
type(ty_gas_optics_rrtmgp_type),intent(in) :: &
kdist_lw ! DDT containing LW spectral information
real(kind_phys), dimension(ncol), intent(in) :: &
sfc_emiss, & ! Surface emissivity (1)
Expand Down
6 changes: 3 additions & 3 deletions physics/GFS_rrtmgp_pre.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ end subroutine GFS_rrtmgp_pre_init
!! | alb1d | surface_albedo_perturbation | surface albedo perturbation | frac | 1 | real | kind_phys | out | F |
!! | errmsg | ccpp_error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
!! | errflg | ccpp_error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
!! | kdist_lw | K_distribution_file_for_RRTMGP_LW_scheme | DDT containing spectral information for RRTMGP LW radiation scheme | DDT | 0 | ty_gas_optics_rrtmgp | | in | F |
!! | kdist_lw | K_distribution_file_for_RRTMGP_LW_scheme | DDT containing spectral information for RRTMGP LW radiation scheme | DDT | 0 | ty_gas_optics_rrtmgp_type | | in | F |
!!
! Attention - the output arguments lm, im, lmk, lmp must not be set
! in the CCPP version - they are defined in the interstitial_create routine
Expand Down Expand Up @@ -139,7 +139,7 @@ subroutine GFS_rrtmgp_pre_run (Model, Grid, Sfcprop, Statein, Tbd, Cldprop, Coup
use surface_perturbation, only: &
cdfnor ! Routine to compute CDF (used to compute percentiles)
! RRTMGP stuff
use mo_gas_optics_rrtmgp, only: ty_gas_optics_rrtmgp
use mo_gas_optics_rrtmgp, only: ty_gas_optics_rrtmgp_type
use GFS_rrtmgp_lw, only: &
nBandsLW!, & ! Number of LW bands in RRTMGP
!kdist_lw ! DDT contining LW spectral information
Expand All @@ -158,7 +158,7 @@ subroutine GFS_rrtmgp_pre_run (Model, Grid, Sfcprop, Statein, Tbd, Cldprop, Coup
type(GFS_cldprop_type), intent(in) :: Cldprop
type(GFS_coupling_type), intent(in) :: Coupling
integer, intent(in) :: im, lm, lmk, lmp
type(ty_gas_optics_rrtmgp),intent(in) :: kdist_lw
type(ty_gas_optics_rrtmgp_type),intent(in) :: kdist_lw

! Outputs
integer, intent(out) :: kd, kt, kb
Expand Down

0 comments on commit 232545f

Please sign in to comment.