From 6318f41520e74a266ffe89ea60342372c8eb7f31 Mon Sep 17 00:00:00 2001 From: Luca Bertagna Date: Wed, 13 Nov 2024 12:26:02 -0700 Subject: [PATCH 1/2] Mergify: fix merge proteciton rule The name of skipped jobs from a matrix needed to be fixed --- .mergify.yml | 51 +++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index ee3e186f509..315cad81cc6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -7,38 +7,25 @@ merge_protections: - "#approved-reviews-by >= 1" # At least 1 approval - "#changes-requested-reviews-by == 0" # No reviewer asked for changes - or: - - check-success="gcc-openmp / dbg" - - check-skipped="gcc-openmp / dbg" - - or: - - check-success="gcc-openmp / sp" - - check-skipped="gcc-openmp / sp" - - or: - - check-success="gcc-openmp / fpe" - - check-skipped="gcc-openmp / fpe" - - or: - - check-success="gcc-openmp / opt" - - check-skipped="gcc-openmp / opt" - - or: - - check-success="gcc-cuda / dbg" - - check-skipped="gcc-cuda / dbg" - - or: - - check-success="gcc-cuda / sp" - - check-skipped="gcc-cuda / sp" - - or: - - check-success="gcc-cuda / opt" - - check-skipped="gcc-cuda / opt" - - or: - - check-success="cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2" - - check-skipped="cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2" - - or: - - check-success="cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97" - - check-skipped="cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97" - - or: - - check-success="cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5" - - check-skipped="cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5" - - or: - - check-success="cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs" - - check-skipped="cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs" + - and: + - check-success="gcc-openmp / dbg" + - check-success="gcc-openmp / sp" + - check-success="gcc-openmp / fpe" + - check-success="gcc-openmp / opt" + - check-skipped~="gcc-openmp / .*" + - or: + - and: + - check-success="gcc-cuda / dbg" + - check-success="gcc-cuda / sp" + - check-success="gcc-cuda / opt" + - check-skipped~="gcc-cuda / .*" + - or: + - and: + - check-success="cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2" + - check-success="cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97" + - check-success="cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5" + - check-success="cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs" + - check-skipped~="cpu-gcc / .*" - or: - check-success=cpu-gcc - check-skipped=cpu-gcc From dfbfcfd324aee44ddd39a27b76b2c8848fe64a8c Mon Sep 17 00:00:00 2001 From: Peter Andrew Bogenschutz Date: Wed, 13 Nov 2024 13:34:33 -0800 Subject: [PATCH 2/2] make latitude absolute value in the relative checking to make it compatible for southern hemisphere cases --- components/eamxx/src/share/iop/intensive_observation_period.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/eamxx/src/share/iop/intensive_observation_period.cpp b/components/eamxx/src/share/iop/intensive_observation_period.cpp index 32b120c5700..1d5f7c7ba33 100644 --- a/components/eamxx/src/share/iop/intensive_observation_period.cpp +++ b/components/eamxx/src/share/iop/intensive_observation_period.cpp @@ -270,7 +270,7 @@ initialize_iop_file(const util::TimeStamp& run_t0, scorpio::read_var(iop_file,"lon",&iop_file_lon); const Real rel_lat_err = std::fabs(iop_file_lat - m_params.get("target_latitude"))/ - std::max(m_params.get("target_latitude"),(Real)0.1); + std::max(std::fabs(m_params.get("target_latitude")),(Real)0.1); const Real rel_lon_err = std::fabs(std::fmod(iop_file_lon + 360.0, 360.0)-m_params.get("target_longitude"))/ std::max(m_params.get("target_longitude"),(Real)0.1); EKAT_REQUIRE_MSG(rel_lat_err < std::numeric_limits::epsilon(),