Skip to content
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

GitFlow: Merge develop into main for 1.8 release #37

Merged
merged 3 commits into from
Mar 1, 2024
Merged

GitFlow: Merge develop into main for 1.8 release #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26d338c
pmn: first draft of RRTMGPv1.7 adaptation
dr0cloud Feb 27, 2024
43e9961
pmn: minor change to RRTMGP data file specs and defaults
dr0cloud Feb 27, 2024
80eee69
Merge pull request #36 from GEOS-ESM/feature/pnorris/RRTMGP_v1.7
mathomp4 Mar 1, 2024
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
45 changes: 26 additions & 19 deletions GEOS_RadiationShared/RRTMGP_cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,34 @@ esma_set_this (OVERRIDE RRTMGP)

# These are from RRTMGP
set (RRTMGP_SRCS
rte/mo_rte_kind.F90
rte/mo_rte_config.F90
rte/mo_rte_util_array.F90
rte/kernels/mo_rte_solver_kernels.F90
rte/kernels/mo_optical_props_kernels.F90
rte/kernels/mo_fluxes_broadband_kernels.F90
rte/mo_optical_props.F90
rte/mo_source_functions.F90
rte/mo_fluxes.F90
rrtmgp/mo_rrtmgp_constants.F90
rrtmgp/mo_rrtmgp_util_string.F90
rrtmgp/mo_gas_optics.F90
rrtmgp/mo_gas_optics_rrtmgp.F90
rrtmgp/mo_gas_concentrations.F90
rrtmgp/kernels/mo_gas_optics_kernels.F90
rte-frontend/mo_rte_kind.F90
rte-frontend/mo_rte_config.F90
rte-frontend/mo_rte_util_array_validation.F90
rte-kernels/mo_rte_util_array.F90
rte-kernels/mo_rte_solver_kernels.F90
rte-kernels/mo_optical_props_kernels.F90
rte-kernels/mo_fluxes_broadband_kernels.F90
rte-frontend/mo_optical_props.F90
rte-frontend/mo_source_functions.F90
rte-frontend/mo_fluxes.F90
rte-frontend/mo_rte_lw.F90
rte-frontend/mo_rte_sw.F90
gas-optics/mo_gas_optics_constants.F90
gas-optics/mo_gas_optics_util_string.F90
gas-optics/mo_gas_concentrations.F90
gas-optics/mo_gas_optics.F90
rrtmgp-kernels/mo_gas_optics_rrtmgp_kernels.F90
rrtmgp-frontend/mo_gas_optics_rrtmgp.F90
rrtmgp-frontend/mo_cloud_optics_rrtmgp.F90
extensions/mo_compute_bc.F90
extensions/mo_fluxes_byband.F90
extensions/mo_fluxes_bygpoint.F90
extensions/mo_heating_rates.F90
extensions/mo_rrtmgp_clr_all_sky.F90
extensions/cloud_optics/mo_cloud_optics.F90
extensions/cloud_optics/mo_cloud_sampling.F90
extensions/mo_cloud_sampling.F90
examples/mo_simple_netcdf.F90
examples/mo_load_coefficients.F90
examples/all-sky/mo_load_cloud_coefficients.F90
rte/mo_rte_lw.F90
rte/mo_rte_sw.F90
)

esma_mepo_style(RRTMGP RRTMGP_rel_path REL_PATH ..)
Expand Down Expand Up @@ -77,3 +78,9 @@ if (MKL_FOUND)
endif()

set_target_properties (${this} PROPERTIES Fortran_MODULE_DIRECTORY ${include_${this}})

# Option to enable RRTMGP single-precision
option(RRTMGP_SINGLE_PRECISION "Use single precision for RRTMGP" OFF)
if (RRTMGP_SINGLE_PRECISION)
target_compile_definitions(${this} PRIVATE RTE_USE_SP)
endif()
12 changes: 6 additions & 6 deletions GEOSirrad_GridComp/GEOS_IrradGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
! RRTMGP module uses
use mo_rte_kind, only: wp
use mo_gas_concentrations, only: ty_gas_concs
use mo_cloud_optics, only: ty_cloud_optics
use mo_cloud_optics_rrtmgp, only: ty_cloud_optics_rrtmgp
use mo_cloud_sampling, only: draw_samples, &
sampled_mask_max_ran, sampled_mask_exp_ran, &
sampled_urand_gen_max_ran
Expand Down Expand Up @@ -1403,7 +1403,7 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
! derived types for interacting with RRTMGP
type(ty_gas_optics_rrtmgp), pointer :: k_dist
type(ty_gas_concs) :: gas_concs, gas_concs_block
type(ty_cloud_optics) :: cloud_optics
type(ty_cloud_optics_rrtmgp) :: cloud_optics
type(ty_source_func_lw) :: sources
type(ty_fluxes_broadband) :: fluxes_clrsky, fluxes_clrnoa, &
fluxes_allsky, fluxes_allnoa
Expand Down Expand Up @@ -1861,8 +1861,8 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)

