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

CI should fail when individual tests fail #256

Merged
merged 4 commits into from
Jan 25, 2024
Merged

CI should fail when individual tests fail #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac61080
Adjust tolerances as per Sergey's suggestions
RobertPincus Jan 23, 2024
db146d9
Revert syntax
RobertPincus Jan 23, 2024
876c36e
Shell scripts fail if component tests fail
RobertPincus Jan 23, 2024
8c40f66
Further tolerance adjustment
skosukhin Jan 25, 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
1 change: 1 addition & 0 deletions examples/all-sky/all_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
set -eux
./rrtmgp_allsky 24 72 1 rrtmgp-allsky-lw.nc \
${RRTMGP_DATA}/rrtmgp-gas-lw-g256.nc ${RRTMGP_DATA}/rrtmgp-clouds-lw.nc ${RRTMGP_DATA}/rrtmgp-aerosols-merra-lw.nc
./rrtmgp_allsky 24 72 1 rrtmgp-allsky-sw.nc \
Expand Down
1 change: 1 addition & 0 deletions tests/all_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
set -eux
./check_equivalence test_atmospheres.nc ${RRTMGP_DATA}/rrtmgp-gas-lw-g256.nc
./check_equivalence test_atmospheres.nc ${RRTMGP_DATA}/rrtmgp-gas-lw-g128.nc
./check_equivalence test_atmospheres.nc ${RRTMGP_DATA}/rrtmgp-gas-sw-g224.nc
Expand Down
20 changes: 10 additions & 10 deletions tests/check_equivalence.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ program rte_check_equivalence
! Orientation invariance
!
call lw_clear_sky_vr
if(.not. allclose(tst_flux_up, ref_flux_up) .or. &
.not. allclose(tst_flux_dn, ref_flux_dn) ) &
if(.not. allclose(tst_flux_up, ref_flux_up, tol=4._wp) .or. &
.not. allclose(tst_flux_dn, ref_flux_dn, tol=4._wp) ) &
call report_err(" Vertical invariance failure")
print *, " Vertical orientation invariance"
! -------------------------------------------------------
Expand Down Expand Up @@ -411,7 +411,7 @@ program rte_check_equivalence
! Threshold of 4x spacing() works on CPUs but 8x is needed for GPUs
!
call sw_clear_sky_tsi
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 8._wp) .or. &
if(.not. allclose(tst_flux_up, ref_flux_up, tol =10._wp) .or. &
.not. allclose(tst_flux_dn, ref_flux_dn, tol = 8._wp) .or. &
.not. allclose(tst_flux_dir,ref_flux_dir,tol = 8._wp)) &
call report_err(" Changing TSI fails")
Expand All @@ -432,17 +432,17 @@ program rte_check_equivalence
mu0, toa_flux, &
sfc_alb_dir, sfc_alb_dif, &
fluxes))
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 6._wp) .or. &
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 8._wp) .or. &
.not. allclose(tst_flux_dn, ref_flux_dn, tol = 6._wp) .or. &
.not. allclose(tst_flux_dir,ref_flux_dir,tol = 6._wp)) &
.not. allclose(tst_flux_dir,ref_flux_dir,tol = 8._wp)) &
call report_err(" halving/doubling fails")

call increment_with_1scl
call stop_on_err(rte_sw(atmos, top_at_1, &
mu0, toa_flux, &
sfc_alb_dir, sfc_alb_dif, &
fluxes))
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 6._wp) .or. &
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 8._wp) .or. &
.not. allclose(tst_flux_dn, ref_flux_dn, tol = 6._wp) .or. &
.not. allclose(tst_flux_dir,ref_flux_dir,tol = 6._wp)) &
call report_err(" Incrementing with 1scl fails")
Expand All @@ -453,9 +453,9 @@ program rte_check_equivalence
atmos, &
toa_flux))
call increment_with_2str
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 6._wp) .or. &
.not. allclose(tst_flux_dn, ref_flux_dn, tol = 6._wp) .or. &
.not. allclose(tst_flux_dir,ref_flux_dir,tol = 6._wp)) &
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 8._wp) .or. &
.not. allclose(tst_flux_dn, ref_flux_dn, tol = 6._wp) .or. &
.not. allclose(tst_flux_dir,ref_flux_dir,tol = 6._wp)) &
call report_err(" Incrementing with 2str fails")

call stop_on_err(k_dist%gas_optics(p_lay, p_lev, &
Expand All @@ -468,7 +468,7 @@ program rte_check_equivalence
mu0, toa_flux, &
sfc_alb_dir, sfc_alb_dif, &
fluxes))
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 6._wp) .or. &
if(.not. allclose(tst_flux_up, ref_flux_up, tol = 8._wp) .or. &
.not. allclose(tst_flux_dn, ref_flux_dn, tol = 6._wp) .or. &
.not. allclose(tst_flux_dir,ref_flux_dir,tol = 6._wp)) &
call report_err(" Incrementing with nstr fails")
Expand Down
Loading