Skip to content

Commit

Permalink
Update rte-rrtmgp hash, and switch to develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@dustinswales
dustinswales committed Oct 30, 2023
1 parent cf0fa79 commit fbac1dc
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "physics/rte-rrtmgp"]
path = physics/rte-rrtmgp
url = https://github.com/earth-system-radiation/rte-rrtmgp
branch = main
branch = develop
38 changes: 19 additions & 19 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,31 +79,31 @@ get_filename_component(LOCAL_CURRENT_SOURCE_DIR ${FULL_PATH_TO_CMAKELISTS} DIREC
#------------------------------------------------------------------------------

# List of files that need to be compiled without OpenMP
set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_optics.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_constants.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_string.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90
set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/gas-optics/mo_gas_optics.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/gas-optics/mo_gas_optics_constants.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/gas-optics/mo_gas_concentrations.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/gas-optics/mo_gas_optics_util_string.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp-kernels/mo_gas_optics_rrtmgp_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp-frontend/mo_gas_optics_rrtmgp.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp-frontend/mo_cloud_optics_rrtmgp.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_fluxes_byband.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/solar_variability/mo_solar_variability.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_heating_rates.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_fluxes_bygpoint.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_compute_bc.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_config.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_source_functions.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_sw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_fluxes.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_lw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_util_array.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_kind.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_optical_props.F90)
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_cloud_sampling.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-frontend/mo_rte_config.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-frontend/mo_source_functions.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-frontend/mo_rte_sw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-frontend/mo_fluxes.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-frontend/mo_rte_lw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-kernels/mo_rte_util_array.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-kernels/mo_rte_solver_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-kernels/mo_optical_props_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-kernels/mo_fluxes_broadband_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-frontend/mo_rte_kind.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte-frontend/mo_optical_props.F90)

# List of files that need to be compiled with different precision
set(SCHEMES_DYNAMICS)
Expand Down
3 changes: 2 additions & 1 deletion physics/GFS_rrtmgp_post.meta
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[ccpp-table-properties]
name = GFS_rrtmgp_post
type = scheme
dependencies = iounitdef.f,machine.F,radiation_aerosols.f,radlw_param.f,radiation_tools.F90,rte-rrtmgp/extensions/mo_heating_rates.F90
dependencies = iounitdef.f,machine.F,radiation_aerosols.f,radlw_param.f,radiation_tools.F90
dependencies = rte-rrtmgp/rte-frontend/mo_rte_util_array_validation.F90

########################################################################
[ccpp-arg-table]
Expand Down
1 change: 0 additions & 1 deletion physics/GFS_rrtmgp_pre.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module GFS_rrtmgp_pre
use funcphys, only: fpvs
use module_radiation_astronomy, only: coszmn
use module_radiation_gases, only: NF_VGAS, getgases, getozn
use mo_gas_concentrations, only: ty_gas_concs
use radiation_tools, only: check_error_msg,cmp_tlev
use rrtmgp_lw_gas_optics, only: lw_gas_props

Expand Down
9 changes: 4 additions & 5 deletions physics/rrtmgp_lw_cloud_optics.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
module rrtmgp_lw_cloud_optics
use machine, only: kind_phys
use mo_rte_kind, only: wl
use mo_cloud_optics, only: ty_cloud_optics
use mo_cloud_optics_rrtmgp, only: ty_cloud_optics_rrtmgp
use rrtmgp_lw_gas_optics, only: lw_gas_props
use radiation_tools, only: check_error_msg
use netcdf
Expand All @@ -21,7 +21,7 @@ module rrtmgp_lw_cloud_optics

implicit none

type(ty_cloud_optics) :: lw_cloud_props
type(ty_cloud_optics_rrtmgp) :: lw_cloud_props
integer :: &
nrghice_fromfileLW, nBandLW, nSize_liqLW, nSize_iceLW, nSizeRegLW, &
nCoeff_extLW, nCoeff_ssa_gLW, nBoundLW, npairsLW
Expand Down Expand Up @@ -360,9 +360,8 @@ subroutine rrtmgp_lw_cloud_optics_init(rrtmgp_root_dir, rrtmgp_lw_file_clouds,
! #######################################################################################
if (doGP_cldoptics_LUT) then
call check_error_msg('lw_cloud_optics_init',lw_cloud_props%load(band_limsCLDLW, &
radliq_lwrLW, radliq_uprLW, radliq_facLW, radice_lwrLW, radice_uprLW, &
radice_facLW, lut_extliqLW, lut_ssaliqLW, lut_asyliqLW, lut_exticeLW, &
lut_ssaiceLW, lut_asyiceLW))
radliq_lwrLW, radliq_uprLW, radice_lwrLW, radice_uprLW, lut_extliqLW, &
lut_ssaliqLW, lut_asyliqLW, lut_exticeLW, lut_ssaiceLW, lut_asyiceLW))
endif