! initialize k-distribution if not already done
call MAPL_GetResource( &
MAPL, k_dist_file, "RRTMGP_DATA_LW:", &
DEFAULT='rrtmgp-data-lw.nc',__RC__)
MAPL, k_dist_file, "RRTMGP_GAS_LW:", &
DEFAULT='rrtmgp-gas-lw-g128.nc',__RC__)
if (.not. rrtmgp_state%initialized) then
! gas_concs needed only to access required gas names
call MAPL_TimerOn(MAPL,"---RRTMGP_IO_GAS",__RC__)
Expand Down Expand Up @@ -2171,8 +2171,8 @@ subroutine LW_Driver(IM,JM,LM,LATS,LONS,RC)
! gets appropriate coefficients needed to calculate
! cloud optical properties from cloud physical properties
call MAPL_GetResource( &
MAPL, cloud_optics_file, "RRTMGP_CLOUD_OPTICS_COEFFS_LW:", &
DEFAULT='rrtmgp-cloud-optics-coeffs-lw.nc', __RC__)
MAPL, cloud_optics_file, "RRTMGP_CLOUD_OPTICS_LW:", &
DEFAULT='rrtmgp-clouds-lw.nc', __RC__)
call MAPL_GetResource( &
MAPL, cloud_optics_type, "RRTMGP_CLOUD_OPTICS_TYPE_LW:", &
DEFAULT='LUT', __RC__)
Expand Down
12 changes: 6 additions & 6 deletions GEOSsolar_GridComp/GEOS_SolarGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3288,7 +3288,7 @@ subroutine SORADCORE(IM,JM,LM,include_aerosols,CURRTIME,MaxPasses,LoadBalance,RC
! RRTMGP module uses
use mo_rte_kind, only: wp
use mo_gas_concentrations, only: ty_gas_concs
use mo_cloud_optics, only: ty_cloud_optics
use mo_cloud_optics_rrtmgp, only: ty_cloud_optics_rrtmgp
use mo_cloud_sampling, only: draw_samples, &
sampled_mask_max_ran, sampled_mask_exp_ran, &
sampled_urand_gen_max_ran
Expand Down Expand Up @@ -3478,7 +3478,7 @@ subroutine SORADCORE(IM,JM,LM,include_aerosols,CURRTIME,MaxPasses,LoadBalance,RC
! coefficients and cloud physical properties)
type(ty_gas_optics_rrtmgp), pointer :: k_dist
type(ty_gas_concs) :: gas_concs, gas_concs_block
type(ty_cloud_optics) :: cloud_optics
type(ty_cloud_optics_rrtmgp) :: cloud_optics
type(ty_fluxes_byband) :: fluxes_clrsky, fluxes_allsky

! PMN: my earlier RRTMGP implementations used cloud_props for liq and ice combined,
Expand Down Expand Up @@ -4578,8 +4578,8 @@ subroutine SORADCORE(IM,JM,LM,include_aerosols,CURRTIME,MaxPasses,LoadBalance,RC

! initialize k-distribution if not already done
call MAPL_GetResource( &
MAPL, k_dist_file, "RRTMGP_DATA_SW:", &
DEFAULT='rrtmgp-data-sw.nc',__RC__)
MAPL, k_dist_file, "RRTMGP_GAS_SW:", &
DEFAULT='rrtmgp-gas-sw-g112.nc',__RC__)
if (.not. rrtmgp_state%initialized) then
! gas_concs needed only to access required gas names
call MAPL_TimerOn(MAPL,"--RRTMGP_IO_GAS",__RC__)
Expand Down Expand Up @@ -4773,8 +4773,8 @@ subroutine SORADCORE(IM,JM,LM,include_aerosols,CURRTIME,MaxPasses,LoadBalance,RC
! gets appropriate coefficients needed to calculate
! cloud optical properties from cloud physical properties
call MAPL_GetResource( &
MAPL, cloud_optics_file, "RRTMGP_CLOUD_OPTICS_COEFFS_SW:", &
DEFAULT='rrtmgp-cloud-optics-coeffs-reordered-sw.nc', __RC__)
MAPL, cloud_optics_file, "RRTMGP_CLOUD_OPTICS_SW:", &
DEFAULT='rrtmgp-clouds-sw.nc', __RC__)
call MAPL_GetResource( &
MAPL, cloud_optics_type, "RRTMGP_CLOUD_OPTICS_TYPE_SW:", &
DEFAULT='LUT', __RC__)
Expand Down
Loading