From e1969e33f11cdf750f62a4d78ccab218d10b6ce5 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Mon, 4 May 2026 16:16:03 -0600 Subject: [PATCH 1/2] apply minOBLdepth when it's set to ERdepth --- src/parameterizations/vertical/MOM_CVMix_KPP.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parameterizations/vertical/MOM_CVMix_KPP.F90 b/src/parameterizations/vertical/MOM_CVMix_KPP.F90 index 6d49574aab..2ec2aadc12 100644 --- a/src/parameterizations/vertical/MOM_CVMix_KPP.F90 +++ b/src/parameterizations/vertical/MOM_CVMix_KPP.F90 @@ -1439,7 +1439,7 @@ subroutine KPP_compute_BLD(CS, G, GV, US, h, Temp, Salt, u, v, tv, uStar, buoyFl CVMix_kpp_params_user=CS%KPP_params ) ! KPP parameters if ( ERdepth > -iFaceHeight(2) ) then ! deeper than top layer - CS%OBLdepth(i,j) = US%m_to_Z * ERdepth ! min( ERdepth , -zBottomMinusOffset ) + CS%OBLdepth(i,j) = max(US%m_to_Z * ERdepth, CS%minOBLdepth) ! min( ERdepth , -zBottomMinusOffset ) CS%ERdepth(i,j) = 100. ! check and diagnostic for ER depth calculated endif endif From e1b038022ea79ea6c64a500bb3265cebdeb424ff Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Mon, 4 May 2026 16:19:40 -0600 Subject: [PATCH 2/2] Update CVMix hash for Stokes MOST fix This fixes out-of-bounds access on zk in cvmix_kpp_compute_StokesXi. --- pkg/CVMix-src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/CVMix-src b/pkg/CVMix-src index 9187de96a4..fce422195a 160000 --- a/pkg/CVMix-src +++ b/pkg/CVMix-src @@ -1 +1 @@ -Subproject commit 9187de96a40ca55ec7b43524a2bf0ace10bcae67 +Subproject commit fce422195a0c58f15a55946b5ed517ba4365e232