if (doGP_cldoptics_PADE) then
Expand Down
4 changes: 1 addition & 3 deletions physics/rrtmgp_lw_main.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
module rrtmgp_lw_main
use machine, only: kind_phys, kind_dbl_prec
use mo_optical_props, only: ty_optical_props_1scl, ty_optical_props_2str
use mo_cloud_optics, only: ty_cloud_optics
use mo_rte_lw, only: rte_lw
use mo_gas_optics_rrtmgp, only: ty_gas_optics_rrtmgp
use mo_gas_concentrations, only: ty_gas_concs
use mo_fluxes_byband, only: ty_fluxes_byband
use mo_source_functions, only: ty_source_func_lw
Expand Down Expand Up @@ -39,7 +37,7 @@ module rrtmgp_lw_main
! #########################################################################################
subroutine rrtmgp_lw_main_init(rrtmgp_root_dir, rrtmgp_lw_file_gas, rrtmgp_lw_file_clouds,&
active_gases_array, doGP_cldoptics_PADE, doGP_cldoptics_LUT, nrghice, mpicomm, &
mpirank, mpiroot, nLay, errmsg, errflg)
mpirank, mpiroot, errmsg, errflg)

! Inputs
character(len=128),intent(in) :: &
Expand Down
18 changes: 11 additions & 7 deletions physics/rrtmgp_lw_main.meta
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
[ccpp-table-properties]
name = rrtmgp_lw_main
type = scheme
dependencies = machine.F,radiation_tools.F90
dependencies = rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90
dependencies = rte-rrtmgp/rte/mo_rte_kind.F90,rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90,rte-rrtmgp/rte/mo_optical_props.F90
dependencies = rte-rrtmgp/rte/mo_source_functions.F90,rte-rrtmgp/rte/mo_rte_lw.F90,rte-rrtmgp/rte/mo_fluxes.F90
dependencies = rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90, rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90
dependencies = mersenne_twister.f,rrtmgp_sampling.F90,rte-rrtmgp/extensions/mo_fluxes_byband.F90
dependencies = rrtmgp_lw_gas_optics.F90, rrtmgp_lw_cloud_optics.F90
dependencies = machine.F,radiation_tools.F90,mersenne_twister.f,rrtmgp_sampling.F90
dependencies = rrtmgp_lw_gas_optics.F90,rrtmgp_lw_cloud_optics.F90
dependencies = rte-rrtmgp/rte-frontend/mo_rte_kind.F90
dependencies = rte-rrtmgp/rte-frontend/mo_optical_props.F90
dependencies = rte-rrtmgp/rte-frontend/mo_source_functions.F90
dependencies = rte-rrtmgp/rte-frontend/mo_rte_lw.F90
dependencies = rte-rrtmgp/rte-frontend/mo_fluxes.F90
dependencies = rte-rrtmgp/gas-optics/mo_gas_concentrations.F90
dependencies = rte-rrtmgp/rte-kernels/mo_fluxes_broadband_kernels.F90
dependencies = rte-rrtmgp/rte-kernels/mo_rte_solver_kernels.F90
dependencies = rte-rrtmgp/extensions/mo_fluxes_byband.F90

########################################################################
[ccpp-arg-table]
Expand Down
9 changes: 4 additions & 5 deletions physics/rrtmgp_sw_cloud_optics.F90
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module rrtmgp_sw_cloud_optics
use machine, only: kind_phys
use mo_rte_kind, only: wl
use mo_cloud_optics, only: ty_cloud_optics
use mo_cloud_optics_rrtmgp, only: ty_cloud_optics_rrtmgp
use rrtmgp_sw_gas_optics, only: sw_gas_props
use radiation_tools, only: check_error_msg
use netcdf
Expand All @@ -11,7 +11,7 @@ module rrtmgp_sw_cloud_optics

implicit none

