Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions main/depend.common
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,7 @@ module_ra_rrtmg_lw.o: ../share/module_model_constants.o \
module_ra_clWRF_support.o
module_ra_rrtmg_lwf.o: ../share/module_model_constants.o \
module_ra_clWRF_support.o
module_ra_rrtmg_lwk.o: ../share/module_model_constants.o \
module_ra_clWRF_support.o

module_ra_rrtmg_lwk.o: ../share/module_model_constants.o


module_physics_addtendc.o: \
Expand Down
11 changes: 11 additions & 0 deletions phys/module_ra_rrtmg_sw.F
Original file line number Diff line number Diff line change
Expand Up @@ -9969,6 +9969,7 @@ SUBROUTINE RRTMG_SWRAD( &
obscur & ! amontornes-bcodina 2015/09 solar eclipses
)
!------------------------------------------------------------------
USE MODULE_RA_CLWRF_SUPPORT, ONLY : read_CAMgases
IMPLICIT NONE
!------------------------------------------------------------------
LOGICAL, INTENT(IN ) :: warm_rain
Expand Down Expand Up @@ -10251,6 +10252,10 @@ SUBROUTINE RRTMG_SWRAD( &
integer:: idx_rei
real:: corr

#ifdef CLWRFGHG
! Using data from CAMtr_volume_mixing_ratio data file
real(kind=8) :: co2, n2o, ch4, cfc11, cfc12
#else
! Set trace gas volume mixing ratios, 2005 values, IPCC (2007)
! carbon dioxide (379 ppmv) - this is being replaced by an annual function in v4.2
real :: co2
Expand All @@ -10261,6 +10266,7 @@ SUBROUTINE RRTMG_SWRAD( &
! nitrous oxide (319 ppbv)
real :: n2o
data n2o / 319.e-9 /
#endif
! Set oxygen volume mixing ratio (for o2mmr=0.23143)
real :: o2
data o2 / 0.209488 /
Expand Down Expand Up @@ -10350,6 +10356,11 @@ SUBROUTINE RRTMG_SWRAD( &

!-----CALCULATE SHORT WAVE RADIATION
!
#ifdef CLWRFGHG
! Read time-varying trace gases concentrations and interpolate them to run date
CALL read_CAMgases(yr,julian,"RRTMG",co2,n2o,ch4,cfc11,cfc12)
#endif

! All fields are ordered vertically from bottom to top
! Pressures are in mb

Expand Down
10 changes: 10 additions & 0 deletions phys/module_ra_rrtmg_swf.F
Original file line number Diff line number Diff line change
Expand Up @@ -11259,6 +11259,7 @@ SUBROUTINE RRTMG_SWRAD_FAST( &
xcoszen,yr,julian & ! jararias 2013/08
)
!------------------------------------------------------------------
USE MODULE_RA_CLWRF_SUPPORT, ONLY : read_CAMgases
IMPLICIT NONE
!------------------------------------------------------------------
LOGICAL, INTENT(IN ) :: warm_rain
Expand Down Expand Up @@ -11523,6 +11524,9 @@ SUBROUTINE RRTMG_SWRAD_FAST( &
integer:: idx_rei
real:: corr

#ifdef CLWRFGHG
real(kind=8) :: co2, n2o, ch4, cfc11, cfc12
#else
! Set trace gas volume mixing ratios, 2005 values, IPCC (2007)
! carbon dioxide (379 ppmv) - this is being replaced by an annual function in v4.2
real :: co2
Expand All @@ -11533,6 +11537,7 @@ SUBROUTINE RRTMG_SWRAD_FAST( &
! nitrous oxide (319 ppbv)
real :: n2o
data n2o / 319.e-9 /
#endif
! Set oxygen volume mixing ratio (for o2mmr=0.23143)
real :: o2
data o2 / 0.209488 /
Expand Down Expand Up @@ -11643,6 +11648,11 @@ SUBROUTINE RRTMG_SWRAD_FAST( &
!
! All fields are ordered vertically from bottom to top
! Pressures are in mb
!
#ifdef CLWRFGHG
! Read time-varying trace gases concentrations and interpolate them to run date.
CALL read_CAMgases(yr,julian,"RRTMG",co2,n2o,ch4,cfc11,cfc12)
#endif

! jararias, 14/08/2013
if (present(xcoszen)) then
Expand Down