type(ty_cloud_optics) :: sw_cloud_props
type(ty_cloud_optics_rrtmgp) :: sw_cloud_props
integer :: &
nrghice_fromfileSW, nBandSW, nSize_liqSW, nSize_iceSW, nSizeregSW, &
nCoeff_extSW, nCoeff_ssa_gSW, nBoundSW, nPairsSW
Expand Down Expand Up @@ -349,9 +349,8 @@ subroutine rrtmgp_sw_cloud_optics_init( rrtmgp_root_dir, rrtmgp_sw_file_clouds,
! #######################################################################################
if (doGP_cldoptics_LUT) then
call check_error_msg('sw_cloud_optics_init',sw_cloud_props%load(band_limsCLDSW, &
radliq_lwrSW, radliq_uprSW, radliq_facSW, radice_lwrSW, radice_uprSW, &
radice_facSW, lut_extliqSW, lut_ssaliqSW, lut_asyliqSW, lut_exticeSW, &
lut_ssaiceSW, lut_asyiceSW))
radliq_lwrSW, radliq_uprSW, radice_lwrSW, radice_uprSW, lut_extliqSW, &
lut_ssaliqSW, lut_asyliqSW, lut_exticeSW, lut_ssaiceSW, lut_asyiceSW))
endif

if (doGP_cldoptics_PADE) then
Expand Down
2 changes: 0 additions & 2 deletions physics/rrtmgp_sw_main.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
module rrtmgp_sw_main
use machine, only: kind_phys, kind_dbl_prec
use mo_optical_props, only: ty_optical_props_2str
use mo_cloud_optics, only: ty_cloud_optics
use module_radsw_parameters, only: cmpfsw_type
use mo_rte_sw, only: rte_sw
use mo_gas_optics_rrtmgp, only: ty_gas_optics_rrtmgp
use mo_gas_concentrations, only: ty_gas_concs
use mo_fluxes_byband, only: ty_fluxes_byband
use radiation_tools, only: check_error_msg
Expand Down
18 changes: 11 additions & 7 deletions physics/rrtmgp_sw_main.meta
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
[ccpp-table-properties]
name = rrtmgp_sw_main
type = scheme
dependencies = machine.F,radiation_tools.F90,
dependencies = rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90
dependencies = rte-rrtmgp/rte/mo_rte_kind.F90,rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90,rte-rrtmgp/rte/mo_optical_props.F90
dependencies = rte-rrtmgp/rte/mo_rte_sw.F90,rte-rrtmgp/rte/mo_fluxes.F90
dependencies = rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90, rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90
dependencies = mersenne_twister.f,rrtmgp_sampling.F90,rte-rrtmgp/extensions/mo_fluxes_byband.F90
dependencies = rrtmgp_sw_gas_optics.F90, rrtmgp_sw_cloud_optics.F90
dependencies = machine.F,radiation_tools.F90,mersenne_twister.f,rrtmgp_sampling.F90
dependencies = rrtmgp_sw_gas_optics.F90,rrtmgp_sw_cloud_optics.F90
dependencies = rte-rrtmgp/rte-frontend/mo_rte_kind.F90
dependencies = rte-rrtmgp/rte-frontend/mo_optical_props.F90
dependencies = rte-rrtmgp/rte-frontend/mo_source_functions.F90
dependencies = rte-rrtmgp/rte-frontend/mo_rte_sw.F90
dependencies = rte-rrtmgp/rte-frontend/mo_fluxes.F90
dependencies = rte-rrtmgp/gas-optics/mo_gas_concentrations.F90
dependencies = rte-rrtmgp/rte-kernels/mo_fluxes_broadband_kernels.F90
dependencies = rte-rrtmgp/rte-kernels/mo_rte_solver_kernels.F90
dependencies = rte-rrtmgp/extensions/mo_fluxes_byband.F90

########################################################################
[ccpp-arg-table]
Expand Down
2 changes: 1 addition & 1 deletion physics/rte-rrtmgp
Submodule rte-rrtmgp updated 89 files
+8 −0 .github/dependabot.yml
+101 −62 .github/workflows/containerized-ci.yml
+78 −120 .github/workflows/continuous-integration.yml
+43 −28 .github/workflows/doc-deployment.yml
+146 −0 .github/workflows/module_switcher
+99 −72 .github/workflows/self-hosted-ci.yml
+8 −2 Compiler-flags.md
+3 −3 Contributing.md
+6 −4 README.md
+22 −19 build/Makefile
+2 −4 doc/ford_site/rrtmgp-fortran-interface.md
+2 −1 doc/ford_site/rrtmgp-kernels.md
+1 −4 doc/ford_site/rte-fortran-interface.md
+2 −1 doc/ford_site/rte-kernels.md
+1 −1 doc/jekyll_site/how-tos/index.md
+4 −4 doc/jekyll_site/reference/index.md
+1 −1 doc/jekyll_site/tutorials/index.md
+11 −0 environment-noplots.yml
+1 −1 environment.yml
+17 −12 examples/all-sky/Makefile
+8 −0 examples/all-sky/all_tests.sh
+0 −77 examples/all-sky/compare-to-reference.py
+ − examples/all-sky/garand-atmos-1.nc
+64 −0 examples/all-sky/make_problem_size_loop.py
+357 −0 examples/all-sky/mo_load_aerosol_coefficients.F90
+6 −7 examples/all-sky/mo_load_cloud_coefficients.F90
+629 −206 examples/all-sky/rrtmgp_allsky.F90
+16 −23 examples/all-sky/run-allsky-example.py
+88 −0 examples/compare-to-reference.py
+4 −0 examples/mo_garand_atmos_io.F90
+13 −24 examples/rfmip-clear-sky/Makefile
+2 −1 examples/rfmip-clear-sky/Readme.md
+0 −115 examples/rfmip-clear-sky/compare-to-reference.py
+1 −1 examples/rfmip-clear-sky/mo_rfmip_io.F90
+3 −44 examples/rfmip-clear-sky/rrtmgp_rfmip_lw.F90
+3 −41 examples/rfmip-clear-sky/rrtmgp_rfmip_sw.F90
+7 −6 examples/rfmip-clear-sky/run-rfmip-examples.py
+5 −11 examples/rfmip-clear-sky/stage_files.py
+5 −5 examples/rfmip-clear-sky/stage_files.sh
+ − extensions/cloud_optics/rrtmgp-cloud-optics-coeffs-lw.nc
+ − extensions/cloud_optics/rrtmgp-cloud-optics-coeffs-sw.nc
+0 −0 extensions/mo_cloud_sampling.F90
+2 −1 extensions/mo_compute_bc.F90
+2 −1 extensions/mo_fluxes_byband.F90
+2 −1 extensions/mo_fluxes_bygpoint.F90
+4 −2 extensions/mo_heating_rates.F90
+2 −1 extensions/mo_zenith_angle_spherical_correction.F90
+27 −8 gas-optics/mo_gas_concentrations.F90
+0 −0 gas-optics/mo_gas_optics.F90
+2 −2 gas-optics/mo_gas_optics_constants.F90
+1 −1 gas-optics/mo_gas_optics_util_string.F90
+40 −0 rrtmgp-frontend/Make.depends
+596 −0 rrtmgp-frontend/mo_aerosol_optics_rrtmgp_merra.F90
+23 −22 rrtmgp-frontend/mo_cloud_optics_rrtmgp.F90
+285 −177 rrtmgp-frontend/mo_gas_optics_rrtmgp.F90
+6 −0 rrtmgp-kernels/Make.depends
+20 −6 rrtmgp-kernels/accel/mo_gas_optics_rrtmgp_kernels.F90
+20 −51 rrtmgp-kernels/mo_gas_optics_rrtmgp_kernels.F90
+0 −40 rrtmgp/Make.depends
+0 −5 rrtmgp/data/README.md
+ − rrtmgp/data/rrtmgp-data-lw-g128-210809.nc
+ − rrtmgp/data/rrtmgp-data-lw-g256-2018-12-04.nc
+ − rrtmgp/data/rrtmgp-data-sw-g112-210809.nc
+ − rrtmgp/data/rrtmgp-data-sw-g224-2018-12-04.nc
+8 −17 rte-frontend/Make.depends
+1 −1 rte-frontend/mo_fluxes.F90
+2 −1 rte-frontend/mo_optical_props.F90
+0 −0 rte-frontend/mo_rte_config.F90
+0 −0 rte-frontend/mo_rte_kind.F90
+10 −4 rte-frontend/mo_rte_lw.F90
+3 −1 rte-frontend/mo_rte_sw.F90
+16 −91 rte-frontend/mo_rte_util_array_validation.F90
+0 −0 rte-frontend/mo_source_functions.F90
+27 −0 rte-kernels/Make.depends
+0 −0 rte-kernels/accel/mo_optical_props_kernels.F90
+12 −4 rte-kernels/accel/mo_rte_solver_kernels.F90
+0 −0 rte-kernels/mo_fluxes_broadband_kernels.F90
+0 −0 rte-kernels/mo_optical_props_kernels.F90
+13 −4 rte-kernels/mo_rte_solver_kernels.F90
+90 −0 rte-kernels/mo_rte_util_array.F90
+17 −13 tests/Makefile
+6 −0 tests/all_tests.sh
+745 −0 tests/check_equivalence.F90
+24 −309 tests/check_variants.F90
+3 −3 tests/intel-codecov.sh
+2 −1 tests/mo_rcemip_profiles.F90
+1 −1 tests/test_zenith_angle_spherical_correction.F90
+53 −21 tests/validation-plots.py
+0 −107 tests/verification.py

0 comments on commit fbac1dc

Please sign in to comment.